Merge branch 'main' of https://git.marty.tf/marty/config.nix

hosts/marty-pc/custom.nix

@@ -6,6 +6,16 @@
 }:
 
 {
+  networking = {
+    interfaces = {
+      enp42s0 = {
+        wakeOnLan = {
+          enable = true;
+          policy = [ "magic" ];
+        };
+      };
+    };
+  };
   services.flatpak.enable = true;
   virtualisation.docker.enable = true;
   security.polkit = {

hosts/marty-pc/default.nix

@@ -8,28 +8,13 @@
   ...
 }:
 
-let
-  hostname = "marty-pc";
-in
-
 {
-  networking = {
-    hostName = hostname;
-    interfaces = {
-      enp42s0 = {
-        wakeOnLan = {
-          enable = true;
-          policy = [ "magic" ];
-        };
-      };
-    };
-  };
   home-manager = {
     extraSpecialArgs = { inherit inputs; };
     useGlobalPkgs = true;
     useUserPackages = true;
     users = {
-      marty = import ./home.nix;
+      "${config.user.userName}"  = import ./home.nix;
     };
   };
   imports = [

hosts/marty-pc/home.nix

@@ -13,31 +13,6 @@
   home.homeDirectory = "/home/${osConfig.user.userName}";
   home.stateVersion = "25.11";
 
-  desktop = {
-    hyprland = {
-      numlock = true;
-      monitors = [
-        "desc:AOC Q27G2WG4 0x00005F45, 2560x1440@144, 3840x0, 1   # main monitor"
-        "desc:Samsung Electric Company S24D330 0x5A5A5131, 1920x1080@60, 3840x1440, 1 # side monitor"
-        "desc:Panasonic Industry Company Panasonic-TV, 3840x2160@30, 0x0, 1  # tv"
-        "desc:Valve Corporation Index HMD 0x3DEBE38D, preffered, auto, 1"
-      ];
-      workspaces.workspaces = [
-
-        "1, monitor:DP-1, persistent:true"
-        "2, monitor:DP-1, persistent:true"
-        "3, monitor:DP-1, persistent:true"
-        "4, monitor:DP-1, persistent:true"
-        "5, monitor:HDMI-A-1, persistent:true"
-        "6, monitor:HDMI-A-1, persistent:true"
-        "7, monitor:HDMI-A-1, persistent:true"
-        "8, monitor:HDMI-A-1, persistent:true"
-        "9, monitor:DP-3, persistent:true"
-        "special:magic"
-      ];
-    };
-  };
-
   imports = [
     ./../../home
   ];

hosts/marty-pc/options.nix

@@ -15,6 +15,7 @@
       timezone = "Europe/Berlin";
       language = "en_GB.UTF-8";
       locale = "de_DE.UTF-8";
+      hostname = "marty-thinkpad";
     };
     apps = {
       audio = {
@@ -118,7 +119,7 @@
     desktop = {
       window-managers = {
         hyprland = {
-          enable = true;
+          enable = false;
         };
         niri = {
           enable = true;