From eb95abfc230dc239122f1e89e90cd9a998491a2f Mon Sep 17 00:00:00 2001
From: adikro <adikro@disroot.org>
Date: Tue, 3 Feb 2026 22:58:50 +0100
Subject: ...

---
 hosts/desktop/configuration.nix  |  23 +++++----
 hosts/desktop/home.nix           |  18 ++++---
 hosts/laptop/configuration.nix   |  20 ++++++--
 hosts/oci/configuration.nix      |  95 -----------------------------------
 hosts/oci/disko.nix              | 104 ---------------------------------------
 hosts/oci/home.nix               |  73 ---------------------------
 hosts/thinkpad/configuration.nix |  22 +++++++--
 hosts/thinkpad/disko.nix         |  31 +++++-------
 hosts/vm/configuration.nix       |  95 -----------------------------------
 hosts/vm/disko.nix               | 104 ---------------------------------------
 hosts/vm/home.nix                |  73 ---------------------------
 11 files changed, 70 insertions(+), 588 deletions(-)
 delete mode 100644 hosts/oci/configuration.nix
 delete mode 100644 hosts/oci/disko.nix
 delete mode 100644 hosts/oci/home.nix
 delete mode 100644 hosts/vm/configuration.nix
 delete mode 100644 hosts/vm/disko.nix
 delete mode 100644 hosts/vm/home.nix

(limited to 'hosts')

diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix
index 8c1f0b5..9ea9552 100644
--- a/hosts/desktop/configuration.nix
+++ b/hosts/desktop/configuration.nix
@@ -3,8 +3,7 @@
   inputs,
   username,
   ...
-}:
-{
+}: {
   system.stateVersion = "25.05";
 
   imports = [
@@ -23,10 +22,14 @@
         enable = true;
         disable-devices.enable = true;
       };
-      bootloader = "systemd-boot";
+      bootloader.type = "systemd-boot";
       drivers = {
         enable = true;
-        amdgpu.enable = true;
+        cpu = "amd";
+        graphics = {
+          enable = true;
+          amdgpu.enable = true;
+        };
         kernel = "unstable";
       };
       fonts.enable = true;
@@ -69,7 +72,7 @@
       kdeconnect.enable = true;
       monero = {
         enable = true;
-        service.enable = true;
+        # service.enable = true;
       };
     };
     wm = {
@@ -78,18 +81,18 @@
     };
   };
 
+  services.zerotierone.enable = true;
+
   xdg.terminal-exec = {
     enable = true;
     settings = {
-      default = [ "foot.desktop" ];
+      default = ["foot.desktop"];
     };
   };
 
