diff --git a/flake.lock b/flake.lock index c993095..9f8f2c4 100644 --- a/flake.lock +++ b/flake.lock @@ -37,11 +37,11 @@ "base16-helix": { "flake": false, "locked": { - "lastModified": 1736852337, - "narHash": "sha256-esD42YdgLlEh7koBrSqcT7p2fsMctPAcGl/+2sYJa2o=", + "lastModified": 1748408240, + "narHash": "sha256-9M2b1rMyMzJK0eusea0x3lyh3mu5nMeEDSc4RZkGm+g=", "owner": "tinted-theming", "repo": "base16-helix", - "rev": "03860521c40b0b9c04818f2218d9cc9efc21e7a5", + "rev": "6c711ab1a9db6f51e2f6887cc3345530b33e152e", "type": "github" }, "original": { @@ -115,11 +115,11 @@ "firefox-gnome-theme": { "flake": false, "locked": { - "lastModified": 1744642301, - "narHash": "sha256-5A6LL7T0lttn1vrKsNOKUk9V0ittdW0VEqh6AtefxJ4=", + "lastModified": 1748383148, + "narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=", "owner": "rafaelmardojai", "repo": "firefox-gnome-theme", - "rev": "59e3de00f01e5adb851d824cf7911bd90c31083a", + "rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf", "type": "github" }, "original": { @@ -162,11 +162,11 @@ }, "flake-compat_3": { "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -201,11 +201,11 @@ ] }, "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", "type": "github" }, "original": { @@ -348,11 +348,11 @@ ] }, "locked": { - "lastModified": 1742649964, - "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", + "lastModified": 1747372754, + "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", + "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46", "type": "github" }, "original": { @@ -443,11 +443,11 @@ ] }, "locked": { - "lastModified": 1748668774, - "narHash": "sha256-fYk/vk4ClmvHIgnGv/5GNRiDLtNCwXo9aLq36L/x+P4=", + "lastModified": 1748830238, + "narHash": "sha256-EB+LzYHK0D5aqxZiYoPeoZoOzSAs8eqBDxm3R+6wMKU=", "owner": "nix-community", "repo": "home-manager", - "rev": "60e4624302d956fe94d3f7d96a560d14d70591b9", + "rev": "c7fdb7e90bff1a51b79c1eed458fb39e6649a82a", "type": "github" }, "original": { @@ -464,11 +464,11 @@ ] }, "locked": { - "lastModified": 1747763032, - "narHash": "sha256-9j3oCbemeH7bTVXJ3pDWxOptbxDx2SdK1jY2AHpjQiw=", + "lastModified": 1748737919, + "narHash": "sha256-5kvBbLYdp+n7Ftanjcs6Nv+UO6sBhelp6MIGJ9nWmjQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "29dda415f5b2178278283856c6f9f7b48a2a4353", + "rev": "5675a9686851d9626560052a032c4e14e533c1fa", "type": "github" }, "original": { @@ -529,11 +529,11 @@ ] }, "locked": { - "lastModified": 1748656608, - "narHash": "sha256-VU+8/kZ57Y7XTmgMBpybGMxO/elvUn/4yMndZji2pY8=", + "lastModified": 1748743761, + "narHash": "sha256-wodNEYzhBzsdfp5ggAsuJaTCLo3S9cwH7Svni1lgvwo=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "b585487bb87faec1c7a09aada7cfe77dd7b3c5fe", + "rev": "0f75191a5c244a38192c7587da7c3f04d35c5938", "type": "github" }, "original": { @@ -614,11 +614,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1748460289, - "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=", + "lastModified": 1748693115, + "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102", + "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", "type": "github" }, "original": { @@ -630,11 +630,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1748460289, - "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=", + "lastModified": 1748693115, + "narHash": "sha256-StSrWhklmDuXT93yc3GrTlb0cKSS0agTAxMGjLKAsY8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102", + "rev": "910796cabe436259a29a72e8d3f5e180fc6dfacc", "type": "github" }, "original": { @@ -662,11 +662,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1747542820, - "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=", + "lastModified": 1748460289, + "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043", + "rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102", "type": "github" }, "original": { @@ -708,11 +708,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1746056780, - "narHash": "sha256-/emueQGaoT4vu0QjU9LDOG5roxRSfdY0K2KkxuzazcM=", + "lastModified": 1748730660, + "narHash": "sha256-5LKmRYKdPuhm8j5GFe3AfrJL8dd8o57BQ34AGjJl1R0=", "owner": "nix-community", "repo": "NUR", - "rev": "d476cd0972dd6242d76374fcc277e6735715c167", + "rev": "2c0bc52fe14681e9ef60e3553888c4f086e46ecb", "type": "github" }, "original": { @@ -884,11 +884,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1748699906, - "narHash": "sha256-pu2UKagKKysJ7EYeOcm8vWoZq1lcxfwfu3/C1Y3OFz8=", + "lastModified": 1748887638, + "narHash": "sha256-AExfT8rMb6Ya37Gm3dimm+e4eeLGzya55JS6VWb3nfQ=", "owner": "danth", "repo": "stylix", - "rev": "8762da957b8b04b8b73248144f1c0ff7a88924b5", + "rev": "3ca2c4478a1e984d2007c57467c6986bcdcb2629", "type": "github" }, "original": { @@ -1038,11 +1038,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1744974599, - "narHash": "sha256-Fg+rdGs5FAgfkYNCs74lnl8vkQmiZVdBsziyPhVqrlY=", + "lastModified": 1748180480, + "narHash": "sha256-7n0XiZiEHl2zRhDwZd/g+p38xwEoWtT0/aESwTMXWG4=", "owner": "tinted-theming", "repo": "schemes", - "rev": "28c26a621123ad4ebd5bbfb34ab39421c0144bdd", + "rev": "87d652edd26f5c0c99deda5ae13dfb8ece2ffe31", "type": "github" }, "original": { @@ -1054,11 +1054,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1745111349, - "narHash": "sha256-udV+nHdpqgkJI9D0mtvvAzbqubt9jdifS/KhTTbJ45w=", + "lastModified": 1748740859, + "narHash": "sha256-OEM12bg7F4N5WjZOcV7FHJbqRI6jtCqL6u8FtPrlZz4=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "e009f18a01182b63559fb28f1c786eb027c3dee9", + "rev": "57d5f9683ff9a3b590643beeaf0364da819aedda", "type": "github" }, "original": { @@ -1152,11 +1152,11 @@ ] }, "locked": { - "lastModified": 1748560040, - "narHash": "sha256-To9g2rH1sgjfoL4oVYBOoC31AQRvqFZ+wLzRTSb86no=", + "lastModified": 1748849057, + "narHash": "sha256-ih5wxfFGg+0FDTFcoNftV4WaKQwtSEgrCo6widpbazk=", "ref": "refs/heads/main", - "rev": "8baaa38d558f8388d6566eb02148cbf2a86b4796", - "revCount": 12, + "rev": "05b214e6cd8721b14db8cd93272fc81965212b6d", + "revCount": 13, "type": "git", "url": "https://git.ryot.foo/toph/yay.nix.git" }, @@ -1172,11 +1172,11 @@ ] }, "locked": { - "lastModified": 1748059546, - "narHash": "sha256-e0jy8RU8ofOdeS5gF9Hir+M5Wn0q7D8MkpeQXsOJdu4=", + "lastModified": 1748837535, + "narHash": "sha256-fn9n5rHrnV83v5y7DCS3uRWIdOab2hkAhfFTrjSg/gg=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "716a5af28d686d67146d01b14112c919b6133a84", + "rev": "9a3d6741f1324f47c27fb6aede05fbcbdefeadc9", "type": "github" }, "original": { diff --git a/home/users/cesar/config/default.nix b/home/users/cesar/config/default.nix deleted file mode 100644 index a914702..0000000 --- a/home/users/cesar/config/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - lib, - ... -}: -{ - imports = lib.custom.scanPaths ./.; -} diff --git a/home/users/cesar/default.nix b/home/users/cesar/default.nix index c204348..2b2e654 100644 --- a/home/users/cesar/default.nix +++ b/home/users/cesar/default.nix @@ -1,13 +1,12 @@ { lib, - pkgs, hostSpec, ... }: { imports = [ (lib.custom.relativeToRoot "home/global/core") - ./config + (lib.optionalAttrs (!hostSpec.isServer) ./theme) (lib.custom.relativeToRoot "home/hosts/${hostSpec.hostName}") ]; diff --git a/home/users/cesar/config/theme/default.nix b/home/users/cesar/theme/default.nix similarity index 99% rename from home/users/cesar/config/theme/default.nix rename to home/users/cesar/theme/default.nix index 526ec55..41b6171 100644 --- a/home/users/cesar/config/theme/default.nix +++ b/home/users/cesar/theme/default.nix @@ -1,6 +1,7 @@ { pkgs, inputs, + hostSpec, lib, ... }: diff --git a/home/users/cesar/config/theme/soraka.yaml b/home/users/cesar/theme/soraka.yaml similarity index 100% rename from home/users/cesar/config/theme/soraka.yaml rename to home/users/cesar/theme/soraka.yaml diff --git a/home/users/cesar/config/theme/wallpapers/soraka.png b/home/users/cesar/theme/wallpapers/soraka.png similarity index 100% rename from home/users/cesar/config/theme/wallpapers/soraka.png rename to home/users/cesar/theme/wallpapers/soraka.png diff --git a/home/users/gio/config/default.nix b/home/users/gio/config/default.nix deleted file mode 100644 index a914702..0000000 --- a/home/users/gio/config/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - lib, - ... -}: -{ - imports = lib.custom.scanPaths ./.; -} diff --git a/home/users/gio/default.nix b/home/users/gio/default.nix index c204348..2b2e654 100644 --- a/home/users/gio/default.nix +++ b/home/users/gio/default.nix @@ -1,13 +1,12 @@ { lib, - pkgs, hostSpec, ... }: { imports = [ (lib.custom.relativeToRoot "home/global/core") - ./config + (lib.optionalAttrs (!hostSpec.isServer) ./theme) (lib.custom.relativeToRoot "home/hosts/${hostSpec.hostName}") ]; diff --git a/home/users/gio/config/theme/default.nix b/home/users/gio/theme/default.nix similarity index 99% rename from home/users/gio/config/theme/default.nix rename to home/users/gio/theme/default.nix index c918138..19c0cf8 100644 --- a/home/users/gio/config/theme/default.nix +++ b/home/users/gio/theme/default.nix @@ -1,6 +1,7 @@ { pkgs, inputs, + hostSpec, lib, ... }: diff --git a/home/users/gio/config/theme/gojo.yaml b/home/users/gio/theme/gojo.yaml similarity index 100% rename from home/users/gio/config/theme/gojo.yaml rename to home/users/gio/theme/gojo.yaml diff --git a/home/users/gio/config/theme/wallpapers/gojo.jpg b/home/users/gio/theme/wallpapers/gojo.jpg similarity index 100% rename from home/users/gio/config/theme/wallpapers/gojo.jpg rename to home/users/gio/theme/wallpapers/gojo.jpg diff --git a/home/users/toph/config/default.nix b/home/users/toph/config/default.nix deleted file mode 100644 index a914702..0000000 --- a/home/users/toph/config/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - lib, - ... -}: -{ - imports = lib.custom.scanPaths ./.; -} diff --git a/home/users/toph/default.nix b/home/users/toph/default.nix index 4153016..1c5ee88 100644 --- a/home/users/toph/default.nix +++ b/home/users/toph/default.nix @@ -6,7 +6,7 @@ { imports = [ (lib.custom.relativeToRoot "home/global/core") - ./config + (lib.optionalAttrs (!hostSpec.isServer) ./theme) (lib.custom.relativeToRoot "home/hosts/${hostSpec.hostName}") ]; } diff --git a/home/users/toph/config/theme/default.nix b/home/users/toph/theme/default.nix similarity index 93% rename from home/users/toph/config/theme/default.nix rename to home/users/toph/theme/default.nix index 04ca253..e74bd4a 100644 --- a/home/users/toph/config/theme/default.nix +++ b/home/users/toph/theme/default.nix @@ -1,12 +1,11 @@ { pkgs, inputs, + hostSpec, lib, ... }: let - isServer = hostSpec.isServer or false; - qogir = pkgs.qogir-icon-theme.override { colorVariants = [ "dark" @@ -17,9 +16,9 @@ let ]; }; in -lib.mkIf (!isServer) { +{ imports = [ - inputs.stylix.homeManagerModules.stylix + inputs.stylix.homeModules.stylix ]; stylix = { diff --git a/home/users/toph/config/theme/invincible.yaml b/home/users/toph/theme/invincible.yaml similarity index 100% rename from home/users/toph/config/theme/invincible.yaml rename to home/users/toph/theme/invincible.yaml diff --git a/home/users/toph/config/theme/wallpapers/invincible.jpg b/home/users/toph/theme/wallpapers/invincible.jpg similarity index 100% rename from home/users/toph/config/theme/wallpapers/invincible.jpg rename to home/users/toph/theme/wallpapers/invincible.jpg diff --git a/home/users/toph/config/theme/wallpapers/wallpaper.jpg b/home/users/toph/theme/wallpapers/wallpaper.jpg similarity index 100% rename from home/users/toph/config/theme/wallpapers/wallpaper.jpg rename to home/users/toph/theme/wallpapers/wallpaper.jpg diff --git a/hosts/nixos/gojo/default.nix b/hosts/nixos/gojo/default.nix index 2dccf7c..414182b 100644 --- a/hosts/nixos/gojo/default.nix +++ b/hosts/nixos/gojo/default.nix @@ -52,7 +52,6 @@ in email = user.email; handle = user.handle; userFullName = user.fullName; - isServer = true; }; networking = { diff --git a/hosts/nixos/haze/default.nix b/hosts/nixos/haze/default.nix index 24993da..3dff7ee 100644 --- a/hosts/nixos/haze/default.nix +++ b/hosts/nixos/haze/default.nix @@ -52,7 +52,6 @@ in email = user.email; handle = user.handle; userFullName = user.fullName; - isServer = true; }; networking = { diff --git a/hosts/nixos/rune/default.nix b/hosts/nixos/rune/default.nix index 5defb54..8a6c295 100644 --- a/hosts/nixos/rune/default.nix +++ b/hosts/nixos/rune/default.nix @@ -55,7 +55,6 @@ in email = user.email; handle = user.handle; userFullName = user.fullName; - isServer = true; }; networking = {