Reorganized the repo

flake.nix

@@ -45,10 +45,13 @@
         system = "x86_64-linux";
       in
       nixpkgs.lib.nixosSystem {
+
         specialArgs = {
           hostname = "Lenni";
+          type = "desktop";
           inherit system;
         };
+
         modules = [
           attrs.home-manager.nixosModules.home-manager
             {
@@ -60,16 +63,20 @@
           ./hosts
           ./users/willifan
         ];
+
       };
 
       Puenktchen = let
         system = "x86_64-linux";
       in
       nixpkgs.lib.nixosSystem {
+
         specialArgs = {
           hostname = "Puenktchen";
+          type = "desktop";
           inherit system;
         };
+
         modules = [
           attrs.home-manager.nixosModules.home-manager
             {
@@ -84,6 +91,34 @@
           ./hosts
           ./users/willifan
         ];
+
+      };
+
+      Anton = let
+        system = "x86_64-linux";
+      in
+      nixpkgs.lib.nixosSystem {
+
+        specialArgs = {
+          hostname = "Anton";
+          type = "server";
+          inherit system;
+        };
+
+        modules = [
+          attrs.home-manager.nixosModules.home-manager
+            {
+              home-manager.useGlobalPkgs = true;
+              home-manager.useUserPackages = true;
+            }
+          attrs.disko.nixosModules.disko
+          attrs.nixos-hardware.nixosModules.common-cpu-amd
+          attrs.nixos-hardware.nixosModules.common-cpu-amd-pstate
+          attrs.nixos-hardware.nixosModules.common-cpu-amd-zenpower
+          ./hosts
+          ./users/willifan
+        ];
+        
       };
 
     };

hosts/common/default.nix

@@ -1,18 +1,4 @@
-{ pkgs, hostname, ... }:
+{ pkgs, ... }:
 {
-  networking.hostName = hostname;
-  imports = [
-    ./nix-ld.nix
-    ./boot.nix
-    ./printers.nix
-  ];
-  
-  hardware.bluetooth.enable = true;
-  services.hardware.bolt.enable = true;
-
-  networking.networkmanager.enable = true;
-  console.keyMap = "de";
-  nixpkgs.config.allowUnfree = true;
-  nix.settings.experimental-features = [ "nix-command" "flakes" ];
   system.stateVersion = "23.11";
 }

hosts/default.nix

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

hosts/desktop/default.nix

@@ -0,0 +1,17 @@
+{ pkgs, hostname, ... }:
+{
+  networking.hostName = hostname;
+  imports = [
+    ./nix-ld.nix
+    ./boot.nix
+    ./printers.nix
+  ];
+  
+  hardware.bluetooth.enable = true;
+  services.hardware.bolt.enable = true;
+
+  networking.networkmanager.enable = true;
+  console.keyMap = "de";
+  nixpkgs.config.allowUnfree = true;
+  nix.settings.experimental-features = [ "nix-command" "flakes" ];
+}

hosts/server/Anton/data.nix

@@ -0,0 +1,19 @@
+{ pkgs, ... }:
+{
+
+  environment.systemPackages = with pkgs; [
+    mergerfs
+  ];
+
+  fileSystems."/storage" = {
+    fsType = "fuse.mergerfs";
+    device = "/mnt/disks/*";
+    options = ["cache.files=partial" "dropcacheonclose=true" "category.create=mfs"];
+  };
+
+  services.snapraid = {
+    enable = true;
+
+  };
+
+}

hosts/server/Anton/default.nix

@@ -0,0 +1,11 @@
+{ pkgs, ... }:
+{
+
+  imports = [
+
+    ./disko.nix
+    ./hardware-configuration.nix
+
+  ];
+
+}

hosts/server/Anton/disko.nix

@@ -0,0 +1,52 @@
+{
+  disko.devices = {
+    disk = {
+      root-drive = {
+        type = "disk";
+        device = "/dev/disk/by-id/wwn-0x5001b44ebc0b613a";
+        content = {
+          type = "gpt";
+          partitions = {
+            ESP = {
+              priority = 1;
+              name = "ESP";
+              size = "512M";
+              type = "EF00";
+              content = {
+                type = "filesystem";
+                format = "vfat";
+                mountpoint = "/boot";
+              };
+            };
+            root = {
+              size = "100%";
+              content = {
+                type = "btrfs";
+                extraArgs = [ "-f" ]; # Override existing partition
+                # Subvolumes must set a mountpoint in order to be mounted,
+                # unless their parent is mounted
+                subvolumes = {
+                  # Subvolume name is different from mountpoint
+                  "/rootfs" = {
+                    mountOptions = [ "compress=zstd" "noatime" ];
+                    mountpoint = "/";
+                  };
+                  # Subvolume name is the same as the mountpoint
+                  "/home" = {
+                    mountOptions = [ "compress=zstd" "noatime" ];
+                    mountpoint = "/home";
+                  };
+                  # Parent is not mounted so the mountpoint must be set
+                  "/nix" = {
+                    mountOptions = [ "compress=zstd" "noatime" ];
+                    mountpoint = "/nix";
+                  };
+                };
+              };
+            };
+          };
+        };
+      };
+    };
+  };
+}

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
+    ./common
-    
+    ./${type}
-    ./applications.nix
+    ./${hostname}
-    ./auto-cpufreq.nix
-    ./envvar.nix
-    ./git.nix
-    ./hyfetch.nix
-    ./locales.nix
-    #./ssh.nix
-    ./syncthing.nix
-    ./udev.nix
-    ./user.nix
-    #./zsh.nix
   ];
-
-  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

@@ -9,6 +9,8 @@
     ./theme
     ./web
 
+    ./applications.nix
+    ./autologin.nix
     ./kitty.nix
     ./thunar.nix
   ];