-  programs.firefox.enable = true;
-
   boot = {
-    kernelParams = [ "video=DP-1:2560x1440@240" ];
-    kernelModules = [ "nct6687" ];
+    kernelParams = ["video=DP-1:2560x1440@240"];
+    kernelModules = ["nct6687"];
     extraModulePackages = [
       config.boot.kernelPackages.nct6687d
     ];
diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix
index f47deb7..5dfb31e 100644
--- a/hosts/desktop/home.nix
+++ b/hosts/desktop/home.nix
@@ -1,6 +1,9 @@
-{ username, pkgs, ... }:
 {
-  imports = [ ../../hm/default.nix ];
+  username,
+  pkgs,
+  ...
+}: {
+  imports = [../../hm/default.nix];
 
   home = {
     username = "${username}";
@@ -59,16 +62,17 @@
     };
   };
 
-  home.packages = with pkgs.sweethome3d; [
-    application
-    furniture-editor
+  home.packages = with pkgs; [
+    sweethome3d.application
+    sweethome3d.furniture-editor
+    czkawka
   ];
 
   xdg.mimeApps = {
     enable = true;
     defaultApplications = {
-      "x-scheme-handler/terminal" = [ "foot.desktop" ];
-      "inode/directory" = [ "thunar.desktop" ];
+      "x-scheme-handler/terminal" = ["foot.desktop"];
+      "inode/directory" = ["thunar.desktop"];
     };
   };
 
diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix
index 3390af0..304302d 100644
--- a/hosts/laptop/configuration.nix
+++ b/hosts/laptop/configuration.nix
@@ -1,5 +1,4 @@
-{ username, ... }:
-{
+{username, ...}: {
   system.stateVersion = "25.05";
 
   imports = [
@@ -12,8 +11,16 @@
       allowUnfree.enable = true;
 
       audio.enable = true;
-      bootloader = "grub";
-      drivers.enable = true;
+      bootloader = {
+        type = "grub";
+        useOSProber = true;
+        grubDevice = "nodev";
+      };
+      drivers = {
+        enable = true;
+        cpu = "amd";
+        graphics.enable = true;
+      };
       fonts.enable = true;
       greet.enable = true;
       home-manager = {
@@ -32,7 +39,10 @@
         };
       };
       network.enable = true;
-      power.enable = true;
+      power = {
+        enable = true;
+        mode = "amd";
+      };
       security.enable = true;
       ssh.enable = true;
       storage.enable = true;
diff --git a/hosts/oci/configuration.nix b/hosts/oci/configuration.nix
deleted file mode 100644
index cc3cbf4..0000000
--- a/hosts/oci/configuration.nix
+++ /dev/null
@@ -1,95 +0,0 @@
-{
-  config,
-  inputs,
-  username,
-  ...
-}:
-{
-  system.stateVersion = "25.05";
-
-  imports = [
-    inputs.disko.nixosModules.disko
-
-    ./hardware-configuration.nix
-    ../../os/default.nix
-  ];
-
-  os = {
-    core = {
-      allowUnfree.enable = true;
-      flatpak.enable = true;
-
-      audio = {
-        enable = true;
-        disable-devices.enable = true;
-      };
-      bootloader = "systemd-boot";
-      drivers = {
-        enable = true;
-        amdgpu.enable = true;
-        stability = "unstable";
-      };
-      fonts.enable = true;
-      greet.enable = true;
-      home-manager = {
-        enable = true;
-        users.${username}.path = ./home.nix;
-      };
-      locale.enable = true;
-      memory = {
-        zram = {
-          enable = true;
-          percent = 25;
-        };
-        swapfile = {
-          enable = true;
-          size = 32;
-        };
-      };
-      network.enable = true;
-      security.enable = true;
-      ssh.enable = true;
-      storage.enable = true;
-      users.enable = true;
-    };
-    srv = {
-      files = {
-        thunar.enable = true;
-        krusader.enable = true;
-        utils.enable = true;
-      };
-      gaming = {
-        enable = true;
-        steam.enable = true;
-        vr.enable = true;
-      };
-      virtualization.enable = true;
-      nix-helper.enable = true;
-      ollama.enable = true;
-      kdeconnect.enable = true;
-      monero = {
-        enable = true;
-        service.enable = true;
-      };
-    };
-    wm = {
-      enable = true;
-      niri.enable = true;
-    };
-  };
-
-  xdg.terminal-exec = {
-    enable = true;
-    settings = {
-      default = [ "foot.desktop" ];
-    };
-  };
-
-  boot = {
-    kernelParams = [ "video=DP-1:2560x1440@240" ];
-    kernelModules = [ "nct6687" ];
-    extraModulePackages = [
-      config.boot.kernelPackages.nct6687d
-    ];
-  };
-}
diff --git a/hosts/oci/disko.nix b/hosts/oci/disko.nix
deleted file mode 100644
index edc4008..0000000
--- a/hosts/oci/disko.nix
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-  disko.devices = {
-    disk = {
-      main = {
-        type = "disk";
-        device = "/dev/nvme0n1";
-        content = {
-          type = "gpt";
-          partitions = {
-            ESP = {
-              size = "2G";
-              type = "EF00";
-              content = {
-                type = "filesystem";
-                format = "vfat";
-                mountpoint = "/boot";
-                mountOptions = [ "umask=0077" ];
-              };
-            };
-            root = {
-              size = "100%";
-              content = {
-                type = "btrfs";
-                extraArgs = [ "-f" ];
-                subvolumes = {
-                  "@" = {
-                    mountpoint = "/";
-                    mountOptions = [ "compress=zstd:1" "noatime" ];
-                  };
-                  "@home" = {
-                    mountpoint = "/home";
-                    mountOptions = [ "compress=zstd:1" "noatime" ];
-                  };
-                  "@nix" = {
-                    mountpoint = "/nix";
-                    mountOptions = [ "compress=zstd:1" "noatime" ];
-                  };
-                  "@log" = {
-                    mountpoint = "/var/log";
-                    mountOptions = [ "compress=zstd:1" "noatime" ];
-                  };
-                  "@games" = {
-                    mountpoint = "/games";
-                    mountOptions = [ "compress=zstd:1" "noatime" ];
-                  };
-                  "@llms" = {
-                    mountpoint = "/llms";
-                    mountOptions = [ "nodatacow" "noatime"];
-                  };
-                  "@vms" = {
-                    mountpoint = "/vms";
-                    mountOptions = [ "nodatacow" "noatime" ];
-                  };
-                  "@swap" = {
-                    mountpoint = "/.swapvol";
-                    mountOptions = [ "nodatacow" "noatime" ];
-                  };
-                };
-              };
-            };
-          };
-        };
-      };
-      media = {
-        type = "disk";
-        device = "/dev/sda";
-        content = {
-          type = "gpt";
-          partitions = {
-            media = {
-              size = "100%";
-              content = {
-                type = "btrfs";
-                extraArgs = [ "-f" ];
-                subvolumes = {
-                  "@archive" = {
-                    mountpoint = "/media/archive";
-                    mountOptions = [ "compress=zstd:1" "autodefrag" "noatime" ];
-                  };
-                  "@movies" = {
-                    mountpoint = "/media/movies";
-                    mountOptions = [ "autodefrag" "noatime" ];
-                  };
-                  "@anime" = {
-                    mountpoint = "/media/anime";
-                    mountOptions = [ "autodefrag" "noatime" ];
-                  };
-                  "@pictures" = {
-                    mountpoint = "/media/pics";
-                    mountOptions = [ "autodefrag" "noatime" ];
-                  };
-                  "@videos" = {
-                    mountpoint = "/media/vids";
-                    mountOptions = [ "autodefrag" "noatime" ];
-                  };
-                };
-              };
-            };
-          };
-        };
-      };
-    };
-  };
-}
diff --git a/hosts/oci/home.nix b/hosts/oci/home.nix
deleted file mode 100644
index e274907..0000000
--- a/hosts/oci/home.nix
+++ /dev/null
@@ -1,73 +0,0 @@
-{ username, ... }:
-{
-  imports = [ ../../hm/default.nix ];
-
-  home = {
-    username = "${username}";
-    homeDirectory = "/home/${username}";
-    stateVersion = "25.05";
-  };
-
-  hm = {
-    conf = {
-      clip = {
-        enable = true;
-        backend = "wayland";
-      };
-      git.enable = true;
-      xdg-dirs = {
-        enable = true;
-        mediaPath = /storage;
-      };
-    };
-    editors.nixvim.enable = true;
-    env = {
-      niri.enable = true;
-      cursor = {
-        size = 48;
-        enableMiyabi = true;
-      };
-
-      waybar.enable = true;
-      themes = {
-        enable = true;
-        gtk.enable = true;
-        qt.enable = true;
-      };
-    };
-    shell = {
-      cli.enable = true;
-      fish.enable = true;
-      foot.enable = true;
-      starship.enable = true;
-    };
-    soft = {
-      browser = {
-        librewolf.enable = true;
-        brave.enable = true;
-      };
-      email.evolution.enable = true;
-      media.enable = true;
-      mpv.enable = true;
-      nixcord.enable = true;
-      obs.enable = true;
-      obsidian.enable = true;
-      spicetify.enable = true;
-      torrent.enable = true;
-      vpn.protonvpn.enable = true;
-      yt-dlp.enable = true;
-    };
-  };
-
-  xdg.mimeApps = {
-    enable = true;
-    defaultApplications = {
-      "x-scheme-handler/terminal" = [ "foot.desktop" ];
-      "inode/directory" = [ "thunar.desktop" ];
-    };
-  };
-
-  home.sessionVariables = {
-    XDG_UTILS_TERMINAL = "foot";
-  };
-}
diff --git a/hosts/thinkpad/configuration.nix b/hosts/thinkpad/configuration.nix
index 4713892..a38d74b 100644
--- a/hosts/thinkpad/configuration.nix
+++ b/hosts/thinkpad/configuration.nix
@@ -1,5 +1,8 @@
-{ inputs, username, ... }:
 {
+  inputs,
+  username,
+  ...
+}: {
   system.stateVersion = "25.05";
 
   imports = [
@@ -15,9 +18,16 @@
       allowUnfree.enable = true;
 
       audio.enable = true;
-      bootloader = "systemd-boot";
+      bootloader = {
+        type = "grub";
+        enableEncryption = true;
+        grubDevice = "/dev/nvme0n1";
+        luksDevice = "/dev/nvme0n1p2";
+      };
       drivers = {
         enable = true;
+        cpu = "intel";
+        graphics.enable = true;
         kernel = "hardened";
       };
       fonts.enable = true;
@@ -38,7 +48,10 @@
         };
       };
       network.enable = true;
-      power.enable = true;
+      power = {
+        enable = true;
+        mode = "intel";
+      };
       security.enable = true;
       ssh.enable = true;
       storage.enable = true;
@@ -52,10 +65,13 @@
       };
       kdeconnect.enable = true;
       nix-helper.enable = true;
+      monero.enable = true;
     };
     wm = {
       enable = true;
       niri.enable = true;
     };
   };
