disko/btrfs-legacy.nix

@@ -0,0 +1,34 @@
+{ mainDisk, ... }:
+
+{
+    disk.main = {
+        device = mainDisk;
+        type = "disk";
+
+        content = {
+            type = "gpt";
+            partitions = {
+                MBR = {
+                    size = "1M";
+                    type = "EF02";
+                };
+                root = {
+                    size = "100%";
+                    content = {
+                        type = "btrfs";
+                        extraArgs = [ "-f" ];
+                        subvolumes = {
+                            "@root" = { mountpoint = "/"; };
+                            "@nix" = { mountpoint = "/nix"; };
+                            "@var" = { mountpoint = "/var"; };
+                            "@docker" = { mountpoint = "/var/lib/docker"; };
+                            "@home" = { mountpoint = "/home"; };
+                            "@snapshots" = { mountpoint = "/.snapshots"; };
+                        };
+                    };
+                };
+            };
+        };
+    };
+}
+

disko/isengard/btrfs-legacy.nix

@@ -1,36 +0,0 @@
-{ ... }:
-
-{
-    disko.devices = {
-        disk.main = {
-            device = "/dev/sda";
-            type = "disk";
-
-            content = {
-                type = "gpt";
-                partitions = {
-                    MBR = {
-                        size = "1M";
-                        type = "EF02";
-                    };
-                    root = {
-                        size = "100%";
-                        content = {
-                            type = "btrfs";
-                            extraArgs = [ "-f" ];
-                            subvolumes = {
-                                "@root" = { mountpoint = "/"; };
-                                "@nix" = { mountpoint = "/nix"; };
-                                "@var" = { mountpoint = "/var"; };
-                                "@docker" = { mountpoint = "/var/lib/docker"; };
-                                "@home" = { mountpoint = "/home"; };
-                                "@snapshots" = { mountpoint = "/.snapshots"; };
-                            };
-                        };
-                    };
-                };
-            };
-        };
-    };
-}
-

disko/palantir/lvm.nix

@@ -1,92 +0,0 @@
-{...}:
-
-let
-    disks = [
-        "/dev/disk/by-id/ata-WDC_WDS120G2G0A-00JH30_184377804456"
-        "/dev/disk/by-id/ata-KINGSTON_SA400S37120G_50026B7783176055"
-    ];
-in 
-{
-    disko.devices = {
-        disk = {
-            ssd0 = {
-                type = "disk";
-                device = builtins.elemAt disks 0;
-                content = {
-                    type = "gpt";
-                    partitions = {
-                        bios_grub = {
-                            size = "2M";
-                            type = "EF02";
-                        };
-
-                        pv = {
-                            size = "100%";
-                            content = {
-                                type = "lvm_pv";
-                                vg = "mainpool";
-                            };
-                        };
-                    };
-                };
-            };
-
-            ssd1 = {
-                type = "disk";
-                device = builtins.elemAt disks 1;
-                content = {
-                    type = "gpt";
-                    partitions = {
-                        pv = {
-                            size = "100%";
-                            content = {
-                                type = "lvm_pv";
-                                vg = "mainpool";
-                            };
-                        };
-                    };
-                };
-            };
-        };
-
-        lvm_vg = {
-            mainpool = {
-                type = "lvm_vg";
-                lvs = {
-                    root = {
-                        size = "30G";
-                        lvm_type = "raid0";
-                        content = {
-                            type = "filesystem";
-                            format = "ext4";
-                            mountpoint = "/";
-                            mountOptions = [ "noatime" ];
-                        };
-                    };
-
-                    nix = {
-                        size = "50G";
-                        lvm_type = "raid0";
-                        content = {
-                            type = "filesystem";
-                            format = "ext4";
-                            mountpoint = "/nix";
-                            mountOptions = [ "noatime" ];
-                        };
-                    };
-
-                    games = {
-                        size = "100%FREE";
-                        lvm_type = "raid0";
-                        content = {
-                            type = "filesystem";
-                            format = "ext4";
-                            mountpoint = "/games";
-                            mountOptions = [ "noatime" ];
-                        };
-                    };
-                };
-            };
-        };
-    };
-}

disko/palantir/simple-efi-gpt.nix

@@ -1,38 +0,0 @@
-{ ... }:
-
-{
-    disko.devices = {
-        disk.main = {
-            device = "/dev/sda";
-            type = "disk";
-
-            content = {
-                type = "gpt";
-                partitions = {
-                    ESP = {
-                        name = "ESP";
-                        size = "512M";
-                        type = "EF00";
-                        content = {
-                            type = "filesystem";
-                            format = "vfat";
-                            mountpoint = "/boot";
-                            mountOptions = [ "umask=0077" ];
-                        };
-                    };
-
-                    root = {
-                        name = "root";
-                        size = "100%";
-                        content = {
-                            type = "filesystem";
-                            format = "ext4";
-                            mountpoint = "/";
-                        };
-                    };
-                };
-            };
-        };
-    };
-}
-

