zaphyra's git: nixfiles

mv config/home{-manager,}

diff --git a/config/home-manager/common/home.nix b/config/home-manager/common/home.nix
@@ -1,20 +0,0 @@
-{
-  inputs,
-  lib,
-  ...
-}:
-
-{
-
-  imports = [
-    inputs.impermanence.homeManagerModules.impermanence
-    inputs.niriFlake.homeModules.config
-    inputs.sopsNix.homeManagerModules.sops
-    inputs.sherlock.homeManagerModules.default
-    inputs.airpodsctl.homeManagerModules.kairpodsd
-    inputs.tgcNUR.homeManagerModules.default
-  ];
-
-  home.stateVersion = lib.mkDefault "25.05";
-
-}

diff --git a/config/home/common/home.nix b/config/home/common/home.nix
@@ -0,0 +1,20 @@
+{
+  inputs,
+  lib,
+  ...
+}:
+
+{
+
+  imports = [
+    inputs.impermanence.homeManagerModules.impermanence
+    #inputs.niriFlake.homeModules.config
+    inputs.sopsNix.homeManagerModules.sops
+    #inputs.sherlock.homeManagerModules.default
+    #inputs.airpodsctl.homeManagerModules.kairpodsd
+    #inputs.tgcNUR.homeManagerModules.default
+  ];
+
+  home.stateVersion = lib.mkDefault "25.05";
+
+}

diff --git a/config/home-manager/common/programs/gpg.nix b/config/home/common/programs/gpg.nix

diff --git a/config/home-manager/common/programs/ssh.nix b/config/home/common/programs/ssh.nix

diff --git a/config/home-manager/common/programs/starship.nix b/config/home/common/programs/starship.nix

diff --git a/config/home-manager/zaphyra/configure/fonts.nix b/config/home/zaphyra/configure/fonts.nix

diff --git a/config/home-manager/zaphyra/configure/gnome.nix b/config/home/zaphyra/configure/gnome.nix

diff --git a/config/home-manager/zaphyra/configure/niri.nix b/config/home/zaphyra/configure/niri.nix

diff --git a/config/home-manager/zaphyra/configure/xdg.nix b/config/home/zaphyra/configure/xdg.nix

diff --git a/config/home-manager/zaphyra/gnomeExtensions/bluetoothBatteryMeter.nix b/config/home/zaphyra/gnomeExtensions/bluetoothBatteryMeter.nix

diff --git a/config/home-manager/zaphyra/gnomeExtensions/dash-to-dock.nix b/config/home/zaphyra/gnomeExtensions/dash-to-dock.nix

diff --git a/config/home-manager/zaphyra/gnomeExtensions/emoji-copy.nix b/config/home/zaphyra/gnomeExtensions/emoji-copy.nix

diff --git a/config/home-manager/zaphyra/gnomeExtensions/just-perfection.nix b/config/home/zaphyra/gnomeExtensions/just-perfection.nix

diff --git a/config/home-manager/zaphyra/gnomeExtensions/pip-on-top.nix b/config/home/zaphyra/gnomeExtensions/pip-on-top.nix

diff --git a/config/home-manager/zaphyra/gnomeExtensions/search-light.nix b/config/home/zaphyra/gnomeExtensions/search-light.nix

diff --git a/config/home-manager/zaphyra/gnomeExtensions/space-bar.nix b/config/home/zaphyra/gnomeExtensions/space-bar.nix

diff --git a/config/home-manager/zaphyra/home.nix b/config/home/zaphyra/home.nix

diff --git a/config/home-manager/zaphyra/impermanence.nix b/config/home/zaphyra/impermanence.nix

diff --git a/config/home-manager/zaphyra/programs/airpodsctl.nix b/config/home/zaphyra/programs/airpodsctl.nix

diff --git a/config/home-manager/zaphyra/programs/alacritty.nix b/config/home/zaphyra/programs/alacritty.nix

diff --git a/config/home-manager/zaphyra/programs/apostrophe.nix b/config/home/zaphyra/programs/apostrophe.nix

diff --git a/config/home-manager/zaphyra/programs/app2unit.nix b/config/home/zaphyra/programs/app2unit.nix

diff --git a/config/home-manager/zaphyra/programs/bat.nix b/config/home/zaphyra/programs/bat.nix

diff --git a/config/home-manager/zaphyra/programs/bitwarden-cli.nix b/config/home/zaphyra/programs/bitwarden-cli.nix

diff --git a/config/home-manager/zaphyra/programs/celluloid.nix b/config/home/zaphyra/programs/celluloid.nix

diff --git a/config/home-manager/zaphyra/programs/chaosctl.nix b/config/home/zaphyra/programs/chaosctl.nix

diff --git a/config/home-manager/zaphyra/programs/chawan.nix b/config/home/zaphyra/programs/chawan.nix

