2 files changed, 16 insertions, 52 deletions

diff --git a/hosts/thinkpad/configuration.nix b/hosts/thinkpad/configuration.nix
index 5dd5b8f..de8ad05 100644
--- a/hosts/thinkpad/configuration.nix
+++ b/hosts/thinkpad/configuration.nix
@@ -1,6 +1,7 @@
 {
   inputs,
   username,
+  pkgs,
   ...
 }:
 {
@@ -19,7 +20,6 @@
   os = {
     core = {
       allowUnfree.enable = true;
-      flatpak.enable = true;
 
       audio.enable = true;
       bootloader = {
@@ -30,7 +30,7 @@
       };
       drivers = {
         enable = true;
-        cpu = "intel";
+        # cpu = "intel";
         graphics.enable = true;
         kernel = "stable";
       };
@@ -41,47 +41,34 @@
         users.${username}.path = ./home.nix;
       };
       locale.enable = true;
-      memory = {
-        zram.enable = true;
-        swapfile.enable = true;
-      };
-      network.enable = true;
-      power = {
-        enable = true;
-        mode = "intel";
-      };
-      security.enable = true;
-      ssh.enable = true;
       storage.enable = true;
-      users.enable = true;
+      # users.enable = true;
     };
     srv = {
-      bluetooth.enable = true;
-      i2p.enable = true;
       files = {
         enable = true;
         localsend.enable = true;
       };
-      gaming = {
-        enable = true;
-        steam.enable = true;
-      };
-      virtualization = {
-        kvm.enable = true;
-        waydroid.enable = true;
-      };
-      kdeconnect.enable = true;
       nix-helper.enable = true;
-      monero.enable = true;
-      sops.enable = true;
-      syncthing.enable = true;
-      vpn.enable = true;
     };
     wm = {
       enable = true;
       niri.enable = true;
     };
   };
+  network.networkmanager.enable = true;
+  users = {
+    mutableUsers = true;
+
+    users = {
+      "${username}" = {
+        isNormalUser = true;
+        shell = pkgs.fish;
+        extraGroups = [ "wheel" ];
+        initialPassword = "cwel";
+      };
+    };
+  };
   boot = {
     kernelParams = [ "iomem=relaxed" ];
   };
diff --git a/hosts/thinkpad/disko.nix b/hosts/thinkpad/disko.nix
index 0f366e9..19e8148 100644
--- a/hosts/thinkpad/disko.nix
+++ b/hosts/thinkpad/disko.nix
@@ -36,66 +36,43 @@
                     "root" = {
                       mountpoint = "/";
                       mountOptions = [
-                        "compress=zstd:1"
-                        "discard=async"
                         "noatime"
                       ];
                     };
                     "nix" = {
                       mountpoint = "/nix";
                       mountOptions = [
-                        "compress=zstd:1"
-                        "discard=async"
-                        "nodev"
                         "noatime"
                       ];
                     };
                     "home" = {
                       mountpoint = "/home";
                       mountOptions = [
-                        "compress=zstd:1"
-                        "discard=async"
-                        "nosuid"
-                        "nodev"
                         "noatime"
                       ];
                     };
                     "log" = {
                       mountpoint = "/var/log";
                       mountOptions = [
-                        "compress=zstd:1"
-                        "discard=async"
-                        "nosuid"
-                        "nodev"
                         "noatime"
                       ];
                     };
                     "games" = {
                       mountpoint = "/games";
                       mountOptions = [
-                        "compress=none"
-                        "discard=async"
-                        "nosuid"
-                        "nodev"
                         "noatime"
                       ];
                     };
                     "vms" = {
                       mountpoint = "/vms";
                       mountOptions = [
-                        "compress=none"
-                        "discard=async"
                         "nodatacow"
-                        "nosuid"
-                        "nodev"
                         "noatime"
                       ];
                     };
                     "swap" = {
                       mountpoint = "/.swapvol";
                       mountOptions = [
-                        "compress=none"
-                        "discard=async"
                         "nodatacow"
                         "noatime"
                       ];