Merge remote-tracking branch 'origin/server-config'

users/willifan/Lenni/default.nix

@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+{
+  imports = [
+    ./auto-cpufreq.nix
+    ./backlight.nix
+  ];
+}

users/willifan/Puenktchen/default.nix

@@ -0,0 +1,4 @@
+{ pkgs, ... }:
+{
+  
+}

users/willifan/common/default.nix

@@ -0,0 +1,15 @@
+{ pkgs, home-manager, ... }:
+{
+  imports = [
+    ./envvar.nix
+    ./git.nix
+    ./hyfetch.nix
+    ./locales.nix
+    #./ssh.nix
+    ./syncthing.nix
+    ./user.nix
+    #./zsh.nix
+  ];
+
+  home-manager.users.willifan.home.stateVersion = "23.11";
+}

users/willifan/default.nix

@@ -1,31 +1,8 @@
-{ pkgs, home-manager, ... }:
+{ pkgs, hostname, type, ... }:
 {
   imports = [
-    ./graphical
-    
-    ./applications.nix
-    ./auto-cpufreq.nix
-    ./envvar.nix
-    ./git.nix
-    ./hyfetch.nix
-    ./locales.nix
-    #./ssh.nix
-    ./syncthing.nix
-    ./udev.nix
-    ./user.nix
-    #./zsh.nix
+    ./common
+    ./${type}
+    ./${hostname}
   ];
-
-  services.greetd = {
-    enable = true;
-     settings = rec {
-      initial_session = {
-        command = ''Hyprland'';
-        user = "willifan";
-      };
-      default_session = initial_session;
-    };
-  };
-
-  home-manager.users.willifan.home.stateVersion = "23.11";
 }

users/willifan/desktop/applications.nix

@@ -7,8 +7,6 @@
     jq
     xorg.xrandr
 
-    btop
-
     feh
 
     enpass

users/willifan/desktop/autologin.nix

@@ -0,0 +1,13 @@
+{ pkgs, ... }:
+{
+  services.greetd = {
+    enable = true;
+     settings = rec {
+      initial_session = {
+        command = ''Hyprland'';
+        user = "willifan";
+      };
+      default_session = initial_session;
+    };
+  };
+}

users/willifan/desktop/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, home-manager-unstable, ... }:
+{ pkgs, ... }:
 
 {
 
@@ -9,6 +9,8 @@
     ./theme
     ./web
 
+    ./applications.nix
+    ./autologin.nix
     ./kitty.nix
     ./thunar.nix
   ];

users/willifan/desktop/hyprland/default.nix

@@ -0,0 +1,7 @@
+{ pkgs, hostname, ... }:
+{
+  imports = [
+    ./common
+    ./${hostname}
+  ];
+}

users/willifan/desktop/theme/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, home-manager-unstable, ... }:
+{ pkgs, ... }:
 
 {
   imports = [

users/willifan/graphical/hyprland/default.nix

@@ -1,7 +0,0 @@
-{ pkgs, configVars, ... }:
-{
-  imports = [
-    ./common
-    ./${configVars.hostname}
-  ];
-}