+  services.thinkfan.enable = true;
+  boot.kernelModules = ["thinkpad_acpi"];
 }
diff --git a/hosts/thinkpad/disko.nix b/hosts/thinkpad/disko.nix
index f3243d8..97e5c87 100644
--- a/hosts/thinkpad/disko.nix
+++ b/hosts/thinkpad/disko.nix
@@ -7,67 +7,60 @@
         content = {
           type = "gpt";
           partitions = {
-            ESP = {
-              size = "2G";
-              type = "EF00";
-              content = {
-                type = "filesystem";
-                format = "vfat";
-                mountpoint = "/boot";
-                mountOptions = [ "umask=0077" ];
-              };
+            biosboot = {
+              size = "1M";
+              type = "EF02";
             };
             luks = {
               size = "100%";
               content = {
                 type = "luks";
                 name = "crypted";
-                settings = {
-                  allowDiscards = true;
-                };
+                settings.allowDiscards = true;
                 content = {
                   type = "btrfs";
-                  extraArgs = [ "-f" ];
+                  extraArgs = ["-f"];
                   subvolumes = {
-                    "@" = {
+                    "root" = {
                       mountpoint = "/";
                       mountOptions = [
                         "compress=zstd:1"
                         "noatime"
                       ];
                     };
-                    "@home" = {
+                    "home" = {
                       mountpoint = "/home";
                       mountOptions = [
                         "compress=zstd:1"
                         "noatime"
                       ];
                     };
-                    "@nix" = {
+                    "nix" = {
                       mountpoint = "/nix";
                       mountOptions = [
                         "compress=zstd:1"
                         "noatime"
                       ];
                     };
-                    "@log" = {
+                    "log" = {
                       mountpoint = "/var/log";
                       mountOptions = [
                         "compress=zstd:1"
                         "noatime"
                       ];
                     };
-                    "@vms" = {
+                    "vms" = {
                       mountpoint = "/vms";
                       mountOptions = [
                         "nodatacow"
                         "noatime"
                       ];
                     };
-                    "@swap" = {
+                    "swap" = {
                       mountpoint = "/.swapvol";
                       mountOptions = [
                         "nodatacow"
+                        "compress=no"
                         "noatime"
                       ];
                     };
diff --git a/hosts/vm/configuration.nix b/hosts/vm/configuration.nix
deleted file mode 100644
index cc3cbf4..0000000
--- a/hosts/vm/configuration.nix
+++ /dev/null
@@ -1,95 +0,0 @@
-{
-  config,
-  inputs,
-  username,
-  ...
-}:
-{
-  system.stateVersion = "25.05";
-
-  imports = [
-    inputs.disko.nixosModules.disko
-
-    ./hardware-configuration.nix
-    ../../os/default.nix
-  ];
-
-  os = {
-    core = {
-      allowUnfree.enable = true;
-      flatpak.enable = true;
-
-      audio = {
-        enable = true;
-        disable-devices.enable = true;
-      };
-      bootloader = "systemd-boot";
-      drivers = {
-        enable = true;
-        amdgpu.enable = true;
-        stability = "unstable";
-      };
-      fonts.enable = true;
-      greet.enable = true;
-      home-manager = {
-        enable = true;
-        users.${username}.path = ./home.nix;
-      };
-      locale.enable = true;
-      memory = {
-        zram = {
-          enable = true;
-          percent = 25;
-        };
-        swapfile = {
-          enable = true;
-          size = 32;
-        };
-      };
-      network.enable = true;
-      security.enable = true;
-      ssh.enable = true;
-      storage.enable = true;
-      users.enable = true;
-    };
-    srv = {
-      files = {
-        thunar.enable = true;
-        krusader.enable = true;
-        utils.enable = true;
-      };
-      gaming = {
-        enable = true;
-        steam.enable = true;
-        vr.enable = true;
-      };
-      virtualization.enable = true;
-      nix-helper.enable = true;
-      ollama.enable = true;
-      kdeconnect.enable = true;
-      monero = {
-        enable = true;
-        service.enable = true;
-      };
-    };
-    wm = {
-      enable = true;
-      niri.enable = true;
-    };
-  };
-
-  xdg.terminal-exec = {
-    enable = true;
-    settings = {
-      default = [ "foot.desktop" ];
-    };
-  };
-
-  boot = {
-    kernelParams = [ "video=DP-1:2560x1440@240" ];
-    kernelModules = [ "nct6687" ];
-    extraModulePackages = [
-      config.boot.kernelPackages.nct6687d
-    ];
-  };
-}
diff --git a/hosts/vm/disko.nix b/hosts/vm/disko.nix
deleted file mode 100644
index edc4008..0000000
--- a/hosts/vm/disko.nix
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-  disko.devices = {
-    disk = {
-      main = {
-        type = "disk";
-        device = "/dev/nvme0n1";
-        content = {
-          type = "gpt";
-          partitions = {
-            ESP = {
-              size = "2G";
-              type = "EF00";
-              content = {
-                type = "filesystem";
-                format = "vfat";
-                mountpoint = "/boot";
-                mountOptions = [ "umask=0077" ];
-              };
-            };
-            root = {
-              size = "100%";
-              content = {
-                type = "btrfs";
-                extraArgs = [ "-f" ];
-                subvolumes = {
-                  "@" = {
-                    mountpoint = "/";
-                    mountOptions = [ "compress=zstd:1" "noatime" ];
-                  };
-                  "@home" = {
-                    mountpoint = "/home";
-                    mountOptions = [ "compress=zstd:1" "noatime" ];
-                  };
-                  "@nix" = {
-                    mountpoint = "/nix";
-                    mountOptions = [ "compress=zstd:1" "noatime" ];
-                  };
-                  "@log" = {
-                    mountpoint = "/var/log";
-                    mountOptions = [ "compress=zstd:1" "noatime" ];
-                  };
-                  "@games" = {
-                    mountpoint = "/games";
-                    mountOptions = [ "compress=zstd:1" "noatime" ];
-                  };
-                  "@llms" = {
-                    mountpoint = "/llms";
-                    mountOptions = [ "nodatacow" "noatime"];
-                  };
-                  "@vms" = {
-                    mountpoint = "/vms";
-                    mountOptions = [ "nodatacow" "noatime" ];
-                  };
-                  "@swap" = {
-                    mountpoint = "/.swapvol";
-                    mountOptions = [ "nodatacow" "noatime" ];
-                  };
-                };
-              };
-            };
-          };
-        };
-      };
-      media = {
-        type = "disk";
-        device = "/dev/sda";
-        content = {
-          type = "gpt";
-          partitions = {
-            media = {
-              size = "100%";
-              content = {
-                type = "btrfs";
-                extraArgs = [ "-f" ];
-                subvolumes = {
-                  "@archive" = {
-                    mountpoint = "/media/archive";
-                    mountOptions = [ "compress=zstd:1" "autodefrag" "noatime" ];
-                  };
-                  "@movies" = {
-                    mountpoint = "/media/movies";
-                    mountOptions = [ "autodefrag" "noatime" ];
-                  };
-                  "@anime" = {
-                    mountpoint = "/media/anime";
-                    mountOptions = [ "autodefrag" "noatime" ];
-                  };
-                  "@pictures" = {
-                    mountpoint = "/media/pics";
-                    mountOptions = [ "autodefrag" "noatime" ];
-                  };
-                  "@videos" = {
-                    mountpoint = "/media/vids";
-                    mountOptions = [ "autodefrag" "noatime" ];
-                  };
-                };
-              };
-            };
-          };
-        };
-      };
-    };
-  };
-}
diff --git a/hosts/vm/home.nix b/hosts/vm/home.nix
deleted file mode 100644
index e274907..0000000
--- a/hosts/vm/home.nix
+++ /dev/null
@@ -1,73 +0,0 @@
-{ username, ... }:
-{
-  imports = [ ../../hm/default.nix ];
-
-  home = {
-    username = "${username}";
-    homeDirectory = "/home/${username}";
-    stateVersion = "25.05";
-  };
-
-  hm = {
-    conf = {
-      clip = {
-        enable = true;
-        backend = "wayland";
-      };
-      git.enable = true;
-      xdg-dirs = {
-        enable = true;
-        mediaPath = /storage;
-      };
-    };
-    editors.nixvim.enable = true;
-    env = {
-      niri.enable = true;
-      cursor = {
-        size = 48;
-        enableMiyabi = true;
-      };
-
-      waybar.enable = true;
-      themes = {
-        enable = true;
-        gtk.enable = true;
-        qt.enable = true;
-      };
-    };
-    shell = {
-      cli.enable = true;
-      fish.enable = true;
-      foot.enable = true;
-      starship.enable = true;
-    };
-    soft = {
-      browser = {
-        librewolf.enable = true;
-        brave.enable = true;
-      };
-      email.evolution.enable = true;
-      media.enable = true;
-      mpv.enable = true;
-      nixcord.enable = true;
-      obs.enable = true;
-      obsidian.enable = true;
-      spicetify.enable = true;
-      torrent.enable = true;
-      vpn.protonvpn.enable = true;
-      yt-dlp.enable = true;
-    };
-  };
-
-  xdg.mimeApps = {
-    enable = true;
-    defaultApplications = {
-      "x-scheme-handler/terminal" = [ "foot.desktop" ];
-      "inode/directory" = [ "thunar.desktop" ];
-    };
-  };
-
-  home.sessionVariables = {
-    XDG_UTILS_TERMINAL = "foot";
-  };
-}
-- 
cgit v1.3