diff --git a/config/home-manager/zaphyra/programs/cozy.nix b/config/home/zaphyra/programs/cozy.nix

diff --git a/config/home-manager/zaphyra/programs/deploymentUtilities.nix b/config/home/zaphyra/programs/deploymentUtilities.nix

diff --git a/config/home-manager/zaphyra/programs/dino.nix b/config/home/zaphyra/programs/dino.nix

diff --git a/config/home-manager/zaphyra/programs/errands.nix b/config/home/zaphyra/programs/errands.nix

diff --git a/config/home-manager/zaphyra/programs/eza.nix b/config/home/zaphyra/programs/eza.nix

diff --git a/config/home-manager/zaphyra/programs/firefox.nix b/config/home/zaphyra/programs/firefox.nix

diff --git a/config/home-manager/zaphyra/programs/fish.nix b/config/home/zaphyra/programs/fish.nix

diff --git a/config/home-manager/zaphyra/programs/fractal.nix b/config/home/zaphyra/programs/fractal.nix

diff --git a/config/home-manager/zaphyra/programs/fuzzel.nix b/config/home/zaphyra/programs/fuzzel.nix

diff --git a/config/home-manager/zaphyra/programs/gajim.nix b/config/home/zaphyra/programs/gajim.nix

diff --git a/config/home-manager/zaphyra/programs/ghostty.nix b/config/home/zaphyra/programs/ghostty.nix

diff --git a/config/home-manager/zaphyra/programs/git.nix b/config/home/zaphyra/programs/git.nix

diff --git a/config/home-manager/zaphyra/programs/gnome-calendar.nix b/config/home/zaphyra/programs/gnome-calendar.nix

diff --git a/config/home-manager/zaphyra/programs/gnome-obfuscate.nix b/config/home/zaphyra/programs/gnome-obfuscate.nix

diff --git a/config/home-manager/zaphyra/programs/gnome-text-editor.nix b/config/home/zaphyra/programs/gnome-text-editor.nix

diff --git a/config/home-manager/zaphyra/programs/gpg.nix b/config/home/zaphyra/programs/gpg.nix

diff --git a/config/home-manager/zaphyra/programs/gtklock.nix b/config/home/zaphyra/programs/gtklock.nix

diff --git a/config/home-manager/zaphyra/programs/helix.nix b/config/home/zaphyra/programs/helix.nix

diff --git a/config/home-manager/zaphyra/programs/htop.nix b/config/home/zaphyra/programs/htop.nix

diff --git a/config/home-manager/zaphyra/programs/imv.nix b/config/home/zaphyra/programs/imv.nix

diff --git a/config/home-manager/zaphyra/programs/languages/golang.nix b/config/home/zaphyra/programs/languages/golang.nix

diff --git a/config/home-manager/zaphyra/programs/languages/javascript.nix b/config/home/zaphyra/programs/languages/javascript.nix

diff --git a/config/home-manager/zaphyra/programs/languages/nimlang.nix b/config/home/zaphyra/programs/languages/nimlang.nix

diff --git a/config/home-manager/zaphyra/programs/languages/nix.nix b/config/home/zaphyra/programs/languages/nix.nix

diff --git a/config/home-manager/zaphyra/programs/libreoffice.nix b/config/home/zaphyra/programs/libreoffice.nix

diff --git a/config/home-manager/zaphyra/programs/loupe.nix b/config/home/zaphyra/programs/loupe.nix

diff --git a/config/home-manager/zaphyra/programs/mcfly.nix b/config/home/zaphyra/programs/mcfly.nix

diff --git a/config/home-manager/zaphyra/programs/micro.nix b/config/home/zaphyra/programs/micro.nix

diff --git a/config/home-manager/zaphyra/programs/mpv.nix b/config/home/zaphyra/programs/mpv.nix

diff --git a/config/home-manager/zaphyra/programs/nautilus.nix b/config/home/zaphyra/programs/nautilus.nix

diff --git a/config/home-manager/zaphyra/programs/networkManagerDmenu.nix b/config/home/zaphyra/programs/networkManagerDmenu.nix

diff --git a/config/home-manager/zaphyra/programs/niri.nix b/config/home/zaphyra/programs/niri.nix

diff --git a/config/home-manager/zaphyra/programs/nmgui.nix b/config/home/zaphyra/programs/nmgui.nix

diff --git a/config/home-manager/zaphyra/programs/ocrmypdf.nix b/config/home/zaphyra/programs/ocrmypdf.nix

diff --git a/config/home-manager/zaphyra/programs/overskride.nix b/config/home/zaphyra/programs/overskride.nix

diff --git a/config/home-manager/zaphyra/programs/papers.nix b/config/home/zaphyra/programs/papers.nix

diff --git a/config/home-manager/zaphyra/programs/password-store.nix b/config/home/zaphyra/programs/password-store.nix

