thinkpad configuration finalization

3 files changed, 16 insertions, 26 deletions

diff --git a/hosts/thinkpad/configuration.nix b/hosts/thinkpad/configuration.nix
index d58858a..21fc467 100644
--- a/hosts/thinkpad/configuration.nix
+++ b/hosts/thinkpad/configuration.nix
@@ -25,6 +25,7 @@
         type = "grub";
         efi = false;
         timeout = 0;
+        grub.device = "/dev/nvme0n1";
         luks.enable = true;
       };
       drivers = {
@@ -41,14 +42,8 @@
       };
       locale.enable = true;
       memory = {
-        zram = {
-          enable = true;
-          percent = 25;
-        };
-        swapfile = {
-          enable = true;
-          size = 8;
-        };
+        zram.enable = true;
+        swapfile.enable = true;
       };
       network.enable = true;
       power = {
@@ -62,13 +57,14 @@
     };
     srv = {
       bluetooth.enable = true;
-      files = {
-        thunar.enable = true;
-        utils.enable = true;
-      };
+      files.enable = true;
+      gaming.enable = true;
+      virtualization.enable = true;
       kdeconnect.enable = true;
       nix-helper.enable = true;
       monero.enable = true;
+      sops.enable = true;
+      syncthing.enable = true;
     };
     wm = {
       enable = true;
diff --git a/hosts/thinkpad/disko.nix b/hosts/thinkpad/disko.nix
index 8b41240..b5ccdc1 100644
--- a/hosts/thinkpad/disko.nix
+++ b/hosts/thinkpad/disko.nix
@@ -34,7 +34,6 @@
                       mountpoint = "/";
                       mountOptions = [
                         "compress=zstd:1"
-                        "space_cache=v2"
                         "discard=async"
                         "noatime"
                       ];
@@ -43,7 +42,6 @@
                       mountpoint = "/nix";
                       mountOptions = [
                         "compress=zstd:1"
-                        "space_cache=v2"
                         "discard=async"
                         "nodev"
                         "noatime"
@@ -53,7 +51,6 @@
                       mountpoint = "/home";
                       mountOptions = [
                         "compress=zstd:1"
-                        "space_cache=v2"
                         "discard=async"
                         "nosuid"
                         "nodev"
@@ -64,7 +61,6 @@
                       mountpoint = "/var/log";
                       mountOptions = [
                         "compress=zstd:1"
-                        "space_cache=v2"
                         "discard=async"
                         "nosuid"
                         "nodev"
@@ -75,7 +71,6 @@
                       mountpoint = "/games";
                       mountOptions = [
                         "compress=none"
-                        "space_cache=v2"
                         "discard=async"
                         "nosuid"
                         "nodev"
@@ -86,7 +81,6 @@
                       mountpoint = "/vms";
                       mountOptions = [
                         "compress=none"
-                        "space_cache=v2"
                         "discard=async"
                         "nodatacow"
                         "nosuid"
@@ -98,7 +92,6 @@
                       mountpoint = "/.swapvol";
                       mountOptions = [
                         "compress=none"
-                        "space_cache=v2"
                         "discard=async"
                         "nodatacow"
                         "noatime"
@@ -132,7 +125,6 @@
                       mountpoint = "/storage/archive";
                       mountOptions = [
                         "compress=zstd:1"
-                        "space_cache=v2"
                         "discard=async"
                         "nosuid"
                         "nodev"
@@ -146,7 +138,6 @@
                       mountpoint = "/storage/movies";
                       mountOptions = [
                         "compress=none"
-                        "space_cache=v2"
                         "discard=async"
                         "nosuid"
                         "nodev"
@@ -160,7 +151,6 @@
                       mountpoint = "/storage/anime";
                       mountOptions = [
                         "compress=none"
-                        "space_cache=v2"
                         "discard=async"
                         "nosuid"
                         "nodev"
@@ -174,7 +164,6 @@
                       mountpoint = "/storage/pics";
                       mountOptions = [
                         "compress=none"
-                        "space_cache=v2"
                         "discard=async"
                         "nosuid"
                         "nodev"
@@ -188,7 +177,6 @@
                       mountpoint = "/storage/vids";
                       mountOptions = [
                         "compress=none"
-                        "space_cache=v2"
                         "discard=async"
                         "nosuid"
                         "nodev"
diff --git a/hosts/thinkpad/home.nix b/hosts/thinkpad/home.nix
index 78a39d9..3a8215d 100644
--- a/hosts/thinkpad/home.nix
+++ b/hosts/thinkpad/home.nix
@@ -15,7 +15,11 @@
         backend = "wayland";
       };
       git.enable = true;
-      xdg-dirs.enable = true;
+      xdg-dirs = {
+        enable = true;
+        storagePath = /storage;
+      };
+      xdg-mime.enable = true;
     };
     editors.nixvim.enable = true;
     env = {
@@ -36,10 +40,12 @@
       starship.enable = true;
     };
     soft = {
-      browser.brave.enable = true;
+      browser.librewolf.enable = true;
+      email.thunderbird.enable = true;
       media.enable = true;
       mpv.enable = true;
       nixcord.enable = true;
+      onlyoffice.enable = true;
       obsidian.enable = true;
       spicetify.enable = true;
       torrent.enable = true;