more refactoring

flake.nix

@@ -26,9 +26,7 @@
                 modules = [
                     ./hosts/isengard.nix
                     ./modules/base.nix
-                    ./modules/docker.nix
-                ]
-                    ++ lib.optional (builtins.pathExists ./hardware-configuration.nix) ./hardware-configuration.nix;
+                ];
             };
             palantir = lib.nixosSystem {
                 inherit system;

hosts/isengard.nix

@@ -1,40 +1,21 @@
 { config, pkgs, myUser, release, disko, ... }:
 
 {
-    networking.hostName = "isengard";
-
+    # Imports
     imports = [
         disko.nixosModules.disko ../disko/isengard/btrfs-legacy.nix
 
         ../modules/docker.nix
     ];
+    # Disks
     boot.loader = {
         grub.enable = true;
     };
 
-    time.timeZone = "Europe/Bucharest";
-
-    programs.zsh.enable = true;
-    users.defaultUserShell = pkgs.zsh;
-
-    users.users.${myUser} = {
-        isNormalUser = true;
-        extraGroups = [ "wheel" ];
-        openssh.authorizedKeys.keys = [
-            "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOiNyGO4RAxSdxvn2ZIBZ2Ze4iVVMrBNmu/V9JO70PoT victor@battleship"
-        ];
-    };
-
-    users.users.root.openssh.authorizedKeys.keys = [
-        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOiNyGO4RAxSdxvn2ZIBZ2Ze4iVVMrBNmu/V9JO70PoT victor@battleship"
-    ];
-
+    # Networking
+    networking.hostName = "isengard";
     networking.useDHCP = true;
-
-    services.openssh = {
-        enable = true;
-        settings.PasswordAuthentication = false;
-    };
+    time.timeZone = "Europe/Bucharest";
 
     system.stateVersion = release;
 }

hosts/palantir.nix

@@ -21,30 +21,6 @@
     networking.useDHCP = true;
     time.timeZone = "Europe/Vienna";
 
-    # SSH
-    users.users.${myUser}.openssh.authorizedKeys.keys = [
-        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOiNyGO4RAxSdxvn2ZIBZ2Ze4iVVMrBNmu/V9JO70PoT victor@battleship"
-    ];
-    users.users.root.openssh.authorizedKeys.keys = [
-        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOiNyGO4RAxSdxvn2ZIBZ2Ze4iVVMrBNmu/V9JO70PoT victor@battleship"
-    ];
-
-    services.openssh = {
-        enable = true;
-        settings.PasswordAuthentication = false;
-    };
-
-    # User
-    users.users.${myUser} = {
-        isNormalUser = true;
-        extraGroups = [ 
-            "wheel" 
-            "video" 
-            "render"
-            "input"
-        ];
-        shell = pkgs.zsh;
-    };
     ## Autologin
     services = {
         getty.autologinUser = myUser;

modules/base.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, pkgs, lib, myUser, ... }:
 
 {
     nix.settings = {
@@ -7,6 +7,7 @@
     };
 
     programs.zsh.enable = true;
+    users.defaultUserShell = pkgs.zsh;
     environment.systemPackages = with pkgs; [
         git
         curl
@@ -16,5 +17,22 @@
         neovim
         progress
     ];
-    
+
+    # SSH
+    users.users.${myUser} = {
+        isNormalUser = true;
+        extraGroups = [ "wheel" ];
+        openssh.authorizedKeys.keys = [
+            "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOiNyGO4RAxSdxvn2ZIBZ2Ze4iVVMrBNmu/V9JO70PoT victor@battleship"
+        ];
+    };
+
+    users.users.root.openssh.authorizedKeys.keys = [
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOiNyGO4RAxSdxvn2ZIBZ2Ze4iVVMrBNmu/V9JO70PoT victor@battleship"
+    ];
+
+    services.openssh = {
+        enable = true;
+        settings.PasswordAuthentication = false;
+    };
 }

modules/docker.nix

@@ -3,11 +3,6 @@
 {
     users.users.${myUser}.extraGroups = [ "docker" ];
 
-    virtualisation.docker = {
-        storageDriver = "btrfs";
-        rootless = {
-            enable = true;
-            setSocketVariable = true;
-        };
-    };
+    virtualisation.docker.enable = true;
+    virtualisation.docker.storageDriver = "btrfs";
 }

modules/gaming.nix

@@ -1,6 +1,15 @@
 { config, pkgs, myUser, release, lib, ... }:
 
 {
+    # Groups for sunshine
+    users.users.${myUser}.extraGroups = [
+            "wheel"
+            "video"
+            "render"
+            "input"
+        ];
+
+    # Sunshine game stream
     services = {
         sunshine = {
             enable = true;
@@ -19,7 +28,7 @@
         enable = true;
     };
     
-    environment.systemPackages = with pkgs; [ 
+    environment.systemPackages = with pkgs; [
         ffmpeg
         zeroad
     ];