disko/simple-efi-gpt.nix

@@ -0,0 +1,36 @@
+{ mainDisk, ... }:
+
+{
+    disk.main = {
+        device = mainDisk;
+        type = "disk";
+
+        content = {
+            type = "gpt";
+            partitions = {
+                ESP = {
+                    name = "ESP";
+                    size = "512M";
+                    type = "EF00";
+                    content = {
+                        type = "filesystem";
+                        format = "vfat";
+                        mountpoint = "/boot";
+                        mountOptions = [ "umask=0077" ];
+                    };
+                };
+
+                root = {
+                    name = "root";
+                    size = "100%";
+                    content = {
+                        type = "filesystem";
+                        format = "ext4";
+                        mountpoint = "/";
+                    };
+                };
+            };
+        };
+    };
+}
+

flake.nix

@@ -14,6 +14,7 @@
         # options
         system = "x86_64-linux";
         release = "25.11";
+        mainDisk = "/dev/sda";
         myUser = "victor";
 
         # helper
@@ -22,22 +23,27 @@
         nixosConfigurations = {
             isengard = lib.nixosSystem {
                 inherit system;
-                specialArgs = { inherit release myUser disko; };
+                specialArgs = { inherit release mainDisk myUser disko; };
                 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;
-                specialArgs = { inherit release myUser disko; };
+                specialArgs = { inherit release mainDisk myUser disko; };
                 modules = [
                     ./hosts/palantir.nix
                     ./modules/base.nix
+                    ./modules/plasma.nix
+                    ./modules/gaming.nix
 
                     home-manager.nixosModules.home-manager
                     ./modules/home.nix
-                ];
+                ]
+                    ++ lib.optional (builtins.pathExists ./hardware-configuration.nix) ./hardware-configuration.nix;
             };
         };
     };

hosts/isengard.nix

