From 502c926f9f6bf7b89455b35b59c4435846fec89c Mon Sep 17 00:00:00 2001 From: notohh Date: Tue, 16 Apr 2024 21:02:33 -0400 Subject: [PATCH] WIP: treewide: refactor to use flake-parts first pass of my flake refactor using flake-parts --- flake.lock | 294 +++++++------ flake.nix | 92 ++-- home/default.nix | 92 +--- home/gtk/catppuccin-red.nix | 21 - .../home.nix => home/profiles/ame/default.nix | 57 +-- home/profiles/common.nix | 37 ++ home/profiles/default.nix | 48 ++ home/profiles/default/default.nix | 5 + .../profiles/tsuki/default.nix | 109 +++-- home/{ => programs}/ags/config/.eslintrc.js | 0 home/{ => programs}/ags/config/.gitignore | 0 .../ags/config/.prettierrc.json | 0 home/{ => programs}/ags/config/config.js | 0 home/{ => programs}/ags/config/import.js | 0 home/{ => programs}/ags/config/js/main.js | 0 .../ags/config/js/widgets/hyprland.js | 0 .../ags/config/js/widgets/images/image.js | 0 .../config/js/widgets/images/static/nixos.png | Bin .../ags/config/js/widgets/music.js | 0 .../ags/config/js/widgets/system.js | 0 .../ags/config/js/widgets/time.js | 0 home/{ => programs}/ags/config/jsconfig.json | 0 home/{ => programs}/ags/config/main.scss | 0 .../ags/config/package-lock.json | 0 home/{ => programs}/ags/config/package.json | 0 home/{ => programs}/ags/config/scss/bar.scss | 0 .../ags/config/scss/colors.scss | 0 .../ags/config/scss/general.scss | 0 .../ags/config/scss/widgets.scss | 0 home/{ => programs}/ags/default.nix | 2 +- home/{ => programs}/anyrun/default.nix | 0 home/{ => programs}/anyrun/style.scss | 0 home/programs/atuin.nix | 15 + home/programs/bat.nix | 3 + home/{cava/default.nix => programs/cava.nix} | 0 home/programs/direnv.nix | 7 + home/{ => programs}/firefox/default.nix | 0 .../firefox/user.js/betterfox.js | 0 home/programs/git.nix | 23 + home/{gtk/default.nix => programs/gtk.nix} | 0 home/{ => programs}/helix/default.nix | 0 home/{ => programs}/helix/languages.nix | 0 .../helix/themes/catppuccin_mocha.nix | 0 .../helix/themes/tokyonight.nix | 0 home/{ => programs}/lazygit/default.nix | 0 home/{mako/default.nix => programs/mako.nix} | 0 home/{ => programs}/neofetch/config.conf | 0 home/{ => programs}/neofetch/default.nix | 0 home/{ => programs}/nushell/config.nu | 0 home/{ => programs}/nushell/default.nix | 0 home/{ => programs}/nushell/env.nu | 0 .../spotify-player.nix} | 0 .../default.nix => programs/starship.nix} | 0 home/{ => programs}/wezterm/config.lua | 0 home/{ => programs}/wezterm/default.nix | 0 home/{ => programs}/yazi/default.nix | 0 home/{ => programs}/yazi/init.lua | 0 home/{ => programs}/yazi/keymap.nix | 0 home/{ => programs}/yazi/openers.nix | 0 .../default.nix => programs/zathura.nix} | 0 home/{ => programs}/zellij/default.nix | 0 home/{ => programs}/zellij/layouts.nix | 0 home/programs/zoxide.nix | 7 + home/services/default.nix | 3 + home/services/gpg.nix | 11 + hosts/arashi/home.nix | 14 - hosts/default.nix | 412 ++++++++---------- hosts/deploy.nix | 164 +++---- hosts/haru/home.nix | 14 - hosts/kariru/home.nix | 14 - hosts/kaze/home.nix | 14 - hosts/sakura/home.nix | 14 - hosts/sora/home.nix | 14 - hosts/tsuru/home.nix | 14 - hosts/yuki/home.nix | 14 - modules/default.nix | 1 - modules/nix.nix | 3 +- 77 files changed, 723 insertions(+), 795 deletions(-) delete mode 100644 home/gtk/catppuccin-red.nix rename hosts/ame/home.nix => home/profiles/ame/default.nix (69%) mode change 100755 => 100644 create mode 100644 home/profiles/common.nix create mode 100644 home/profiles/default.nix create mode 100644 home/profiles/default/default.nix rename hosts/tsuki/home.nix => home/profiles/tsuki/default.nix (57%) mode change 100755 => 100644 rename home/{ => programs}/ags/config/.eslintrc.js (100%) rename home/{ => programs}/ags/config/.gitignore (100%) rename home/{ => programs}/ags/config/.prettierrc.json (100%) rename home/{ => programs}/ags/config/config.js (100%) rename home/{ => programs}/ags/config/import.js (100%) rename home/{ => programs}/ags/config/js/main.js (100%) rename home/{ => programs}/ags/config/js/widgets/hyprland.js (100%) rename home/{ => programs}/ags/config/js/widgets/images/image.js (100%) rename home/{ => programs}/ags/config/js/widgets/images/static/nixos.png (100%) rename home/{ => programs}/ags/config/js/widgets/music.js (100%) rename home/{ => programs}/ags/config/js/widgets/system.js (100%) rename home/{ => programs}/ags/config/js/widgets/time.js (100%) rename home/{ => programs}/ags/config/jsconfig.json (100%) rename home/{ => programs}/ags/config/main.scss (100%) rename home/{ => programs}/ags/config/package-lock.json (100%) rename home/{ => programs}/ags/config/package.json (100%) rename home/{ => programs}/ags/config/scss/bar.scss (100%) rename home/{ => programs}/ags/config/scss/colors.scss (100%) rename home/{ => programs}/ags/config/scss/general.scss (100%) rename home/{ => programs}/ags/config/scss/widgets.scss (100%) rename home/{ => programs}/ags/default.nix (81%) rename home/{ => programs}/anyrun/default.nix (100%) rename home/{ => programs}/anyrun/style.scss (100%) create mode 100644 home/programs/atuin.nix create mode 100644 home/programs/bat.nix rename home/{cava/default.nix => programs/cava.nix} (100%) create mode 100644 home/programs/direnv.nix rename home/{ => programs}/firefox/default.nix (100%) rename home/{ => programs}/firefox/user.js/betterfox.js (100%) create mode 100644 home/programs/git.nix rename home/{gtk/default.nix => programs/gtk.nix} (100%) rename home/{ => programs}/helix/default.nix (100%) rename home/{ => programs}/helix/languages.nix (100%) rename home/{ => programs}/helix/themes/catppuccin_mocha.nix (100%) rename home/{ => programs}/helix/themes/tokyonight.nix (100%) rename home/{ => programs}/lazygit/default.nix (100%) rename home/{mako/default.nix => programs/mako.nix} (100%) rename home/{ => programs}/neofetch/config.conf (100%) rename home/{ => programs}/neofetch/default.nix (100%) rename home/{ => programs}/nushell/config.nu (100%) rename home/{ => programs}/nushell/default.nix (100%) rename home/{ => programs}/nushell/env.nu (100%) rename home/{spotify-player/default.nix => programs/spotify-player.nix} (100%) rename home/{starship/default.nix => programs/starship.nix} (100%) rename home/{ => programs}/wezterm/config.lua (100%) rename home/{ => programs}/wezterm/default.nix (100%) rename home/{ => programs}/yazi/default.nix (100%) rename home/{ => programs}/yazi/init.lua (100%) rename home/{ => programs}/yazi/keymap.nix (100%) rename home/{ => programs}/yazi/openers.nix (100%) rename home/{zathura/default.nix => programs/zathura.nix} (100%) rename home/{ => programs}/zellij/default.nix (100%) rename home/{ => programs}/zellij/layouts.nix (100%) create mode 100644 home/programs/zoxide.nix create mode 100644 home/services/default.nix create mode 100644 home/services/gpg.nix delete mode 100644 hosts/arashi/home.nix delete mode 100644 hosts/haru/home.nix delete mode 100644 hosts/kariru/home.nix delete mode 100644 hosts/kaze/home.nix delete mode 100644 hosts/sakura/home.nix delete mode 100644 hosts/sora/home.nix delete mode 100644 hosts/tsuru/home.nix delete mode 100644 hosts/yuki/home.nix diff --git a/flake.lock b/flake.lock index 9d2c8dd..8806abf 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1712834339, - "narHash": "sha256-gRYAbyxx4Z2s4hMoXHSu3wv2+VSiiR2Nk+AZmCZ6kc4=", + "lastModified": 1713301451, + "narHash": "sha256-LzYVqEukjOJjm4HGFe6rtHBiuJxAyPqd2MY1k5ci9QU=", "owner": "Aylur", "repo": "ags", - "rev": "c13bcba224f9ecaaa2f22b1d2895bb62e8face19", + "rev": "33bcaf34d5277031ecb97047fb8ddd44abd8d80e", "type": "github" }, "original": { @@ -26,11 +26,11 @@ ] }, "locked": { - "lastModified": 1712136515, - "narHash": "sha256-LpjQJYC24S5P5XhJsZX6HqsQT1pohcFzM6N42I6qo/U=", + "lastModified": 1713259062, + "narHash": "sha256-WTO84hUL8IlNuHDK2yOCeJ38EewFzGt5E0kzBjNWxa8=", "owner": "Kirottu", "repo": "anyrun", - "rev": "be6728884d543665e7bd137bbef62dc1d04a210b", + "rev": "f9d30e34fa4ccb2797c6becec37e8bcff6585d39", "type": "github" }, "original": { @@ -68,11 +68,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1712914814, - "narHash": "sha256-2JimoqHnPCoRlvE1kY0zwTEDmNO3g+8Lz+nJrbaHMHo=", + "lastModified": 1713279551, + "narHash": "sha256-thdSd8oeztVJ3Ly2SvPCfoP+FCoDQCVHSizO0vMGHsI=", "owner": "atuinsh", "repo": "atuin", - "rev": "c41998e98a073f4cce26134c0642c403d71b74a2", + "rev": "19f70cdc918769e0485b0e4aba4069327e96dc3b", "type": "github" }, "original": { @@ -248,6 +248,24 @@ "type": "github" } }, + "flake-parts_3": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib_2" + }, + "locked": { + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "locked": { "lastModified": 1667395993, @@ -301,7 +319,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_9" + "systems": "systems_10" }, "locked": { "lastModified": 1710146030, @@ -319,7 +337,7 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_10" + "systems": "systems_11" }, "locked": { "lastModified": 1705309234, @@ -337,7 +355,7 @@ }, "flake-utils_6": { "inputs": { - "systems": "systems_13" + "systems": "systems_14" }, "locked": { "lastModified": 1694529238, @@ -416,11 +434,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1713054897, - "narHash": "sha256-1RpjL4Erczw5Q1szSd543w+F1jsj5bXp2a74cpiyqIg=", + "lastModified": 1713304603, + "narHash": "sha256-n30G6KWe3wANaTkogJGHPXat1mNPpnSyCkbi87+j/lw=", "owner": "helix-editor", "repo": "helix", - "rev": "9df1266376323b3dae07e48bd1e64463d3aec1dd", + "rev": "43dff1c77251c1d6b9f98d6dee83a97e46af00e8", "type": "github" }, "original": { @@ -436,11 +454,11 @@ ] }, "locked": { - "lastModified": 1713131281, - "narHash": "sha256-/Jm1X9MPfLXAxZSCdWmQAFNUQggEfNWHol5jSyyzFzw=", + "lastModified": 1713294767, + "narHash": "sha256-LmaabaQZdx52MPGKPRt9Opoc9Gd9RbwvCdysUUYQoXI=", "owner": "nix-community", "repo": "home-manager", - "rev": "9f32c66a51d05e6d4ec0dea555bbff9135749ec7", + "rev": "fa8c16e2452bf092ac76f09ee1fb1e9f7d0796e7", "type": "github" }, "original": { @@ -456,11 +474,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1713119587, - "narHash": "sha256-i4q+C4Q8ZNmrPE38PAXqo4xpVTLrkOFE8dzSTmu9zZk=", + "lastModified": 1713214463, + "narHash": "sha256-zAOOjqHAbccCRgJSuvTCA0FNLqKswN63LgVo43R7pxw=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "1f4c960cf1c0c9aaf99670c62b6eff751bd67ff0", + "rev": "0a53b9957f0b17f1a0036b25198f569969ad43a0", "type": "github" }, "original": { @@ -485,11 +503,11 @@ ] }, "locked": { - "lastModified": 1712434681, - "narHash": "sha256-qwmR2p1oc48Bj7gUDvb1oGL19Rjs2PmEmk4ChV01A5o=", + "lastModified": 1713214463, + "narHash": "sha256-zAOOjqHAbccCRgJSuvTCA0FNLqKswN63LgVo43R7pxw=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "818d8c4b69e0997483d60b75f701fe14b561a7a3", + "rev": "0a53b9957f0b17f1a0036b25198f569969ad43a0", "type": "github" }, "original": { @@ -502,14 +520,14 @@ "inputs": { "hyprlang": "hyprlang_2", "nixpkgs": "nixpkgs_6", - "systems": "systems_5" + "systems": "systems_6" }, "locked": { - "lastModified": 1712947995, - "narHash": "sha256-rROseP9x/qt2H7H9L5KojUIPXwcw03dNjatPiP8yILE=", + "lastModified": 1713214520, + "narHash": "sha256-fKNu5IbfifwGEfVmw8CsNsZRPpDBIy2/B4Dg8k+z3bk=", "owner": "hyprwm", "repo": "hypridle", - "rev": "72a6b38b15072ab7df64ae863fc8a4a0f94baf5d", + "rev": "01772b32afc316b85bf5ab2979bd35283ab1ce5b", "type": "github" }, "original": { @@ -524,16 +542,16 @@ "hyprland-protocols": "hyprland-protocols", "hyprlang": "hyprlang_3", "nixpkgs": "nixpkgs_7", - "systems": "systems_6", + "systems": "systems_7", "wlroots": "wlroots", "xdph": "xdph" }, "locked": { - "lastModified": 1713143145, - "narHash": "sha256-6lcGyN2Tyucw3o1M5CRlX5cElN7Xz8LNKnrPYvHeS6Q=", + "lastModified": 1713296181, + "narHash": "sha256-c2hUYlSi7QOful5lIEWVRl1dborfctAvWY9CwoTLxXI=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "1719905e7fdb42516566fb95c07c6572d5fe6ce5", + "rev": "e8e02e81e84bb04efa0c926361ec80c60744f665", "type": "github" }, "original": { @@ -554,11 +572,11 @@ ] }, "locked": { - "lastModified": 1712836056, - "narHash": "sha256-qf6yev9OlJuQv557ApLQ/5V8pQj0YOO9tyh5j3It1mY=", + "lastModified": 1713283897, + "narHash": "sha256-/0OPK/bDr8/Lf7r8kzDD/yP1kySbJ8gPmV3CdUbVTFM=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "e9457e08ca3ff16dc5a815be62baf9e18b539197", + "rev": "00d147d7f6ad2ecfbf75efe4a8402723c72edd98", "type": "github" }, "original": { @@ -629,11 +647,11 @@ ] }, "locked": { - "lastModified": 1709914708, - "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=", + "lastModified": 1713121246, + "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2", + "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706", "type": "github" }, "original": { @@ -647,14 +665,15 @@ "nixpkgs": [ "hypridle", "nixpkgs" - ] + ], + "systems": "systems_5" }, "locked": { - "lastModified": 1708212860, - "narHash": "sha256-nW3Zrhh9RJcMTvOcXAaKADnJM/g6tDf3121lJtTHnYo=", + "lastModified": 1713121246, + "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "11d5ccda071c153dfdc18ef65338956a51cef96a", + "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706", "type": "github" }, "original": { @@ -675,11 +694,11 @@ ] }, "locked": { - "lastModified": 1711671891, - "narHash": "sha256-C/Wwsy/RLxHP1axFFl+AnwJRWfd8gxDKKoa8nt8Qk3c=", + "lastModified": 1713121246, + "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "c1402612146ba06606ebf64963a02bc1efe11e74", + "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706", "type": "github" }, "original": { @@ -694,14 +713,14 @@ "hyprlock", "nixpkgs" ], - "systems": "systems_7" + "systems": "systems_8" }, "locked": { - "lastModified": 1711250455, - "narHash": "sha256-LSq1ZsTpeD7xsqvlsepDEelWRDtAhqwetp6PusHXJRo=", + "lastModified": 1713121246, + "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "b3e430f81f3364c5dd1a3cc9995706a4799eb3fa", + "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706", "type": "github" }, "original": { @@ -716,14 +735,14 @@ "xdg-portal-hyprland", "nixpkgs" ], - "systems": "systems_11" + "systems": "systems_12" }, "locked": { - "lastModified": 1708681732, - "narHash": "sha256-ULZZLZ9C33G13IaXLuAc4oTzHUvnATI8Fj2u6gzMfT0=", + "lastModified": 1713121246, + "narHash": "sha256-502X0Q0fhN6tJK7iEUA8CghONKSatW/Mqj4Wappd++0=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "f4466367ef0a92a6425d482050dc2b8840c0e644", + "rev": "78fcaa27ae9e1d782faa3ff06c8ea55ddce63706", "type": "github" }, "original": { @@ -736,14 +755,14 @@ "inputs": { "hyprlang": "hyprlang_4", "nixpkgs": "nixpkgs_8", - "systems": "systems_8" + "systems": "systems_9" }, "locked": { - "lastModified": 1713015486, - "narHash": "sha256-hbLGAdWXnDyrnUc2+ShoSbOiBgfl5ESx+4agrjjivsM=", + "lastModified": 1713214544, + "narHash": "sha256-36qa6MOhCBd39YPC0FgapwGRHZXjstw8BQuKdFzwQ4k=", "owner": "hyprwm", "repo": "hyprlock", - "rev": "04267a5f83a7cd94a2e219d22b139c72ed718182", + "rev": "2bce52f094c49109520ad37fc8f0d051acaace55", "type": "github" }, "original": { @@ -757,11 +776,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1712878696, - "narHash": "sha256-pFr52cCOHVmoBe50cYGzyFX8OTwjPB6E9YMAkynd2FQ=", + "lastModified": 1713196199, + "narHash": "sha256-ifdAQO9wcw/zlAyg8fCpf5I0TtufdRS6YZoTVk1VzLM=", "owner": "hyprwm", "repo": "hyprpicker", - "rev": "be7a0e82c4ea3fa04eca4f941a2983256955c1d3", + "rev": "e2472f499d67568edb1b727736c587b877e85344", "type": "github" }, "original": { @@ -787,37 +806,17 @@ "type": "github" } }, - "nh": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1712645404, - "narHash": "sha256-uEVd15WsX+Wti9PXW724puFcsFO72VTiJyBwW2WXT9M=", - "owner": "viperML", - "repo": "nh", - "rev": "fe4a96a0b0b0662dba7c186b4a1746c70bbcad03", - "type": "github" - }, - "original": { - "owner": "viperML", - "repo": "nh", - "type": "github" - } - }, "nix-gaming": { "inputs": { - "flake-parts": "flake-parts_2", + "flake-parts": "flake-parts_3", "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1713059094, - "narHash": "sha256-fAJHKkYKFUEAAcl95HVR9wyKwiXeAGSdbHdURmOUplw=", + "lastModified": 1713173715, + "narHash": "sha256-l2pXDP1VMx/Jy4/G09Gh6xKSJ+vAXnUKlBtFRN6NEZs=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "33441143246166540b02919d035c9b1089682936", + "rev": "32843d6cbb0dc010e077930b3b34ff7fd318be41", "type": "github" }, "original": { @@ -896,6 +895,24 @@ "type": "github" } }, + "nixpkgs-lib_2": { + "locked": { + "dir": "lib", + "lastModified": 1711703276, + "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { "lastModified": 1711460390, @@ -962,15 +979,15 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1712963716, - "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", - "owner": "nixos", + "lastModified": 1713248628, + "narHash": "sha256-NLznXB5AOnniUtZsyy/aPWOk8ussTuePp2acb9U+ISA=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", + "rev": "5672bc9dbf9d88246ddab5ac454e82318d094bb8", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -1010,11 +1027,11 @@ }, "nixpkgs_14": { "locked": { - "lastModified": 1708475490, - "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", + "lastModified": 1712963716, + "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0e74ca98a74bc7270d28838369593635a5db3260", + "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", "type": "github" }, "original": { @@ -1090,11 +1107,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1708475490, - "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", + "lastModified": 1712963716, + "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0e74ca98a74bc7270d28838369593635a5db3260", + "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", "type": "github" }, "original": { @@ -1106,11 +1123,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1708475490, - "narHash": "sha256-g1v0TsWBQPX97ziznfJdWhgMyMGtoBFs102xSYO4syU=", + "lastModified": 1712963716, + "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0e74ca98a74bc7270d28838369593635a5db3260", + "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", "type": "github" }, "original": { @@ -1122,11 +1139,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1712439257, - "narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=", + "lastModified": 1712963716, + "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599", + "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", "type": "github" }, "original": { @@ -1138,11 +1155,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1711523803, - "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=", + "lastModified": 1712963716, + "narHash": "sha256-WKm9CvgCldeIVvRz87iOMi8CFVB1apJlkUT4GGvA0iM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2726f127c15a4cc9810843b96cad73c7eb39e443", + "rev": "cfd6b5fc90b15709b780a5a1619695a88505a176", "type": "github" }, "original": { @@ -1170,11 +1187,11 @@ }, "nur": { "locked": { - "lastModified": 1713155537, - "narHash": "sha256-PRq9nCMwkR1JXH7Lalj0HtKD6xmirKcYX1I6/bn4u4A=", + "lastModified": 1713303955, + "narHash": "sha256-sVlPheZtFbvEIU4lTKaQ1MNAfe6RSmqhQN6nk0rQmvc=", "owner": "nix-community", "repo": "NUR", - "rev": "925357404770acfe89fb96e5fa52b3bc7d56fd99", + "rev": "89668a5c7afbef83112a154f587eb07b8dfc0c0c", "type": "github" }, "original": { @@ -1212,6 +1229,7 @@ "attic": "attic", "atuin": "atuin", "deploy-rs": "deploy-rs", + "flake-parts": "flake-parts_2", "helix": "helix", "home-manager": "home-manager", "hyprcursor": "hyprcursor", @@ -1220,7 +1238,6 @@ "hyprland-plugins": "hyprland-plugins", "hyprlock": "hyprlock", "hyprpicker": "hyprpicker", - "nh": "nh", "nix-gaming": "nix-gaming", "nix-index-database": "nix-index-database", "nixos-hardware": "nixos-hardware", @@ -1316,11 +1333,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1713066950, - "narHash": "sha256-ZaefFyvt5369XdjzSw43NhfbPM9MN5b9YXhzx4lFIRc=", + "lastModified": 1713174909, + "narHash": "sha256-APoDs2GtzVrsE+Z9w72qpHzEtEDfuinWcNTN7zhwLxg=", "owner": "Mic92", "repo": "sops-nix", - "rev": "226062b47fe0e2130ba3ee9f4f1c880dc815cf87", + "rev": "cc535d07cbcdd562bcca418e475c7b1959cefa4b", "type": "github" }, "original": { @@ -1361,16 +1378,16 @@ }, "systems_11": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -1390,6 +1407,21 @@ } }, "systems_13": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_14": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1511,16 +1543,16 @@ }, "systems_9": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, @@ -1591,14 +1623,14 @@ "hyprland-protocols": "hyprland-protocols_2", "hyprlang": "hyprlang_5", "nixpkgs": "nixpkgs_14", - "systems": "systems_12" + "systems": "systems_13" }, "locked": { - "lastModified": 1709299639, - "narHash": "sha256-jYqJM5khksLIbqSxCLUUcqEgI+O2LdlSlcMEBs39CAU=", + "lastModified": 1713214484, + "narHash": "sha256-h1bSIsDuPk1FGgvTuSHJyiU2Glu7oAyoPMJutKZmLQ8=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "2d2fb547178ec025da643db57d40a971507b82fe", + "rev": "bb44921534a9cee9635304fdb876c1b3ec3a8f61", "type": "github" }, "original": { @@ -1627,11 +1659,11 @@ ] }, "locked": { - "lastModified": 1709299639, - "narHash": "sha256-jYqJM5khksLIbqSxCLUUcqEgI+O2LdlSlcMEBs39CAU=", + "lastModified": 1713214484, + "narHash": "sha256-h1bSIsDuPk1FGgvTuSHJyiU2Glu7oAyoPMJutKZmLQ8=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "2d2fb547178ec025da643db57d40a971507b82fe", + "rev": "bb44921534a9cee9635304fdb876c1b3ec3a8f61", "type": "github" }, "original": { @@ -1647,11 +1679,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1713108842, - "narHash": "sha256-lbhHIQOvYBv1ZnDHIfXqcksgCrOJa9219vRgribq/+4=", + "lastModified": 1713309288, + "narHash": "sha256-mpgkeLDvqq048AJnnk95WEyk/PjfBOgSIlJQSl+zQSQ=", "owner": "sxyazi", "repo": "yazi", - "rev": "64c5e854578b04907717b0f6b3e5e5246d6fd236", + "rev": "1d15fd96c537a7e507c2271a274ee9e8e045aa40", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2f8099f..4fde4a8 100755 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "snowflake"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; hyprland.url = "github:hyprwm/Hyprland"; ags.url = "github:Aylur/ags"; nix-gaming.url = "github:fufexan/nix-gaming"; @@ -19,6 +19,7 @@ xdg-portal-hyprland.url = "github:hyprwm/xdg-desktop-portal-hyprland"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; atuin.url = "github:atuinsh/atuin"; + flake-parts.url = "github:hercules-ci/flake-parts"; hyprland-plugins = { url = "github:hyprwm/hyprland-plugins"; inputs.hyprland.follows = "hyprland"; @@ -39,58 +40,57 @@ url = "github:Mic92/nix-index-database"; inputs.nixpkgs.follows = "nixpkgs"; }; - nh = { - url = "github:viperML/nh"; - inputs.nixpkgs.follows = "nixpkgs"; - }; anyrun = { url = "github:Kirottu/anyrun"; inputs.nixpkgs.follows = "nixpkgs"; }; }; - outputs = { - self, - nixpkgs, - pre-commit-hooks, - ... - } @ inputs: let - system = "x86_64-linux"; - pkgs = import nixpkgs { - inherit system; - }; - in { - checks = { - pre-commit-check = pre-commit-hooks.lib.${system}.run { - src = ./.; - hooks = { - stylua.enable = true; - eslint.enable = true; - statix.enable = true; - alejandra.enable = true; - deadnix = { - enable = true; - excludes = ["overlays.nix"]; - }; - prettier = { - enable = true; - files = "\\.(js|ts|md|json)$"; + + outputs = inputs: + inputs.flake-parts.lib.mkFlake {inherit inputs;} { + imports = [ + inputs.pre-commit-hooks.flakeModule + ./hosts + ./hosts/deploy.nix + ./home/profiles + ]; + systems = ["x86_64-linux"]; + perSystem = { + config, + pkgs, + ... + }: { + pre-commit = { + settings = { + excludes = ["flake.lock"]; + hooks = { + stylua.enable = true; + eslint.enable = true; + statix.enable = true; + alejandra.enable = true; + deadnix = { + enable = true; + excludes = ["overlays.nix"]; + }; + prettier = { + enable = true; + files = "\\.(js|ts|md|json)$"; + }; + }; }; }; + devShells.default = pkgs.mkShell { + name = "snowflake"; + shellHook = config.pre-commit.installationScript; + packages = with pkgs; [ + git + sops + alejandra + yaml-language-server + lua-language-server + ]; + }; + formatter = pkgs.alejandra; }; }; - devShells.${system}.default = pkgs.mkShell { - name = "snowflake"; - inherit (self.checks.pre-commit-check) shellHook; - packages = with pkgs; [ - git - sops - alejandra - yaml-language-server - lua-language-server - ]; - }; - formatter.${system} = pkgs.alejandra; - deploy = import ./hosts/deploy.nix inputs; - nixosConfigurations = import ./hosts inputs; - }; } diff --git a/home/default.nix b/home/default.nix index 336cae3..4e36a7c 100644 --- a/home/default.nix +++ b/home/default.nix @@ -1,88 +1,10 @@ -{pkgs, ...}: { - imports = [ - ./helix - ./neofetch - ./nushell - ./starship - ./lazygit - ./yazi - ]; +{inputs, ...}: { + systemd.user.startServices = "sd-switch"; + programs.home-manager.enable = true; - home.packages = with pkgs; [ - wget - croc - eza - eva - fd - du-dust - bottom - gnupg - ripgrep - lazydocker - yt-dlp - nfs-utils - dig - tailspin - nitch - unzip - unrar - p7zip - procs - ]; - - services = { - gpg-agent = { - enable = true; - defaultCacheTtl = 3600; - pinentryPackage = pkgs.pinentry-curses; - enableSshSupport = true; - enableNushellIntegration = true; - }; - }; - - programs = { - bat.enable = true; - atuin = { - enable = true; - enableNushellIntegration = true; - settings = { - auto_sync = true; - update_check = true; - sync_frequency = "1h"; - sync_address = "http://100.104.42.96:8888"; - secrets_filter = true; - style = "full"; - }; - flags = ["--disable-up-arrow"]; - }; - git = { - enable = true; - delta.enable = true; - userEmail = "github@notohh.dev"; - userName = "notohh"; - signing = { - key = "BD47506D475EE86D"; - signByDefault = true; - }; - ignores = ["*result*" ".direnv" "node_modules"]; - }; - gh = { - enable = true; - gitCredentialHelper.enable = true; - settings = { - editor = "hx"; - prompt = "enabled"; - }; - }; - direnv = { - enable = true; - enableNushellIntegration = true; - nix-direnv.enable = true; - }; - zoxide = { - enable = true; - enableNushellIntegration = true; - options = ["--cmd cdd"]; - }; + home = { + username = "notoh"; + homeDirectory = "/home/notoh"; + stateVersion = "23.05"; }; } diff --git a/home/gtk/catppuccin-red.nix b/home/gtk/catppuccin-red.nix deleted file mode 100644 index efc2e3f..0000000 --- a/home/gtk/catppuccin-red.nix +++ /dev/null @@ -1,21 +0,0 @@ -{pkgs, ...}: { - home.pointerCursor = { - package = pkgs.bibata-cursors; - name = "Bibata-Modern-Classic"; - size = 24; - gtk.enable = true; - x11.enable = true; - }; - - gtk = { - enable = true; - theme = { - name = "Catppuccin-Mocha-Standard-Red-Dark"; - package = pkgs.catppuccin-gtk.override { - accents = ["red"]; - size = "standard"; - variant = "mocha"; - }; - }; - }; -} diff --git a/hosts/ame/home.nix b/home/profiles/ame/default.nix old mode 100755 new mode 100644 similarity index 69% rename from hosts/ame/home.nix rename to home/profiles/ame/default.nix index ba309df..f35923c --- a/hosts/ame/home.nix +++ b/home/profiles/ame/default.nix @@ -1,44 +1,27 @@ {pkgs, ...}: { imports = [ - ../../home - ../../home/anyrun - ../../home/firefox - ../../home/wezterm - ../../home/zathura - ../../home/zellij - ../../home/mako - ../../home/gtk/catppuccin-red.nix + ../common.nix ]; - systemd.user.startServices = "sd-switch"; - programs.home-manager.enable = true; - - home = { - username = "notoh"; - homeDirectory = "/home/notoh"; - packages = with pkgs; [ - chromium - discord - spotify-player - cinny-desktop - pavucontrol - imv - mpv - rustypaste-cli - playerctl - obsidian - cryptomator - wayland - glib - grim - slurp - wl-clipboard - swww - hyprpicker - (libsForQt5.callPackage ../../pkgs/chatterino7 {}) - ]; - stateVersion = "23.05"; - }; + home.packages = with pkgs; [ + chromium + discord + pavucontrol + imv + mpv + rustypaste-cli + playerctl + obsidian + cryptomator + wayland + glib + grim + slurp + wl-clipboard + swww + hyprpicker + (libsForQt5.callPackage ../../pkgs/chatterino7 {}) + ]; programs.ssh = { enable = true; extraConfig = '' diff --git a/home/profiles/common.nix b/home/profiles/common.nix new file mode 100644 index 0000000..bbcd352 --- /dev/null +++ b/home/profiles/common.nix @@ -0,0 +1,37 @@ +{pkgs, ...}: { + imports = [ + ../programs/helix + ../programs/lazygit + ../programs/neofetch + ../programs/nushell + ../programs/yazi + ../programs/atuin.nix + ../programs/bat.nix + ../programs/direnv.nix + ../programs/git.nix + ../programs/starship.nix + ../programs/zoxide.nix + ]; + + home.packages = with pkgs; [ + wget + croc + eza + eva + fd + du-dust + bottom + gnupg + ripgrep + lazydocker + yt-dlp + nfs-utils + dig + tailspin + nitch + unzip + unrar + p7zip + procs + ]; +} diff --git a/home/profiles/default.nix b/home/profiles/default.nix new file mode 100644 index 0000000..32a3dd6 --- /dev/null +++ b/home/profiles/default.nix @@ -0,0 +1,48 @@ +# stolen from fufexan +{ + self, + inputs, + ... +}: let + extraSpecialArgs = {inherit inputs self;}; + + homeImports = { + "notoh@tsuki" = [ + ../. + ./tsuki + ]; + "notoh@ame" = [ + ../. + ./ame + ]; + default = [ + ../. + ./default + ]; + }; + + inherit (inputs.hm.lib) homeManagerConfiguration; + + pkgs = inputs.nixpkgs.legacyPackages.x86_64-linux; +in { + _module.args = {inherit homeImports;}; + + flake = { + homeConfigurations = { + "notoh_tsuki" = homeManagerConfiguration { + modules = homeImports."notoh@tsuki"; + inherit pkgs extraSpecialArgs; + }; + + "notoh_ame" = homeManagerConfiguration { + modules = homeImports."notoh@ame"; + inherit pkgs extraSpecialArgs; + }; + + default = homeManagerConfiguration { + modules = homeImports.default; + inherit pkgs extraSpecialArgs; + }; + }; + }; +} diff --git a/home/profiles/default/default.nix b/home/profiles/default/default.nix new file mode 100644 index 0000000..c74e826 --- /dev/null +++ b/home/profiles/default/default.nix @@ -0,0 +1,5 @@ +{ + imports = [ + ../common.nix + ]; +} diff --git a/hosts/tsuki/home.nix b/home/profiles/tsuki/default.nix old mode 100755 new mode 100644 similarity index 57% rename from hosts/tsuki/home.nix rename to home/profiles/tsuki/default.nix index 25bd25e..ac32ea7 --- a/hosts/tsuki/home.nix +++ b/home/profiles/tsuki/default.nix @@ -4,63 +4,62 @@ ... }: { imports = [ - ../../home - ../../home/firefox - ../../home/ags - ../../home/anyrun - ../../home/cava - ../../home/wezterm - ../../home/zathura - ../../home/gtk - ../../home/mako - ../../home/zellij - ../../home/spotify-player - ../../home/wayland/hyprland - ../../home/wayland/services/hypridle.nix - ../../home/wayland/programs/hyprlock.nix + inputs.hyprland.homeManagerModules.default + inputs.anyrun.homeManagerModules.default + inputs.ags.homeManagerModules.default + inputs.hypridle.homeManagerModules.default + inputs.hyprlock.homeManagerModules.default + inputs.nix-index-database.hmModules.nix-index + ../common.nix + ../../services + ../../programs/ags + ../../programs/anyrun + ../../programs/firefox + ../../programs/wezterm + ../../programs/zellij + ../../programs/gtk.nix + ../../programs/cava.nix + ../../programs/mako.nix + ../../programs/spotify-player.nix + ../../programs/zathura.nix + ../../wayland/hyprland + ../../wayland/services/hypridle.nix + ../../wayland/programs/hyprlock.nix ]; - systemd.user.startServices = "sd-switch"; - programs.home-manager.enable = true; - - home = { - username = "notoh"; - homeDirectory = "/home/notoh"; - packages = with pkgs; [ - chromium - discord - cinny-desktop - thunderbird - obs-studio - pavucontrol - anki-bin - tomato-c - distrobox - gpg-tui - vscode-fhs - obsidian-wayland - jellyfin-mpv-shim - virt-manager - qbittorrent - imv - mpv - ffmpeg - rustypaste-cli - gimp - cryptomator - ventoy-bin-full - wine - lutris - mangohud - bottles - prismlauncher - stellarium - inputs.nix-gaming.packages.${pkgs.system}.osu-lazer-bin - (libsForQt5.callPackage ../../pkgs/chatterino7 {}) - (callPackage ../../pkgs/jellyfin-rpc {}) - ]; - stateVersion = "23.05"; - }; + home.packages = with pkgs; [ + chromium + discord + signal-desktop + thunderbird + obs-studio + pavucontrol + anki-bin + tomato-c + distrobox + gpg-tui + vscode-fhs + obsidian-wayland + jellyfin-mpv-shim + virt-manager + qbittorrent + imv + mpv + ffmpeg + rustypaste-cli + gimp + cryptomator + ventoy-bin-full + wine + lutris + mangohud + bottles + prismlauncher + stellarium + inputs.nix-gaming.packages.${pkgs.system}.osu-lazer-bin + (libsForQt5.callPackage ../../../pkgs/chatterino7 {}) + (callPackage ../../../pkgs/jellyfin-rpc {}) + ]; programs.ssh = { enable = true; diff --git a/home/ags/config/.eslintrc.js b/home/programs/ags/config/.eslintrc.js similarity index 100% rename from home/ags/config/.eslintrc.js rename to home/programs/ags/config/.eslintrc.js diff --git a/home/ags/config/.gitignore b/home/programs/ags/config/.gitignore similarity index 100% rename from home/ags/config/.gitignore rename to home/programs/ags/config/.gitignore diff --git a/home/ags/config/.prettierrc.json b/home/programs/ags/config/.prettierrc.json similarity index 100% rename from home/ags/config/.prettierrc.json rename to home/programs/ags/config/.prettierrc.json diff --git a/home/ags/config/config.js b/home/programs/ags/config/config.js similarity index 100% rename from home/ags/config/config.js rename to home/programs/ags/config/config.js diff --git a/home/ags/config/import.js b/home/programs/ags/config/import.js similarity index 100% rename from home/ags/config/import.js rename to home/programs/ags/config/import.js diff --git a/home/ags/config/js/main.js b/home/programs/ags/config/js/main.js similarity index 100% rename from home/ags/config/js/main.js rename to home/programs/ags/config/js/main.js diff --git a/home/ags/config/js/widgets/hyprland.js b/home/programs/ags/config/js/widgets/hyprland.js similarity index 100% rename from home/ags/config/js/widgets/hyprland.js rename to home/programs/ags/config/js/widgets/hyprland.js diff --git a/home/ags/config/js/widgets/images/image.js b/home/programs/ags/config/js/widgets/images/image.js similarity index 100% rename from home/ags/config/js/widgets/images/image.js rename to home/programs/ags/config/js/widgets/images/image.js diff --git a/home/ags/config/js/widgets/images/static/nixos.png b/home/programs/ags/config/js/widgets/images/static/nixos.png similarity index 100% rename from home/ags/config/js/widgets/images/static/nixos.png rename to home/programs/ags/config/js/widgets/images/static/nixos.png diff --git a/home/ags/config/js/widgets/music.js b/home/programs/ags/config/js/widgets/music.js similarity index 100% rename from home/ags/config/js/widgets/music.js rename to home/programs/ags/config/js/widgets/music.js diff --git a/home/ags/config/js/widgets/system.js b/home/programs/ags/config/js/widgets/system.js similarity index 100% rename from home/ags/config/js/widgets/system.js rename to home/programs/ags/config/js/widgets/system.js diff --git a/home/ags/config/js/widgets/time.js b/home/programs/ags/config/js/widgets/time.js similarity index 100% rename from home/ags/config/js/widgets/time.js rename to home/programs/ags/config/js/widgets/time.js diff --git a/home/ags/config/jsconfig.json b/home/programs/ags/config/jsconfig.json similarity index 100% rename from home/ags/config/jsconfig.json rename to home/programs/ags/config/jsconfig.json diff --git a/home/ags/config/main.scss b/home/programs/ags/config/main.scss similarity index 100% rename from home/ags/config/main.scss rename to home/programs/ags/config/main.scss diff --git a/home/ags/config/package-lock.json b/home/programs/ags/config/package-lock.json similarity index 100% rename from home/ags/config/package-lock.json rename to home/programs/ags/config/package-lock.json diff --git a/home/ags/config/package.json b/home/programs/ags/config/package.json similarity index 100% rename from home/ags/config/package.json rename to home/programs/ags/config/package.json diff --git a/home/ags/config/scss/bar.scss b/home/programs/ags/config/scss/bar.scss similarity index 100% rename from home/ags/config/scss/bar.scss rename to home/programs/ags/config/scss/bar.scss diff --git a/home/ags/config/scss/colors.scss b/home/programs/ags/config/scss/colors.scss similarity index 100% rename from home/ags/config/scss/colors.scss rename to home/programs/ags/config/scss/colors.scss diff --git a/home/ags/config/scss/general.scss b/home/programs/ags/config/scss/general.scss similarity index 100% rename from home/ags/config/scss/general.scss rename to home/programs/ags/config/scss/general.scss diff --git a/home/ags/config/scss/widgets.scss b/home/programs/ags/config/scss/widgets.scss similarity index 100% rename from home/ags/config/scss/widgets.scss rename to home/programs/ags/config/scss/widgets.scss diff --git a/home/ags/default.nix b/home/programs/ags/default.nix similarity index 81% rename from home/ags/default.nix rename to home/programs/ags/default.nix index db78e95..fb2c4c9 100644 --- a/home/ags/default.nix +++ b/home/programs/ags/default.nix @@ -3,7 +3,7 @@ config, ... }: let - configDir = "/home/notoh/snowflake/home/ags/config"; + configDir = "/home/notoh/snowflake/homeo/programs/ags/config"; in { programs.ags = { enable = true; diff --git a/home/anyrun/default.nix b/home/programs/anyrun/default.nix similarity index 100% rename from home/anyrun/default.nix rename to home/programs/anyrun/default.nix diff --git a/home/anyrun/style.scss b/home/programs/anyrun/style.scss similarity index 100% rename from home/anyrun/style.scss rename to home/programs/anyrun/style.scss diff --git a/home/programs/atuin.nix b/home/programs/atuin.nix new file mode 100644 index 0000000..de4444a --- /dev/null +++ b/home/programs/atuin.nix @@ -0,0 +1,15 @@ +_: { + programs.atuin = { + enable = true; + enableNushellIntegration = true; + settings = { + auto_sync = true; + update_check = true; + sync_frequency = "1h"; + sync_address = "http://100.104.42.96:8888"; + secrets_filter = true; + style = "full"; + }; + flags = ["--disable-up-arrow"]; + }; +} diff --git a/home/programs/bat.nix b/home/programs/bat.nix new file mode 100644 index 0000000..8bdc089 --- /dev/null +++ b/home/programs/bat.nix @@ -0,0 +1,3 @@ +_: { + programs.bat.enable = true; +} diff --git a/home/cava/default.nix b/home/programs/cava.nix similarity index 100% rename from home/cava/default.nix rename to home/programs/cava.nix diff --git a/home/programs/direnv.nix b/home/programs/direnv.nix new file mode 100644 index 0000000..e88b1eb --- /dev/null +++ b/home/programs/direnv.nix @@ -0,0 +1,7 @@ +_: { + programs.direnv = { + enable = true; + enableNushellIntegration = true; + nix-direnv.enable = true; + }; +} diff --git a/home/firefox/default.nix b/home/programs/firefox/default.nix similarity index 100% rename from home/firefox/default.nix rename to home/programs/firefox/default.nix diff --git a/home/firefox/user.js/betterfox.js b/home/programs/firefox/user.js/betterfox.js similarity index 100% rename from home/firefox/user.js/betterfox.js rename to home/programs/firefox/user.js/betterfox.js diff --git a/home/programs/git.nix b/home/programs/git.nix new file mode 100644 index 0000000..bb8e6a5 --- /dev/null +++ b/home/programs/git.nix @@ -0,0 +1,23 @@ +{pkgs, ...}: { + programs = { + git = { + enable = true; + delta.enable = true; + userEmail = "github@notohh.dev"; + userName = "notohh"; + signing = { + key = "BD47506D475EE86D"; + signByDefault = true; + }; + ignores = ["*result*" ".direnv" "node_modules"]; + }; + gh = { + enable = true; + gitCredentialHelper.enable = true; + settings = { + editor = "hx"; + prompt = "enabled"; + }; + }; + }; +} diff --git a/home/gtk/default.nix b/home/programs/gtk.nix similarity index 100% rename from home/gtk/default.nix rename to home/programs/gtk.nix diff --git a/home/helix/default.nix b/home/programs/helix/default.nix similarity index 100% rename from home/helix/default.nix rename to home/programs/helix/default.nix diff --git a/home/helix/languages.nix b/home/programs/helix/languages.nix similarity index 100% rename from home/helix/languages.nix rename to home/programs/helix/languages.nix diff --git a/home/helix/themes/catppuccin_mocha.nix b/home/programs/helix/themes/catppuccin_mocha.nix similarity index 100% rename from home/helix/themes/catppuccin_mocha.nix rename to home/programs/helix/themes/catppuccin_mocha.nix diff --git a/home/helix/themes/tokyonight.nix b/home/programs/helix/themes/tokyonight.nix similarity index 100% rename from home/helix/themes/tokyonight.nix rename to home/programs/helix/themes/tokyonight.nix diff --git a/home/lazygit/default.nix b/home/programs/lazygit/default.nix similarity index 100% rename from home/lazygit/default.nix rename to home/programs/lazygit/default.nix diff --git a/home/mako/default.nix b/home/programs/mako.nix similarity index 100% rename from home/mako/default.nix rename to home/programs/mako.nix diff --git a/home/neofetch/config.conf b/home/programs/neofetch/config.conf similarity index 100% rename from home/neofetch/config.conf rename to home/programs/neofetch/config.conf diff --git a/home/neofetch/default.nix b/home/programs/neofetch/default.nix similarity index 100% rename from home/neofetch/default.nix rename to home/programs/neofetch/default.nix diff --git a/home/nushell/config.nu b/home/programs/nushell/config.nu similarity index 100% rename from home/nushell/config.nu rename to home/programs/nushell/config.nu diff --git a/home/nushell/default.nix b/home/programs/nushell/default.nix similarity index 100% rename from home/nushell/default.nix rename to home/programs/nushell/default.nix diff --git a/home/nushell/env.nu b/home/programs/nushell/env.nu similarity index 100% rename from home/nushell/env.nu rename to home/programs/nushell/env.nu diff --git a/home/spotify-player/default.nix b/home/programs/spotify-player.nix similarity index 100% rename from home/spotify-player/default.nix rename to home/programs/spotify-player.nix diff --git a/home/starship/default.nix b/home/programs/starship.nix similarity index 100% rename from home/starship/default.nix rename to home/programs/starship.nix diff --git a/home/wezterm/config.lua b/home/programs/wezterm/config.lua similarity index 100% rename from home/wezterm/config.lua rename to home/programs/wezterm/config.lua diff --git a/home/wezterm/default.nix b/home/programs/wezterm/default.nix similarity index 100% rename from home/wezterm/default.nix rename to home/programs/wezterm/default.nix diff --git a/home/yazi/default.nix b/home/programs/yazi/default.nix similarity index 100% rename from home/yazi/default.nix rename to home/programs/yazi/default.nix diff --git a/home/yazi/init.lua b/home/programs/yazi/init.lua similarity index 100% rename from home/yazi/init.lua rename to home/programs/yazi/init.lua diff --git a/home/yazi/keymap.nix b/home/programs/yazi/keymap.nix similarity index 100% rename from home/yazi/keymap.nix rename to home/programs/yazi/keymap.nix diff --git a/home/yazi/openers.nix b/home/programs/yazi/openers.nix similarity index 100% rename from home/yazi/openers.nix rename to home/programs/yazi/openers.nix diff --git a/home/zathura/default.nix b/home/programs/zathura.nix similarity index 100% rename from home/zathura/default.nix rename to home/programs/zathura.nix diff --git a/home/zellij/default.nix b/home/programs/zellij/default.nix similarity index 100% rename from home/zellij/default.nix rename to home/programs/zellij/default.nix diff --git a/home/zellij/layouts.nix b/home/programs/zellij/layouts.nix similarity index 100% rename from home/zellij/layouts.nix rename to home/programs/zellij/layouts.nix diff --git a/home/programs/zoxide.nix b/home/programs/zoxide.nix new file mode 100644 index 0000000..7b5bcb6 --- /dev/null +++ b/home/programs/zoxide.nix @@ -0,0 +1,7 @@ +_: { + programs.zoxide = { + enable = true; + enableNushellIntegration = true; + options = ["--cmd cdd"]; + }; +} diff --git a/home/services/default.nix b/home/services/default.nix new file mode 100644 index 0000000..c08b659 --- /dev/null +++ b/home/services/default.nix @@ -0,0 +1,3 @@ +{ + imports = [./gpg.nix]; +} diff --git a/home/services/gpg.nix b/home/services/gpg.nix new file mode 100644 index 0000000..b743752 --- /dev/null +++ b/home/services/gpg.nix @@ -0,0 +1,11 @@ +{pkgs, ...}: { + services = { + gpg-agent = { + enable = true; + defaultCacheTtl = 3600; + pinentryPackage = pkgs.pinentry-curses; + enableSshSupport = true; + enableNushellIntegration = true; + }; + }; +} diff --git a/hosts/arashi/home.nix b/hosts/arashi/home.nix deleted file mode 100644 index c7eafac..0000000 --- a/hosts/arashi/home.nix +++ /dev/null @@ -1,14 +0,0 @@ -{...}: { - imports = [ - ../../home - ]; - - systemd.user.startServices = "sd-switch"; - programs.home-manager.enable = true; - - home = { - username = "notoh"; - homeDirectory = "/home/notoh"; - stateVersion = "23.05"; - }; -} diff --git a/hosts/default.nix b/hosts/default.nix index 24dcf36..8a2dc10 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -1,238 +1,200 @@ -inputs: let - system = "x86_64-linux"; - sopsModule = inputs.sops-nix.nixosModules.sops; - hmModule = inputs.home-manager.nixosModules.home-manager; - hyprlandModule = inputs.hyprland.homeManagerModules.default; - nix-index-Module = inputs.nix-index-database.hmModules.nix-index; - anyrunModule = inputs.anyrun.homeManagerModules.default; - agsModule = inputs.ags.homeManagerModules.default; - atticModule = inputs.attic.nixosModules.atticd; - nurModule = inputs.nur.nixosModules.nur; - hypridleModule = inputs.hypridle.homeManagerModules.default; - hyprlockModule = inputs.hyprlock.homeManagerModules.default; - t480Module = inputs.nixos-hardware.nixosModules.lenovo-thinkpad-t480; - inherit (inputs.nixpkgs.lib) nixosSystem; -in { - tsuki = nixosSystem { - inherit system; +{ + inputs, + homeImports, + ... +}: { + flake.nixosConfigurations = let + inherit (inputs.nixpkgs.lib) nixosSystem; specialArgs = {inherit inputs;}; - modules = [ - ./tsuki - sopsModule - hmModule - atticModule - nurModule - { - home-manager = { - useGlobalPkgs = true; - useUserPackages = true; - extraSpecialArgs = {inherit inputs;}; - users.notoh = { - imports = [ - ./tsuki/home.nix - hyprlandModule - nix-index-Module - anyrunModule - agsModule - hypridleModule - hyprlockModule - ]; + sopsModule = inputs.sops-nix.nixosModules.sops; + hmModule = inputs.home-manager.nixosModules.home-manager; + atticModule = inputs.attic.nixosModules.atticd; + nurModule = inputs.nur.nixosModules.nur; + t480Module = inputs.nixos-hardware.nixosModules.lenovo-thinkpad-t480; + in { + tsuki = nixosSystem { + inherit specialArgs; + modules = [ + ./tsuki + sopsModule + hmModule + atticModule + nurModule + { + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + extraSpecialArgs = specialArgs; + users.notoh = { + imports = homeImports."notoh@tsuki"; + }; }; - }; - } - ]; - }; - sakura = nixosSystem { - inherit system; - specialArgs = {inherit inputs;}; - modules = [ - ./sakura - sopsModule - hmModule - { - home-manager = { - useGlobalPkgs = true; - useUserPackages = true; - extraSpecialArgs = {inherit inputs;}; - users.notoh = { - imports = [ - ./sakura/home.nix - ]; + } + ]; + }; + sakura = nixosSystem { + inherit specialArgs; + modules = [ + ./sakura + sopsModule + hmModule + { + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + extraSpecialArgs = specialArgs; + users.notoh = { + imports = homeImports."default"; + }; }; - }; - } - ]; - }; - kariru = nixosSystem { - inherit system; - specialArgs = {inherit inputs;}; - modules = [ - ./kariru - sopsModule - hmModule - { - home-manager = { - useGlobalPkgs = true; - useUserPackages = true; - extraSpecialArgs = {inherit inputs;}; - users.notoh = { - imports = [ - ./kariru/home.nix - ]; + } + ]; + }; + kariru = nixosSystem { + inherit specialArgs; + modules = [ + ./kariru + sopsModule + hmModule + { + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + extraSpecialArgs = specialArgs; + users.notoh = { + imports = homeImports."default"; + }; }; - }; - } - ]; - }; - yuki = nixosSystem { - inherit system; - specialArgs = {inherit inputs;}; - modules = [ - ./yuki - sopsModule - hmModule - { - home-manager = { - useGlobalPkgs = true; - useUserPackages = true; - extraSpecialArgs = {inherit inputs;}; - users.notoh = { - imports = [ - ./yuki/home.nix - ]; + } + ]; + }; + yuki = nixosSystem { + inherit specialArgs; + modules = [ + ./yuki + sopsModule + hmModule + { + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + extraSpecialArgs = specialArgs; + users.notoh = { + imports = homeImports."default"; + }; }; - }; - } - ]; - }; - ame = nixosSystem { - inherit system; - specialArgs = {inherit inputs;}; - modules = [ - ./ame - sopsModule - hmModule - t480Module - { - home-manager = { - useGlobalPkgs = true; - useUserPackages = true; - extraSpecialArgs = {inherit inputs;}; - users.notoh = { - imports = [ - ./ame/home.nix - anyrunModule - agsModule - ]; + } + ]; + }; + ame = nixosSystem { + inherit specialArgs; + modules = [ + ./ame + sopsModule + hmModule + t480Module + { + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + extraSpecialArgs = specialArgs; + users.notoh = { + imports = homeImports."notoh@ame"; + }; }; - }; - } - ]; - }; - arashi = nixosSystem { - inherit system; - specialArgs = {inherit inputs;}; - modules = [ - ./arashi - sopsModule - hmModule - { - home-manager = { - useGlobalPkgs = true; - useUserPackages = true; - extraSpecialArgs = {inherit inputs;}; - users.notoh = { - imports = [ - ./arashi/home.nix - ]; + } + ]; + }; + arashi = nixosSystem { + inherit specialArgs; + modules = [ + ./arashi + sopsModule + hmModule + { + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + extraSpecialArgs = specialArgs; + users.notoh = { + imports = homeImports."default"; + }; }; - }; - } - ]; - }; - sora = nixosSystem { - inherit system; - specialArgs = {inherit inputs;}; - modules = [ - ./sora - sopsModule - atticModule - hmModule - { - home-manager = { - useGlobalPkgs = true; - useUserPackages = true; - extraSpecialArgs = {inherit inputs;}; - users.notoh = { - imports = [ - ./sora/home.nix - ]; + } + ]; + }; + sora = nixosSystem { + inherit specialArgs; + modules = [ + ./sora + sopsModule + atticModule + hmModule + { + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + extraSpecialArgs = specialArgs; + users.notoh = { + imports = homeImports."default"; + }; }; - }; - } - ]; - }; - tsuru = nixosSystem { - inherit system; - specialArgs = {inherit inputs;}; - modules = [ - ./tsuru - sopsModule - hmModule - { - home-manager = { - useGlobalPkgs = true; - useUserPackages = true; - extraSpecialArgs = {inherit inputs;}; - users.notoh = { - imports = [ - ./tsuru/home.nix - ]; + } + ]; + }; + tsuru = nixosSystem { + inherit specialArgs; + modules = [ + ./tsuru + sopsModule + hmModule + { + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + extraSpecialArgs = specialArgs; + users.notoh = { + imports = homeImports."default"; + }; }; - }; - } - ]; - }; - haru = nixosSystem { - inherit system; - specialArgs = {inherit inputs;}; - modules = [ - ./haru - sopsModule - hmModule - { - home-manager = { - useGlobalPkgs = true; - useUserPackages = true; - extraSpecialArgs = {inherit inputs;}; - users.notoh = { - imports = [ - ./haru/home.nix - ]; + } + ]; + }; + haru = nixosSystem { + inherit specialArgs; + modules = [ + ./haru + sopsModule + hmModule + { + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + extraSpecialArgs = specialArgs; + users.notoh = { + imports = homeImports."default"; + }; }; - }; - } - ]; - }; - kaze = nixosSystem { - inherit system; - specialArgs = {inherit inputs;}; - modules = [ - ./kaze - sopsModule - hmModule - { - home-manager = { - useGlobalPkgs = true; - useUserPackages = true; - extraSpecialArgs = {inherit inputs;}; - users.notoh = { - imports = [ - ./kaze/home.nix - ]; + } + ]; + }; + kaze = nixosSystem { + inherit specialArgs; + modules = [ + ./kaze + sopsModule + hmModule + { + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + extraSpecialArgs = specialArgs; + users.notoh = { + imports = homeImports."default"; + }; }; - }; - } - ]; + } + ]; + }; }; } diff --git a/hosts/deploy.nix b/hosts/deploy.nix index ad4bde0..74c39cc 100644 --- a/hosts/deploy.nix +++ b/hosts/deploy.nix @@ -1,84 +1,88 @@ -inputs: { - nodes = with inputs.deploy-rs.lib.x86_64-linux; { - sakura = { - hostname = "100.121.201.47"; - profiles.system = { - user = "root"; - path = activate.nixos inputs.self.nixosConfigurations.sakura; +{inputs, ...}: { + flake = { + deploy = { + nodes = with inputs.deploy-rs.lib.x86_64-linux; { + sakura = { + hostname = "100.121.201.47"; + profiles.system = { + user = "root"; + path = activate.nixos inputs.self.nixosConfigurations.sakura; + }; + sshUser = "root"; + sshOpts = ["-t" "-i" "~/.ssh/forgejo"]; + magicRollback = true; + }; + kariru = { + hostname = "100.126.229.95"; + profiles.system = { + user = "root"; + path = activate.nixos inputs.self.nixosConfigurations.kariru; + }; + sshUser = "root"; + sshOpts = ["-t" "-i" "~/.ssh/forgejo"]; + magicRollback = true; + }; + yuki = { + hostname = "100.108.113.89"; + profiles.system = { + user = "root"; + path = activate.nixos inputs.self.nixosConfigurations.yuki; + }; + sshUser = "root"; + sshOpts = ["-t" "-i" "~/.ssh/forgejo"]; + magicRollback = true; + }; + arashi = { + hostname = "100.94.214.100"; + profiles.system = { + user = "root"; + path = activate.nixos inputs.self.nixosConfigurations.arashi; + }; + sshUser = "root"; + sshOpts = ["-t" "-i" "~/.ssh/forgejo"]; + magicRollback = true; + }; + sora = { + hostname = "100.104.42.96"; + profiles.system = { + user = "root"; + path = activate.nixos inputs.self.nixosConfigurations.sora; + }; + sshUser = "root"; + sshOpts = ["-t" "-i" "~/.ssh/forgejo"]; + magicRollback = true; + }; + tsuru = { + hostname = "100.82.146.40"; + profiles.system = { + user = "root"; + path = activate.nixos inputs.self.nixosConfigurations.tsuru; + }; + sshUser = "root"; + sshOpts = ["-t" "-i" "~/.ssh/forgejo"]; + magicRollback = true; + }; + haru = { + hostname = "100.73.192.45"; + profiles.system = { + user = "root"; + path = activate.nixos inputs.self.nixosConfigurations.haru; + }; + sshUser = "root"; + sshOpts = ["-t" "-i" "~/.ssh/forgejo"]; + magicRollback = true; + }; + kaze = { + hostname = "100.69.79.81"; + profiles.system = { + user = "root"; + path = activate.nixos inputs.self.nixosConfigurations.kaze; + }; + sshUser = "root"; + sshOpts = ["-t" "-i" "~/.ssh/forgejo"]; + magicRollback = true; + }; }; - sshUser = "root"; - sshOpts = ["-t" "-i" "~/.ssh/forgejo"]; - magicRollback = true; - }; - kariru = { - hostname = "100.126.229.95"; - profiles.system = { - user = "root"; - path = activate.nixos inputs.self.nixosConfigurations.kariru; - }; - sshUser = "root"; - sshOpts = ["-t" "-i" "~/.ssh/forgejo"]; - magicRollback = true; - }; - yuki = { - hostname = "100.108.113.89"; - profiles.system = { - user = "root"; - path = activate.nixos inputs.self.nixosConfigurations.yuki; - }; - sshUser = "root"; - sshOpts = ["-t" "-i" "~/.ssh/forgejo"]; - magicRollback = true; - }; - arashi = { - hostname = "100.94.214.100"; - profiles.system = { - user = "root"; - path = activate.nixos inputs.self.nixosConfigurations.arashi; - }; - sshUser = "root"; - sshOpts = ["-t" "-i" "~/.ssh/forgejo"]; - magicRollback = true; - }; - sora = { - hostname = "100.104.42.96"; - profiles.system = { - user = "root"; - path = activate.nixos inputs.self.nixosConfigurations.sora; - }; - sshUser = "root"; - sshOpts = ["-t" "-i" "~/.ssh/forgejo"]; - magicRollback = true; - }; - tsuru = { - hostname = "100.82.146.40"; - profiles.system = { - user = "root"; - path = activate.nixos inputs.self.nixosConfigurations.tsuru; - }; - sshUser = "root"; - sshOpts = ["-t" "-i" "~/.ssh/forgejo"]; - magicRollback = true; - }; - haru = { - hostname = "100.73.192.45"; - profiles.system = { - user = "root"; - path = activate.nixos inputs.self.nixosConfigurations.haru; - }; - sshUser = "root"; - sshOpts = ["-t" "-i" "~/.ssh/forgejo"]; - magicRollback = true; - }; - kaze = { - hostname = "100.69.79.81"; - profiles.system = { - user = "root"; - path = activate.nixos inputs.self.nixosConfigurations.kaze; - }; - sshUser = "root"; - sshOpts = ["-t" "-i" "~/.ssh/forgejo"]; - magicRollback = true; }; }; } diff --git a/hosts/haru/home.nix b/hosts/haru/home.nix deleted file mode 100644 index c7eafac..0000000 --- a/hosts/haru/home.nix +++ /dev/null @@ -1,14 +0,0 @@ -{...}: { - imports = [ - ../../home - ]; - - systemd.user.startServices = "sd-switch"; - programs.home-manager.enable = true; - - home = { - username = "notoh"; - homeDirectory = "/home/notoh"; - stateVersion = "23.05"; - }; -} diff --git a/hosts/kariru/home.nix b/hosts/kariru/home.nix deleted file mode 100644 index c7eafac..0000000 --- a/hosts/kariru/home.nix +++ /dev/null @@ -1,14 +0,0 @@ -{...}: { - imports = [ - ../../home - ]; - - systemd.user.startServices = "sd-switch"; - programs.home-manager.enable = true; - - home = { - username = "notoh"; - homeDirectory = "/home/notoh"; - stateVersion = "23.05"; - }; -} diff --git a/hosts/kaze/home.nix b/hosts/kaze/home.nix deleted file mode 100644 index c7eafac..0000000 --- a/hosts/kaze/home.nix +++ /dev/null @@ -1,14 +0,0 @@ -{...}: { - imports = [ - ../../home - ]; - - systemd.user.startServices = "sd-switch"; - programs.home-manager.enable = true; - - home = { - username = "notoh"; - homeDirectory = "/home/notoh"; - stateVersion = "23.05"; - }; -} diff --git a/hosts/sakura/home.nix b/hosts/sakura/home.nix deleted file mode 100644 index c7eafac..0000000 --- a/hosts/sakura/home.nix +++ /dev/null @@ -1,14 +0,0 @@ -{...}: { - imports = [ - ../../home - ]; - - systemd.user.startServices = "sd-switch"; - programs.home-manager.enable = true; - - home = { - username = "notoh"; - homeDirectory = "/home/notoh"; - stateVersion = "23.05"; - }; -} diff --git a/hosts/sora/home.nix b/hosts/sora/home.nix deleted file mode 100644 index c7eafac..0000000 --- a/hosts/sora/home.nix +++ /dev/null @@ -1,14 +0,0 @@ -{...}: { - imports = [ - ../../home - ]; - - systemd.user.startServices = "sd-switch"; - programs.home-manager.enable = true; - - home = { - username = "notoh"; - homeDirectory = "/home/notoh"; - stateVersion = "23.05"; - }; -} diff --git a/hosts/tsuru/home.nix b/hosts/tsuru/home.nix deleted file mode 100644 index c7eafac..0000000 --- a/hosts/tsuru/home.nix +++ /dev/null @@ -1,14 +0,0 @@ -{...}: { - imports = [ - ../../home - ]; - - systemd.user.startServices = "sd-switch"; - programs.home-manager.enable = true; - - home = { - username = "notoh"; - homeDirectory = "/home/notoh"; - stateVersion = "23.05"; - }; -} diff --git a/hosts/yuki/home.nix b/hosts/yuki/home.nix deleted file mode 100644 index c7eafac..0000000 --- a/hosts/yuki/home.nix +++ /dev/null @@ -1,14 +0,0 @@ -{...}: { - imports = [ - ../../home - ]; - - systemd.user.startServices = "sd-switch"; - programs.home-manager.enable = true; - - home = { - username = "notoh"; - homeDirectory = "/home/notoh"; - stateVersion = "23.05"; - }; -} diff --git a/modules/default.nix b/modules/default.nix index 6ba508e..85dac28 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -1,6 +1,5 @@ {inputs, ...}: { imports = [ - inputs.nh.nixosModules.default ./prometheus.nix ./security.nix ./users.nix diff --git a/modules/nix.nix b/modules/nix.nix index 82b5c9f..a706ad1 100644 --- a/modules/nix.nix +++ b/modules/nix.nix @@ -5,6 +5,7 @@ inputs.helix.overlays.default inputs.yazi.overlays.default inputs.wezterm.overlays.default + inputs.hyprland.overlays.default inputs.hypridle.overlays.default inputs.hyprlock.overlays.default inputs.hyprpicker.overlays.default @@ -20,7 +21,7 @@ }; }; - nh = { + programs.nh = { enable = true; clean = { enable = true;