diff --git a/homes/x86_64-linux/jo/apps/firefox/default.nix b/homes/x86_64-linux/jo/apps/firefox/default.nix index 68ec53b..8844b1a 100644 --- a/homes/x86_64-linux/jo/apps/firefox/default.nix +++ b/homes/x86_64-linux/jo/apps/firefox/default.nix @@ -15,6 +15,5 @@ in @import "onebar/onebar.css"; ''; - home.file.".mozilla/firefox/default/chrome/onebar/onebar.css".source = - mkIf config.programs.firefox.enable ./onebar.css; + home.file.".mozilla/firefox/default/chrome/onebar/onebar.css".source = ./onebar.css; } diff --git a/homes/x86_64-linux/jo/apps/youtube-music/catppuccin-frappe.css b/homes/x86_64-linux/jo/apps/youtube-music/catppuccin-frappe.css new file mode 100644 index 0000000..3d0d60d --- /dev/null +++ b/homes/x86_64-linux/jo/apps/youtube-music/catppuccin-frappe.css @@ -0,0 +1,6 @@ +/* frappe */ +@import url("https://youtubemusic.catppuccin.com/src/frappe.css"); + +html:not(.style-scope) { + --ctp-accent: var(--ctp-blue) !important; +} diff --git a/homes/x86_64-linux/jo/apps/youtube-music/catppuccin-latte.css b/homes/x86_64-linux/jo/apps/youtube-music/catppuccin-latte.css new file mode 100644 index 0000000..af971c8 --- /dev/null +++ b/homes/x86_64-linux/jo/apps/youtube-music/catppuccin-latte.css @@ -0,0 +1,6 @@ +/* latte */ +@import url("https://youtubemusic.catppuccin.com/src/latte.css"); + +html:not(.style-scope) { + --ctp-accent: var(--ctp-blue) !important; +} diff --git a/homes/x86_64-linux/jo/apps/youtube-music/catppuccin-macchiato.css b/homes/x86_64-linux/jo/apps/youtube-music/catppuccin-macchiato.css new file mode 100644 index 0000000..6979eab --- /dev/null +++ b/homes/x86_64-linux/jo/apps/youtube-music/catppuccin-macchiato.css @@ -0,0 +1,6 @@ +/* macchiato */ +@import url("https://youtubemusic.catppuccin.com/src/macchiato.css"); + +html:not(.style-scope) { + --ctp-accent: var(--ctp-blue) !important; +} diff --git a/homes/x86_64-linux/jo/apps/youtube-music/catppuccin-mocha.css b/homes/x86_64-linux/jo/apps/youtube-music/catppuccin-mocha.css new file mode 100644 index 0000000..b95c627 --- /dev/null +++ b/homes/x86_64-linux/jo/apps/youtube-music/catppuccin-mocha.css @@ -0,0 +1,6 @@ +/* mocha */ +@import url("https://youtubemusic.catppuccin.com/src/mocha.css"); + +html:not(.style-scope) { + --ctp-accent: var(--ctp-blue) !important; +} diff --git a/homes/x86_64-linux/jo/apps/youtube-music/default.nix b/homes/x86_64-linux/jo/apps/youtube-music/default.nix new file mode 100644 index 0000000..0d7a220 --- /dev/null +++ b/homes/x86_64-linux/jo/apps/youtube-music/default.nix @@ -0,0 +1,6 @@ +{ + ... +}: +{ + +} diff --git a/homes/x86_64-linux/jo/default.nix b/homes/x86_64-linux/jo/default.nix index 00ad55d..c9ab3c5 100644 --- a/homes/x86_64-linux/jo/default.nix +++ b/homes/x86_64-linux/jo/default.nix @@ -7,6 +7,7 @@ imports = [ ./apps/discord ./apps/firefox + ./apps/youtube-music ]; puzzlevision = { @@ -33,10 +34,6 @@ path = "${config.home.homeDirectory}/.wakatime.cfg"; }; - programs.git = { - enable = true; - }; - home.packages = with pkgs; [ ## GENERAL ghostty @@ -56,7 +53,6 @@ ## RUNTIMES and CLIs for development bun git - git-credential-oauth attic-client ]; diff --git a/modules/flake/default.nix b/modules/flake/default.nix index ca75b51..bc8eafb 100644 --- a/modules/flake/default.nix +++ b/modules/flake/default.nix @@ -5,8 +5,5 @@ # Automagically imports systems from "/systems/arch-classname/system-name". ./systems.nix - - # Automagically import custom packages defined in "/pkgs/pkg-name/default.nix" - ./packages.nix ]; } diff --git a/modules/flake/lib.nix b/modules/flake/lib.nix index 9f67370..93bcb54 100644 --- a/modules/flake/lib.nix +++ b/modules/flake/lib.nix @@ -26,18 +26,6 @@ let else [ ]; - filesystemEntityToPackage = - directory: pkgs: pkgArgs: name: type: - if type == "directory" then - dirToPkgAttrSet "${directory}/${name}" pkgs pkgArgs - else if name == "default.nix" then - { - ${builtins.unsafeDiscardStringContext (builtins.baseNameOf directory)} = - pkgs.callPackage "${directory}/${name}" pkgArgs; - } - else - { }; - dirToModuleList = directory: let @@ -62,25 +50,12 @@ let acc // (filesystemEntityToAttrSet directory importArgs name (builtins.getAttr name readDir)) ) { } (builtins.attrNames readDir); - dirToPkgAttrSet = - directory: pkgs: pkgArgs: - let - # Read provided directory only once at the very start and save the result. - readDir = readDirectory directory; - in - builtins.foldl' ( - acc: name: - acc // (filesystemEntityToPackage directory pkgs pkgArgs name (builtins.getAttr name readDir)) - ) { } (builtins.attrNames readDir); - puzzlelib = dirToAttrSet ../../lib { inherit lib self; } // { inherit dirToAttrSet - dirToPkgAttrSet dirToModuleList filesystemEntityToList filesystemEntityToAttrSet - filesystemEntityToPackage ; }; in diff --git a/modules/flake/packages.nix b/modules/flake/packages.nix deleted file mode 100644 index 78eab4f..0000000 --- a/modules/flake/packages.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ - self, - ... -}: -{ - perSystem = - { pkgs, ... }: - { - packages = self.lib.dirToPkgAttrSet ../../pkgs pkgs { }; - }; -} diff --git a/pkgs/.gitkeep b/pkgs/.gitkeep deleted file mode 100644 index e69de29..0000000