diff --git a/config/home-manager/zaphyra/programs/pdfarranger.nix b/config/home/zaphyra/programs/pdfarranger.nix

diff --git a/config/home-manager/zaphyra/programs/pipewire.nix b/config/home/zaphyra/programs/pipewire.nix

diff --git a/config/home-manager/zaphyra/programs/plattenalbum.nix b/config/home/zaphyra/programs/plattenalbum.nix

diff --git a/config/home-manager/zaphyra/programs/profanity.nix b/config/home/zaphyra/programs/profanity.nix

diff --git a/config/home-manager/zaphyra/programs/shellUtilities.nix b/config/home/zaphyra/programs/shellUtilities.nix

diff --git a/config/home-manager/zaphyra/programs/sherlock-launcher.nix b/config/home/zaphyra/programs/sherlock-launcher.nix

diff --git a/config/home-manager/zaphyra/programs/ssh.nix b/config/home/zaphyra/programs/ssh.nix

diff --git a/config/home-manager/zaphyra/programs/swaylock.nix b/config/home/zaphyra/programs/swaylock.nix

diff --git a/config/home-manager/zaphyra/programs/thunderbird.nix b/config/home/zaphyra/programs/thunderbird.nix

diff --git a/config/home-manager/zaphyra/programs/tmux.nix b/config/home/zaphyra/programs/tmux.nix

diff --git a/config/home-manager/zaphyra/programs/tuba.nix b/config/home/zaphyra/programs/tuba.nix

diff --git a/config/home-manager/zaphyra/programs/typst.nix b/config/home/zaphyra/programs/typst.nix

diff --git a/config/home-manager/zaphyra/programs/wleave.nix b/config/home/zaphyra/programs/wleave.nix

diff --git a/config/home-manager/zaphyra/programs/yazi.nix b/config/home/zaphyra/programs/yazi.nix

diff --git a/config/home-manager/zaphyra/programs/yt-dlp.nix b/config/home/zaphyra/programs/yt-dlp.nix

diff --git a/config/home-manager/zaphyra/programs/zathura.nix b/config/home/zaphyra/programs/zathura.nix

diff --git a/config/home-manager/zaphyra/programs/zoxide.nix b/config/home/zaphyra/programs/zoxide.nix

diff --git a/config/home-manager/zaphyra/programs/zsh.nix b/config/home/zaphyra/programs/zsh.nix

diff --git a/config/home-manager/zaphyra/services/batsignal.nix b/config/home/zaphyra/services/batsignal.nix

diff --git a/config/home-manager/zaphyra/services/dssd.nix b/config/home/zaphyra/services/dssd.nix

diff --git a/config/home-manager/zaphyra/services/gnome-keyring.nix b/config/home/zaphyra/services/gnome-keyring.nix

diff --git a/config/home-manager/zaphyra/services/gomuks-web.nix b/config/home/zaphyra/services/gomuks-web.nix

diff --git a/config/home-manager/zaphyra/services/mako.nix b/config/home/zaphyra/services/mako.nix

diff --git a/config/home-manager/zaphyra/services/owntone.nix b/config/home/zaphyra/services/owntone.nix

diff --git a/config/home-manager/zaphyra/services/playerctl.nix b/config/home/zaphyra/services/playerctl.nix

diff --git a/config/home-manager/zaphyra/services/shaderbg.nix b/config/home/zaphyra/services/shaderbg.nix

diff --git a/config/home-manager/zaphyra/services/swayidle.nix b/config/home/zaphyra/services/swayidle.nix

diff --git a/config/home-manager/zaphyra/services/swaync.nix b/config/home/zaphyra/services/swaync.nix

diff --git a/config/home-manager/zaphyra/services/swayosd.nix b/config/home/zaphyra/services/swayosd.nix

diff --git a/config/home-manager/zaphyra/services/syncthing.nix b/config/home/zaphyra/services/syncthing.nix

diff --git a/config/home-manager/zaphyra/services/waybar.nix b/config/home/zaphyra/services/waybar.nix

diff --git a/config/home-manager/zaphyra/services/wlsunset.nix b/config/home/zaphyra/services/wlsunset.nix

diff --git a/config/home-manager/zaphyra/services/wob.nix b/config/home/zaphyra/services/wob.nix

diff --git a/config/home-manager/zaphyra/services/wpaperd.nix b/config/home/zaphyra/services/wpaperd.nix

diff --git a/flake.nix b/flake.nix
@@ -48,7 +48,7 @@
 
       nixosModules.default = ./config/nixosModules.nix;
 
-      homeManagerModules = loadDir pathLoader ./config/home-manager;
+      homeManagerModules = loadDir pathLoader ./config/home;
 
       nixpkgsOverlays = [
         inputs.zaphyraWebsite.overlays.default