diff --git a/flake.lock b/flake.lock index 4907e5d..8cce30e 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-16SMbNTMTa+acgZVO0MihmuQonvLo4Oy24fSzNvBKLw=", - "path": "/nix/store/400g3pq1ipxvk1i8k11z5233j99nh7lc-source/ags", + "path": "/nix/store/2byyf4br6i1v2lx9gvgv9gsg6jv2wfyn-source/ags", "type": "path" }, "original": { - "path": "/nix/store/400g3pq1ipxvk1i8k11z5233j99nh7lc-source/ags", + "path": "/nix/store/2byyf4br6i1v2lx9gvgv9gsg6jv2wfyn-source/ags", "type": "path" } }, @@ -663,12 +663,12 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-mvMz5jI6JBR001HbqGw+/ZYu/hr4PkC1DpnEQUGNFfg=", - "path": "/nix/store/400g3pq1ipxvk1i8k11z5233j99nh7lc-source/hyprland", + "narHash": "sha256-FbSB/VPF1F8BjjGejCs9hzRK4uo5RNMoIdMdl58mEFM=", + "path": "/nix/store/2byyf4br6i1v2lx9gvgv9gsg6jv2wfyn-source/hyprland", "type": "path" }, "original": { - "path": "/nix/store/400g3pq1ipxvk1i8k11z5233j99nh7lc-source/hyprland", + "path": "/nix/store/2byyf4br6i1v2lx9gvgv9gsg6jv2wfyn-source/hyprland", "type": "path" } }, @@ -1058,12 +1058,12 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-rIcx3+cmbVFEMeLA+BmaC3iQNG9BOjY+stAzHVOJVH8=", - "path": "/nix/store/f4fmriavc93pa0yjrjnppnvjd2wh1wfk-source/home", + "narHash": "sha256-IonQU9emwId8YSY5LwpXoNeK49y8RXZ3w54830/1ylE=", + "path": "/nix/store/z5qgl81l32899rpwglajmb4p2gnm8l6a-source/home", "type": "path" }, "original": { - "path": "/nix/store/f4fmriavc93pa0yjrjnppnvjd2wh1wfk-source/home", + "path": "/nix/store/z5qgl81l32899rpwglajmb4p2gnm8l6a-source/home", "type": "path" } }, @@ -1434,11 +1434,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-B01IL6PFTcOaiaVsj3GnvmKb1Mc+PsajyoBSU7UE9zU=", - "path": "/nix/store/km3pmkm1y5wrx48pz1vqxa3ga9r99cjg-source/packages", + "path": "/nix/store/cr47xa2n3pxgidq1aqv4ax84fk0ns1ym-source/packages", "type": "path" }, "original": { - "path": "/nix/store/km3pmkm1y5wrx48pz1vqxa3ga9r99cjg-source/packages", + "path": "/nix/store/cr47xa2n3pxgidq1aqv4ax84fk0ns1ym-source/packages", "type": "path" } }, @@ -1522,12 +1522,12 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-LHH1D2PB2ZAmHDkxaJtWGbDKZR78IKz/akc7fO6RMQg=", - "path": "/nix/store/km3pmkm1y5wrx48pz1vqxa3ga9r99cjg-source/programs", + "narHash": "sha256-9L+1TDE6MNQVXd8Z869oLwjS3khchgAhhG+KCjPo4jc=", + "path": "/nix/store/cr47xa2n3pxgidq1aqv4ax84fk0ns1ym-source/programs", "type": "path" }, "original": { - "path": "/nix/store/km3pmkm1y5wrx48pz1vqxa3ga9r99cjg-source/programs", + "path": "/nix/store/cr47xa2n3pxgidq1aqv4ax84fk0ns1ym-source/programs", "type": "path" } }, @@ -1556,12 +1556,12 @@ }, "locked": { "lastModified": 1, - "narHash": "sha256-EVhBDAt1miiP7BA3SooJNTCm0pESsl4VlRYCDSMutFY=", - "path": "/nix/store/400g3pq1ipxvk1i8k11z5233j99nh7lc-source/pywal", + "narHash": "sha256-pqaq1rt9VZUm7XhlyQn7IH/+9vpAK/KUq2J7FlGs+dE=", + "path": "/nix/store/2byyf4br6i1v2lx9gvgv9gsg6jv2wfyn-source/pywal", "type": "path" }, "original": { - "path": "/nix/store/400g3pq1ipxvk1i8k11z5233j99nh7lc-source/pywal", + "path": "/nix/store/2byyf4br6i1v2lx9gvgv9gsg6jv2wfyn-source/pywal", "type": "path" } }, @@ -1585,11 +1585,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-TsMqdRC5Rsop/6ASLtAFJc0Spt9NI8iQBk6dXxJ8mYA=", - "path": "/nix/store/400g3pq1ipxvk1i8k11z5233j99nh7lc-source/rofi", + "path": "/nix/store/2byyf4br6i1v2lx9gvgv9gsg6jv2wfyn-source/rofi", "type": "path" }, "original": { - "path": "/nix/store/400g3pq1ipxvk1i8k11z5233j99nh7lc-source/rofi", + "path": "/nix/store/2byyf4br6i1v2lx9gvgv9gsg6jv2wfyn-source/rofi", "type": "path" } }, @@ -1689,11 +1689,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-XzsAbJgvL0qtbnVDmRizPn9j9SGeaz+QgUJMfLfRKvk=", - "path": "/nix/store/f4fmriavc93pa0yjrjnppnvjd2wh1wfk-source/system", + "path": "/nix/store/z5qgl81l32899rpwglajmb4p2gnm8l6a-source/system", "type": "path" }, "original": { - "path": "/nix/store/f4fmriavc93pa0yjrjnppnvjd2wh1wfk-source/system", + "path": "/nix/store/z5qgl81l32899rpwglajmb4p2gnm8l6a-source/system", "type": "path" } }, @@ -1770,11 +1770,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-2h0M0hXa3L6rQJ2hmDadiZBYJcoxRqFdlXD7tK0LFrM=", - "path": "/nix/store/400g3pq1ipxvk1i8k11z5233j99nh7lc-source/terminal", + "path": "/nix/store/2byyf4br6i1v2lx9gvgv9gsg6jv2wfyn-source/terminal", "type": "path" }, "original": { - "path": "/nix/store/400g3pq1ipxvk1i8k11z5233j99nh7lc-source/terminal", + "path": "/nix/store/2byyf4br6i1v2lx9gvgv9gsg6jv2wfyn-source/terminal", "type": "path" } }, diff --git a/home/dotfiles/default.nix b/home/dotfiles/default.nix index e244150..0675eff 100644 --- a/home/dotfiles/default.nix +++ b/home/dotfiles/default.nix @@ -18,8 +18,7 @@ "ags/wifi.js" "ags/workspaces.js" ]; - in builtins.map (name: { ".config/${name}" = "./${name}"; }) files; - + in builtins.mapAttrs (n: v: { source = v; target = n; }) (builtins.listToAttrs (builtins.map (_name: { name = ".config/${_name}"; value = ./${_name}; }) files)); }) (lib.mkIf config.homeconfig.hyprland.enable { @@ -27,18 +26,17 @@ files = [ "hypr/otf.conf" "hypr/pyprland.toml" - "hypr/hyprland.conf" - ]; - in builtins.map (name: { ".config/${name}" = "./${name}"; }) files; + "hypr/main.conf" + ]; + in builtins.mapAttrs (n: v: { source = v; target = n; }) (builtins.listToAttrs (builtins.map (_name: { name = ".config/${_name}"; value = ./${_name}; }) files)); }) (lib.mkIf config.homeconfig.swaylock.enable { home.file = let files = [ "swaylock/config" - ]; - in builtins.map (name: { ".config/${name}" = "./${name}"; }) files; - + ]; + in builtins.mapAttrs (n: v: { source = v; target = n; }) (builtins.listToAttrs (builtins.map (_name: { name = ".config/${_name}"; value = ./${_name}; }) files)); }) (lib.mkIf config.homeconfig.wal.enable { @@ -48,9 +46,8 @@ "wal/templates/colors-ags.css" "wal/templates/colors-discord.css" "wal/templates/colors-hypr.conf" - ]; - in builtins.map (name: { ".config/${name}" = "./${name}"; }) files; - + ]; + in builtins.mapAttrs (n: v: { source = v; target = n; }) (builtins.listToAttrs (builtins.map (_name: { name = ".config/${_name}"; value = ./${_name}; }) files)); }) ]; } diff --git a/home/dotfiles/hypr/hyprland.conf b/home/dotfiles/hypr/main.conf similarity index 100% rename from home/dotfiles/hypr/hyprland.conf rename to home/dotfiles/hypr/main.conf diff --git a/home/programs/hyprland/flake.nix b/home/programs/hyprland/flake.nix index 742ee1e..7c666c3 100644 --- a/home/programs/hyprland/flake.nix +++ b/home/programs/hyprland/flake.nix @@ -30,6 +30,10 @@ systemd.variables = [ "--all" ]; + extraConfig = '' + source = ./main.conf + ''; + }; }; diff --git a/home/programs/pywal/flake.nix b/home/programs/pywal/flake.nix index 0c9defd..54cf4d8 100644 --- a/home/programs/pywal/flake.nix +++ b/home/programs/pywal/flake.nix @@ -41,40 +41,48 @@ inputs.spicetify-nix.homeManagerModules.default ]; - programs.spicetify = let - spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system}; - in { - enable = true; - spotifyPackage = pkgs-us.spotify; - theme = spicePkgs.themes.default; - enabledExtensions = with spicePkgs.extensions; [ - ({ - src = "${inputs.spicetify-ext}/adblock"; - name = "adblock.js"; - }) - copyToClipboard - oneko - #randomBadToTheBoneRiff #this could be hilarious - ]; - enabledCustomApps = with spicePkgs.apps; [ - ncsVisualizer - ]; - }; + options.homeconfig.wal.enable = lib.options.mkOption { + type = lib.types.bool; + default = false; + }; - home.packages = with pkgs; [ + config = lib.mkIf config.homeconfig.wal.enable { - inputs.themecord.packages.${pkgs.system}.default - vesktop + programs.spicetify = let + spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system}; + in { + enable = true; + spotifyPackage = pkgs-us.spotify; + theme = spicePkgs.themes.default; + enabledExtensions = with spicePkgs.extensions; [ + ({ + src = "${inputs.spicetify-ext}/adblock"; + name = "adblock.js"; + }) + copyToClipboard + oneko + #randomBadToTheBoneRiff #this could be hilarious + ]; + enabledCustomApps = with spicePkgs.apps; [ + ncsVisualizer + ]; + }; - pkgs-us.pywal16 - pywalfox-native - ]; + home.packages = with pkgs; [ - home.file.".mozilla/native-messaging-hosts/pywalfox.json".text = lib.replaceStrings [ "" ] [ - "${pywalfox-wrapper}/bin/pywalfox-wrapper" - ] - (lib.readFile "${pkgs.pywalfox-native}/lib/python3.11/site-packages/pywalfox/assets/manifest.json"); + inputs.themecord.packages.${pkgs.system}.default + vesktop + pkgs-us.pywal16 + pywalfox-native + ]; + + home.file.".mozilla/native-messaging-hosts/pywalfox.json".text = lib.replaceStrings [ "" ] [ + "${pywalfox-wrapper}/bin/pywalfox-wrapper" + ] + (lib.readFile "${pkgs.pywalfox-native}/lib/python3.11/site-packages/pywalfox/assets/manifest.json"); + + }; }; }; diff --git a/home/programs/swaylock/default.nix b/home/programs/swaylock/default.nix index aeb1021..d2841fb 100644 --- a/home/programs/swaylock/default.nix +++ b/home/programs/swaylock/default.nix @@ -7,6 +7,6 @@ config = lib.mkIf config.homeconfig.swaylock.enable { - home.Packages = with pkgs; [ swaylock-effects ]; + home.packages = with pkgs; [ swaylock-effects ]; }; }