thinkpad configuration finalization

3 files changed, 39 insertions, 47 deletions

diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix
index 50fb2c9..42be28c 100644
--- a/hosts/desktop/configuration.nix
+++ b/hosts/desktop/configuration.nix
@@ -2,6 +2,7 @@
   config,
   inputs,
   username,
+  pkgs,
   ...
 }:
 {
@@ -48,10 +49,7 @@
       };
       locale.enable = true;
       memory = {
-        zram = {
-          enable = true;
-          percent = 25;
-        };
+        zram.enable = true;
         swapfile = {
           enable = true;
           size = 32;
@@ -64,26 +62,18 @@
       users.enable = true;
     };
     srv = {
-      sops.enable = true;
-      syncthing.enable = true;
-      files = {
-        thunar.enable = true;
-        krusader.enable = true;
-        utils.enable = true;
-      };
+      files.enable = true;
       gaming = {
         enable = true;
         steam.enable = true;
-        vr.enable = true;
       };
       virtualization.enable = true;
+      kdeconnect.enable = true;
       nix-helper.enable = true;
       ollama.enable = true;
-      kdeconnect.enable = true;
-      monero = {
-        enable = true;
-        # service.enable = true;
-      };
+      monero.enable = true;
+      sops.enable = true;
+      syncthing.enable = true;
     };
     wm = {
       enable = true;
@@ -91,6 +81,12 @@
     };
   };
 
+  programs.wireshark = {
+    enable = true;
+    package = pkgs.wireshark;
+  };
+  users.users.adam.extraGroups = [ "wireshark" ];
+
   boot = {
     kernelModules = [ "nct6687" ];
     extraModulePackages = [
diff --git a/hosts/desktop/disko.nix b/hosts/desktop/disko.nix
index 86d1e71..93941e9 100644
--- a/hosts/desktop/disko.nix
+++ b/hosts/desktop/disko.nix
@@ -31,7 +31,6 @@
                       mountpoint = "/";
                       mountOptions = [
                         "compress=zstd:1"
-                        "space_cache=v2"
                         "discard=async"
                         "noatime"
                       ];
@@ -40,56 +39,70 @@
                       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"
                       ];
                     };
                     "llms" = {
                       mountpoint = "/llms";
                       mountOptions = [
                         "compress=none"
+                        "discard=async"
                         "nodatacow"
                         "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"
                       ];
                     };
                   };
@@ -119,9 +132,10 @@
                       mountpoint = "/storage/archive";
                       mountOptions = [
                         "compress=zstd:1"
-                        "autodefrag"
                         "nosuid"
                         "nodev"
+                        "noatime"
+
                         "nofail"
                         "x-systemd.device-timeout=5s"
                       ];
@@ -130,9 +144,10 @@
                       mountpoint = "/storage/movies";
                       mountOptions = [
                         "compress=none"
-                        "autodefrag"
                         "nosuid"
                         "nodev"
+                        "noatime"
+
                         "nofail"
                         "x-systemd.device-timeout=5s"
                       ];
@@ -141,9 +156,10 @@
                       mountpoint = "/storage/anime";
                       mountOptions = [
                         "compress=none"
-                        "autodefrag"
                         "nosuid"
                         "nodev"
+                        "noatime"
+
                         "nofail"
                         "x-systemd.device-timeout=5s"
                       ];
@@ -152,9 +168,10 @@
                       mountpoint = "/storage/pics";
                       mountOptions = [
                         "compress=none"
-                        "autodefrag"
                         "nosuid"
                         "nodev"
+                        "noatime"
+
                         "nofail"
                         "x-systemd.device-timeout=5s"
                       ];
@@ -163,9 +180,10 @@
                       mountpoint = "/storage/vids";
                       mountOptions = [
                         "compress=none"
-                        "autodefrag"
                         "nosuid"
                         "nodev"
+                        "noatime"
+
                         "nofail"
                         "x-systemd.device-timeout=5s"
                       ];
diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix
index ba5777a..8211143 100644
--- a/hosts/desktop/home.nix
+++ b/hosts/desktop/home.nix
@@ -1,8 +1,4 @@
-{
-  username,
-  pkgs,
-  ...
-}:
+{ username, ... }:
 {
   imports = [ ../../hm/default.nix ];
 
@@ -21,7 +17,7 @@
       git.enable = true;
       xdg-dirs = {
         enable = true;
-        mediaPath = /storage;
+        storagePath = /storage;
       };
       xdg-mime.enable = true;
     };
@@ -63,22 +59,4 @@
       yt-dlp.enable = true;
     };
   };
-
-  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" ];
-    };
-  };
-
-  home.sessionVariables = {
-    XDG_UTILS_TERMINAL = "foot";
-  };
 }