diff --git a/flake.lock b/flake.lock index 9067a32..1eaac1c 100644 --- a/flake.lock +++ b/flake.lock @@ -66,6 +66,22 @@ "type": "github" } }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1650374568, + "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -88,21 +104,40 @@ "type": "github" } }, - "flake-parts_2": { + "flake-utils": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib" + "systems": "systems" }, "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { - "owner": "hercules-ci", - "repo": "flake-parts", + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils-plus": { + "inputs": { + "flake-utils": "flake-utils" + }, + "locked": { + "lastModified": 1715533576, + "narHash": "sha256-fT4ppWeCJ0uR300EH3i7kmgRZnAVxrH+XtK09jQWihk=", + "owner": "gytis-ivaskevicius", + "repo": "flake-utils-plus", + "rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f", + "type": "github" + }, + "original": { + "owner": "gytis-ivaskevicius", + "repo": "flake-utils-plus", + "rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f", "type": "github" } }, @@ -225,21 +260,6 @@ "type": "github" } }, - "nixos-unified": { - "locked": { - "lastModified": 1729697921, - "narHash": "sha256-gqcmWE+4Vr5/l6AoQc2jIbJHCAXAY+qWPC0ruoAHV1Q=", - "owner": "srid", - "repo": "nixos-unified", - "rev": "e60e64841e74c777799624531dcb2f311f95f639", - "type": "github" - }, - "original": { - "owner": "srid", - "repo": "nixos-unified", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1730531603, @@ -256,18 +276,6 @@ "type": "github" } }, - "nixpkgs-lib": { - "locked": { - "lastModified": 1730504152, - "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1717432640, @@ -319,13 +327,12 @@ "root": { "inputs": { "devenv": "devenv", - "flake-parts": "flake-parts_2", "home-manager": "home-manager", - "nixos-unified": "nixos-unified", "nixpkgs": "nixpkgs_4", "rose-pine": "rose-pine", "rose-pine-amfora": "rose-pine-amfora", - "rose-pine-qt5ct": "rose-pine-qt5ct" + "rose-pine-qt5ct": "rose-pine-qt5ct", + "snowfall-lib": "snowfall-lib" } }, "rose-pine": { @@ -374,6 +381,43 @@ "repo": "rose-pine-qt5ct", "type": "github" } + }, + "snowfall-lib": { + "inputs": { + "flake-compat": "flake-compat_2", + "flake-utils-plus": "flake-utils-plus", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1730136121, + "narHash": "sha256-tfVayj13Zw+zzOKrmJhnvBod7Hdb9ixBR6/4GUlyMA0=", + "owner": "snowfallorg", + "repo": "lib", + "rev": "dd348182c1a010993e68004eada86cf0341fe2c4", + "type": "github" + }, + "original": { + "owner": "snowfallorg", + "repo": "lib", + "type": "github" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/modules/home/appearance/base/default.nix b/modules/home/appearance/base/default.nix index 1be2cad..dbcbb00 100644 --- a/modules/home/appearance/base/default.nix +++ b/modules/home/appearance/base/default.nix @@ -19,7 +19,7 @@ in maple-mono-NF ]; - "${colors.base}".pointerCursor = enabled; + rose-pine.pointerCursor = mkIf colors.isRosePine enabled; marleyos.theme = { default = "dark"; diff --git a/modules/home/appearance/gtk/default.nix b/modules/home/appearance/gtk/default.nix index df58236..92368e6 100644 --- a/modules/home/appearance/gtk/default.nix +++ b/modules/home/appearance/gtk/default.nix @@ -18,7 +18,7 @@ in gtk = { enable = true; - "${colors.base}" = enabled; + rose-pine = mkIf colors.isRosePine enabled; gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc"; }; diff --git a/modules/home/programs/bat/default.nix b/modules/home/programs/bat/default.nix index 07f4c79..2aa557d 100644 --- a/modules/home/programs/bat/default.nix +++ b/modules/home/programs/bat/default.nix @@ -23,7 +23,7 @@ in batman ]; - "${colors.base}" = enabled; + rose-pine = mkIf colors.isRosePine enabled; config = { style = "auto"; diff --git a/modules/home/programs/btop/default.nix b/modules/home/programs/btop/default.nix index 3ca8af9..9467e65 100644 --- a/modules/home/programs/btop/default.nix +++ b/modules/home/programs/btop/default.nix @@ -17,7 +17,7 @@ in programs.btop = { enable = true; - "${colors.base}" = enabled; + rose-pine = mkIf colors.isRosePine enabled; settings = { theme_background = false; diff --git a/modules/home/programs/cava/default.nix b/modules/home/programs/cava/default.nix index 33f3135..89a4cc2 100644 --- a/modules/home/programs/cava/default.nix +++ b/modules/home/programs/cava/default.nix @@ -16,8 +16,7 @@ in config = mkIf cfg.enable { enable = true; - # "${colors.base}" = enabled; - rose-pine.enable = true; + rose-pine = mkIf colors.isRosePine enabled; # TODO: disable this when mpd is not enabled? Can that be detected on non # NixOS systems? diff --git a/modules/home/programs/fish/default.nix b/modules/home/programs/fish/default.nix index 146db6c..a53598e 100644 --- a/modules/home/programs/fish/default.nix +++ b/modules/home/programs/fish/default.nix @@ -34,7 +34,7 @@ in programs.fish = { enable = true; - "${colors.name}" = enabled; + rose-pine = mkIf colors.isRosePine enabled; preferAbbrs = true; diff --git a/modules/home/programs/fzf/default.nix b/modules/home/programs/fzf/default.nix index 2383fe8..5f533d1 100644 --- a/modules/home/programs/fzf/default.nix +++ b/modules/home/programs/fzf/default.nix @@ -25,7 +25,7 @@ in programs.fzf = { enable = true; - "${colors.base}" = enabled; + rose-pine = mkIf colors.isRosePine enabled; defaultOptions = [ "--margin=10%,5%" diff --git a/modules/home/programs/starship/default.nix b/modules/home/programs/starship/default.nix index 983e69c..46622b1 100644 --- a/modules/home/programs/starship/default.nix +++ b/modules/home/programs/starship/default.nix @@ -26,7 +26,7 @@ in programs.starship = { enable = true; - "${colors.base}" = enabled; + rose-pine = mkIf colors.isRosePine enabled; settings = mkIf config.programs.starship.rose-pine.enabled { format = mkForce (concatStrings [ diff --git a/modules/home/programs/zathura/default.nix b/modules/home/programs/zathura/default.nix index 19643e6..62ee14c 100644 --- a/modules/home/programs/zathura/default.nix +++ b/modules/home/programs/zathura/default.nix @@ -17,7 +17,7 @@ in programs.zathura = { enable = true; - "${colors.base}" = enabled; + rose-pine = mkIf colors.isRosePine enabled; }; }; } diff --git a/modules/home/services/dunst/default.nix b/modules/home/services/dunst/default.nix index bf9193e..29c88f3 100644 --- a/modules/home/services/dunst/default.nix +++ b/modules/home/services/dunst/default.nix @@ -6,7 +6,6 @@ let inherit (lib) mkIf - enabled disabled mkMerge ; @@ -27,7 +26,7 @@ in # I don't want to use the rose-pine icons; also don't want to deal with # the drop-in weirdness. # TODO: Convert dunst.rose-pine to attr set to fix this. - "${colors.base}" = if isRosePine then disabled else enabled; + rose-pine = disabled; settings = mkMerge [ ### Rose Pine ###