Move home-manager related files into home directory

flake.nix

@@ -98,7 +98,7 @@
         stateVersion = "22.05";
         configuration = {
           imports = [
-            ./home.nix
+            ./home/home.nix
             ./modules
           ];
 

home/home.nix

@@ -19,7 +19,7 @@ in {
     ./programs/tmux.nix
     ./programs/zsh
 
-    ./modules
+    ../modules
 
     inputs.secrets.outputs.nixosModule
   ] ++ optionals graphics [
@@ -38,6 +38,7 @@ in {
     ./services/dunst.nix
     ./services/mpd.nix
     ./services/picom.nix
+    ./services/polybar.nix
     ./services/stalonetray.nix
     ./services/sxhkd.nix
   ];

home/services/sxhkd.nix

@@ -1,17 +1,13 @@
 { pkgs, ... }:
 {
   services.sxhkd = {
-  	enable = true;
-  	keybindings = {
+    enable = true;
+    keybindings = {
 
       # make sxhkd reload its configuration files:
       "super + Escape" = "pkill -USR1 -x sxhkd && ${pkgs.libnotify}/bin/notify-send -t 3000 \"sxhkd configuration reloaded\"";
 
       # Applications
-      "super + w" = "${pkgs.emacs}/bin/emacs";
-
-      "super + e" = "$FILEBROWSER";
-
       "super + s" = "$BROWSER";
 
       "super + r" = "${pkgs.rofi}/bin/rofi -show drun";
@@ -54,7 +50,7 @@
       # fcitx5
       # "super + {b,n,m}" = "${pkgs.fcitx5}/bin/fcitx5-remote -s {mozc,keyboard-no,keyboard-us}";
 
-  		# TODO: fix
+      # TODO: fix
       # "super + v" = "${pkgs.rofi}/bin/rofi -modi lpass:$HOME/.scripts/rofi/lpass/rofi-lpass -show lpass";
 
       "super + minus" = "${pkgs.xcalib}/bin/xcalib -invert -alter";
@@ -74,6 +70,6 @@
 
       # é
       "super + shift + e" = "sleep 0.3; ${pkgs.xdotool}/bin/xdotool key U00E9";
-  	};
+    };
   };
 }

hosts/common.nix

@@ -203,7 +203,7 @@ in {
     extraSpecialArgs = { inherit inputs; inherit secrets; };
 
     # TODO: figure out why specialArgs isn't accessible from the root home file.
-    users.h7x4 = import ../home.nix {
+    users.h7x4 = import ../home/home.nix {
       inherit pkgs;
       inherit inputs;
       inherit config;