chore: reworked folder structure

users/common/default.nix

@@ -5,9 +5,9 @@
 }: {
   imports = [
     #./zsh.nix
-    ./fish.nix
-    ./htop.nix
-    ./alias.nix
+    ./shells/fish.nix
+    ./programs/htop.nix
+    ./shells/alias.nix
   ];
 
   home.packages = with pkgs; [

users/common/desktop.nix

@@ -1,19 +0,0 @@
-{
-  config,
-  pkgs,
-  ...
-}: {
-  home.packages = with pkgs; [
-    zathura
-    pinentry
-    arandr
-    feh
-    xclip
-  ];
-  home.sessionVariables = {
-    # Firefox touch support
-    "MOZ_USE_XINPUT2" = 1;
-    # Firefox Hardware render
-    "MOZ_WEBRENDER" = 1;
-  };
-}

users/common/graphical/herbstluftwm.nix

@@ -9,8 +9,9 @@
   #set the default resize step for herbstluft
   RESIZE_STEP = 0.05;
   TAGS = map toString (lib.lists.range 1 9);
+  data_dir = ../../../data/herbstluftwm;
 in {
-  home.file.".xinitrc".source = ../../data/herbstluftwm/xinitrc;
+  home.file.".xinitrc".source = data_dir + /xinitrc;
   xsession.windowManager.herbstluftwm = {
     enable = true;
     package = pkgs.herbstluftwm.overrideAttrs (finalAttrs: previousAttrs: {
@@ -45,7 +46,7 @@ in {
       "${MOD}-Button3" = "resize";
     };
 
-    keybinds = import ../../data/herbstluftwm/keybinds.nix MOD TAGS;
+    keybinds = import (data_dir + /keybinds.nix) MOD TAGS;
     settings = {
       "default_frame_layout" = 3;
 

users/patrick.nix

@@ -4,12 +4,11 @@
   ...
 }: {
   imports = [
-    common/kitty.nix
-    common/herbstluftwm.nix
-    common/autorandr.nix
-    common/desktop.nix
-    common/polybar.nix
-    common/rofi.nix
+    common/programs/kitty.nix
+    common/graphical/herbstluftwm.nix
+    common/graphical/autorandr.nix
+    common/programs/polybar.nix
+    common/programs/rofi.nix
     common/touchscreen.nix
     #common/touchegg.nix
   ];
@@ -25,7 +24,18 @@
       spotify
       xdragon
       xournalpp
+      zathura
+      pinentry
+      arandr
+      feh
+      xclip
     ];
+    sessionVariables = {
+      # Firefox touch support
+      "MOZ_USE_XINPUT2" = 1;
+      # Firefox Hardware render
+      "MOZ_WEBRENDER" = 1;
+    };
   };
 
   programs.firefox = {