@@ -1,22 +1,42 @@
-{ config, pkgs, myUser, release, disko, ... }:
+{ config, pkgs, myUser, release, disko, mainDisk, ... }:
 
 {
-    # Imports
+    networking.hostName = "isengard";
-    imports = [
-        disko.nixosModules.disko ../disko/isengard/btrfs-legacy.nix
 
-        ../modules/docker.nix
+    imports = [
+        disko.nixosModules.disko
     ];
-    # Disks
+    disko.devices = import ../disko/btrfs-legacy.nix {
+        inherit mainDisk;
+    };
     boot.loader = {
         grub.enable = true;
     };
 
-    # Networking
-    networking.hostName = "isengard";
-    networking.useDHCP = 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.useDHCP = true;
+
+    services.openssh = {
+        enable = true;
+        settings.PasswordAuthentication = false;
+    };
+
     system.stateVersion = release;
 }
 

hosts/palantir.nix

@@ -1,45 +1,54 @@
-{ config, pkgs, myUser, release, disko, ... }:
+{ config, pkgs, myUser, release, disko, mainDisk, ... }:
 
 {
-    # Imports
+    networking.hostName = "palantir";
-    imports = [
-        disko.nixosModules.disko ../disko/palantir/lvm.nix 
 
-        ../modules/nvidia.nix
+    imports = [
-        ../modules/plasma.nix
+        disko.nixosModules.disko
-        ../modules/gaming.nix
     ];
-    # Disks
+    disko.devices = import ../disko/simple-efi-gpt.nix {
-    boot.initrd.services.lvm.enable = true;
+        inherit mainDisk;
+    };
     boot.loader = {
         systemd-boot.enable = true;
         efi.canTouchEfiVariables = true;
     };
 
-    # Networking
-    networking.hostName = "palantir";
-    networking.useDHCP = true;
     time.timeZone = "Europe/Vienna";
 
-    ## Autologin
+    users.users.${myUser} = {
-    services = {
+        isNormalUser = true;
-        getty.autologinUser = myUser;
+        extraGroups = [ 
-        displayManager.autoLogin = {
+            "wheel" 
-            enable = true;
+            "video" 
-            user = myUser;
+            "render"
-        };
+            "input"
+        ];
+        shell = pkgs.zsh;
+        openssh.authorizedKeys.keys = [
+            "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOiNyGO4RAxSdxvn2ZIBZ2Ze4iVVMrBNmu/V9JO70PoT victor@battleship"
+        ];
     };
 
-    # Mounts
+    users.users.root.openssh.authorizedKeys.keys = [
-    #fileSystems."/games" = {
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOiNyGO4RAxSdxvn2ZIBZ2Ze4iVVMrBNmu/V9JO70PoT victor@battleship"
-    #    device = "/dev/disk/by-uuid/90bea801-2b8a-40db-8862-ccc55f2b2262";
+    ];
-    #    fsType = "ext4";
+
-    #    options = [
+    networking.useDHCP = true;
-    #        "nofail" # Prevent system from failing if this drive doesn't mount
+
-    #    ];
+    services.openssh = {
-    #};
+        enable = true;
+        settings.PasswordAuthentication = false;
+    };
+
+    fileSystems."/games" = {
+        device = "/dev/disk/by-uuid/90bea801-2b8a-40db-8862-ccc55f2b2262";
+        fsType = "ext4";
+        options = [
+            "nofail" # Prevent system from failing if this drive doesn't mount
+        ];
+    };
 
-    # Release
     system.stateVersion = release;
 }
 

modules/base.nix

@@ -1,38 +1,36 @@
-{ config, pkgs, lib, myUser, ... }:
+{ config, pkgs, mainDisk, lib, ... }:
 
+let 
+    cfg = config.my.allowUnfree;
+in
 {
-    nix.settings = {
+    options = {
-        experimental-features = [ "nix-command" "flakes" ];
+        my.allowUnfree.names = lib.mkOption {
-        auto-optimise-store = true;
+            type = lib.types.listOf lib.types.str;
+            default = [];
+            description = "Package names allowed by allowUnfreePredicate";
+        };
     };
+    config = {
+        nix.settings = {
+            experimental-features = [ "nix-command" "flakes" ];
+            auto-optimise-store = true;
+        };
 
-    programs.zsh.enable = true;
+        programs.zsh.enable = true;
-    users.defaultUserShell = pkgs.zsh;
+        environment.systemPackages = with pkgs; [
-    environment.systemPackages = with pkgs; [
+            git
-        git
+            curl
-        curl
+            htop
-        htop
+            tmux
-        tmux
+            killall
-        killall
+            neovim
-        neovim
+            pciutils
-        progress
+            progress
-    ];
-
-    # SSH
-    users.users.${myUser} = {
-        isNormalUser = true;
-        extraGroups = [ "wheel" ];
-        openssh.authorizedKeys.keys = [
-            "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOiNyGO4RAxSdxvn2ZIBZ2Ze4iVVMrBNmu/V9JO70PoT victor@battleship"
         ];
+
+        nixpkgs.config.allowUnfreePredicate = 
+            pkg: builtins.elem (lib.getName pkg) cfg.names;
     };
     
-    users.users.root.openssh.authorizedKeys.keys = [
-        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOiNyGO4RAxSdxvn2ZIBZ2Ze4iVVMrBNmu/V9JO70PoT victor@battleship"
-    ];
-
-    services.openssh = {
-        enable = true;
-        settings.PasswordAuthentication = false;
-    };
 }

modules/docker.nix

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

modules/gaming.nix

@@ -1,16 +1,42 @@
 { config, pkgs, myUser, release, lib, ... }:
 
 {
-    # Groups for sunshine
+    my.allowUnfree.names = lib.mkAfter [
-    users.users.${myUser}.extraGroups = [
+        "steam"
-            "wheel"
+        "steam-unwrapped"
-            "video"
+        "cuda-merged"
-            "render"
+        "cuda_cuobjdump"
-            "input"
+        "cuda_gdb"
-        ];
+        "cuda_nvcc"
+        "cuda_nvdisasm"
+        "cuda_nvprune"
+        "cuda_cccl"
+        "cuda_cudart"
+        "cuda_cupti"
+        "cuda_cuxxfilt"
+        "cuda_nvml_dev"
+        "cuda_nvrtc"
+        "cuda_nvtx"
+        "cuda_profiler_api"
+        "cuda_sanitizer_api"
+        "libcublas"
+        "libcufft"
+        "libcurand"
+        "libcusolver"
+        "libnvjitlink"
+        "libcusparse"
+        "libnpp"
+        "cudnn"
+    ];
+
+    nixpkgs.config.cudaSupport = true;
 
-    # Sunshine game stream
     services = {
+        getty.autologinUser = "victor";
+        displayManager.autoLogin = {
+            enable = true;
+            user = "victor";
+        };
         sunshine = {
             enable = true;
             autoStart = true;

modules/nvidia.nix

@@ -1,13 +0,0 @@
-{ config, lib, ... }:
-
-{
-    nixpkgs.config.allowUnfree = true; # Cuz nvidia drivers and stuff
-    nixpkgs.config.cudaSupport = true;
-    hardware.graphics.enable = true;
-    services.xserver.videoDrivers = [ "nvidia" ];
-    hardware.nvidia = {
-        modesetting.enable = true;
-        open = false;
-        package = config.boot.kernelPackages.nvidiaPackages.stable;
-    };
-}

modules/plasma.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
 
 {
     services = {
@@ -16,6 +16,18 @@
 
     environment.systemPackages = with pkgs; [
         librewolf
-        pciutils
     ];
+
+    # Nvidia
+    my.allowUnfree.names = lib.mkAfter [
+        "nvidia-x11"
+        "nvidia-settings"
+    ];
+    hardware.graphics.enable = true;
+    services.xserver.videoDrivers = [ "nvidia" ];
+    hardware.nvidia = {
+        modesetting.enable = true;
+        open = false;
+        package = config.boot.kernelPackages.nvidiaPackages.stable;
+    };
 }