way too many changes to describe

7 files changed, 204 insertions, 32 deletions

diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix
index e09c622..4505408 100644
--- a/hosts/desktop/configuration.nix
+++ b/hosts/desktop/configuration.nix
@@ -1,4 +1,4 @@
-{ config, inputs, pkgs, username, ... }:
+{ config, inputs, username, ... }:
 {
   system.stateVersion = "25.05";
 
@@ -71,6 +71,13 @@
     };
   };
 
+  xdg.terminal-exec = {
+    enable = true;
+    settings = {
+      default = [ "foot.desktop" ];
+    };
+  };
+
   boot = {
     kernelParams = [ "video=DP-1:2560x1440@240" ];
     kernelModules = [ "nct6687" ];
diff --git a/hosts/desktop/disko.nix b/hosts/desktop/disko.nix
index d492ca6..edc4008 100644
--- a/hosts/desktop/disko.nix
+++ b/hosts/desktop/disko.nix
@@ -41,11 +41,11 @@
                   };
                   "@games" = {
                     mountpoint = "/games";
-                    mountOptions = [ "noatime" ];
+                    mountOptions = [ "compress=zstd:1" "noatime" ];
                   };
                   "@llms" = {
                     mountpoint = "/llms";
-                    mountOptions = [ "noatime"];
+                    mountOptions = [ "nodatacow" "noatime"];
                   };
                   "@vms" = {
                     mountpoint = "/vms";
@@ -75,19 +75,19 @@
                 subvolumes = {
                   "@archive" = {
                     mountpoint = "/media/archive";
-                    mountOptions = [ "compress=zstd:3" "autodefrag" "noatime" ];
+                    mountOptions = [ "compress=zstd:1" "autodefrag" "noatime" ];
                   };
                   "@movies" = {
                     mountpoint = "/media/movies";
-                    mountOptions = [ "compress=zstd:3" "autodefrag" "noatime" ];
+                    mountOptions = [ "autodefrag" "noatime" ];
                   };
                   "@anime" = {
-                    mountpoint = "/media/movies";
-                    mountOptions = [ "compress=zstd:3" "autodefrag" "noatime" ];
+                    mountpoint = "/media/anime";
+                    mountOptions = [ "autodefrag" "noatime" ];
                   };
                   "@pictures" = {
                     mountpoint = "/media/pics";
-                    mountOptions = [ "compress=zstd:3" "autodefrag" "noatime" ];
+                    mountOptions = [ "autodefrag" "noatime" ];
                   };
                   "@videos" = {
                     mountpoint = "/media/vids";
diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix
index b485217..8431d37 100644
--- a/hosts/desktop/home.nix
+++ b/hosts/desktop/home.nix
@@ -1,10 +1,4 @@
-{ pkgs, username, ... }:
-let
-  miyabi-cursor-pkg = pkgs.runCommand "miyabi" {} ''
-    mkdir -p $out/share/icons/miyabi
-    cp -rv ${../../resources/cursors/miyabi}/* $out/share/icons/miyabi/
-  '';
-in
+{ username, ... }:
 {
   imports = [ ../../hm/default.nix ];
 
@@ -23,15 +17,20 @@ in
       git.enable = true;
       xdg-dirs = {
         enable = true;
-        mediaPath = /media;
+        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;
       };
@@ -62,24 +61,17 @@ in
     };
   };
 
-  home.packages = with pkgs; [
-    simplex-chat-desktop
-    magic-wormhole
-    gimp
-  ];
-
-  programs.firefox.enable = true;
-
-  programs.nix-index = {
+  xdg.mimeApps = {
     enable = true;
-    enableFishIntegration = true;
+    defaultApplications = {
+      "x-scheme-handler/terminal" = [ "foot.desktop" ];
+      "inode/directory" = [ "thunar.desktop" ];
+    };
   };
 
-  home.pointerCursor = {
-    gtk.enable = true;
-    x11.enable = true;
-    package = miyabi-cursor-pkg; 
-    name = "miyabi";
-    size = 48;
+  home.sessionVariables = {
+    XDG_UTILS_TERMINAL = "foot";
   };
+
+  programs.firefox.enable = true;
 }
diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix
index 777e270..bfcf58a 100644
--- a/hosts/laptop/home.nix
+++ b/hosts/laptop/home.nix
@@ -20,9 +20,11 @@
     editors.nixvim.enable = true;
     env = {
       niri.enable = true;
+      cursor.enableMiyabi = true;
 
       waybar.enable = true;
       themes = {
+        enable = true;
         gtk.enable = true;
         qt.enable = true;
       };
diff --git a/hosts/thinkpad/configuration.nix b/hosts/thinkpad/configuration.nix
new file mode 100644
index 0000000..69134eb
--- /dev/null
+++ b/hosts/thinkpad/configuration.nix
@@ -0,0 +1,63 @@
+{ inputs, username, ... }:
+{
+  system.stateVersion = "25.05";
+
+  imports = [
+      inputs.disko.nixosModules.disko
+      ./disko.nix
+
+      ./hardware-configuration.nix
+      ../../os/default.nix
+    ];
+
+  os = {
+    core = {
+      allowUnfree.enable = true;
+
+      audio.enable = true;
+      bootloader = "systemd-boot";
+      drivers.enable = true;
+      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 = 8;
+        };
+      };
+      network.enable = true;
+      power.enable = true;
+      security.enable = true;
+      ssh.enable = true;
+      storage.enable = true;
+      users.enable = true;
+    };
+    srv = {
+      bluetooth.enable = true;
+      files = {
+        thunar.enable = true;
+        utils.enable = true;
+      };
+      # gaming = {
+      #   enable = true;
+      #   steam.enable = true;
+      #   vr.enable = true;
+      # };
+      # kvm.enable = true;
+      nix-helper.enable = true;
+    };
+    wm = {
+      enable = true;
+      niri.enable = true;
+    };
+  };
+}
diff --git a/hosts/thinkpad/disko.nix b/hosts/thinkpad/disko.nix
new file mode 100644
index 0000000..120efbc
--- /dev/null
+++ b/hosts/thinkpad/disko.nix
@@ -0,0 +1,58 @@
+{
+  disko.devices = {
+    disk = {
+      main = {
+        type = "disk";
+        device = "/dev/nvme0n1";
+        content = {
+          type = "gpt";
+          partitions = {
+            ESP = {
+              size = "1G";
+              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" ];
+                  };
+                  "@vms" = {
+                    mountpoint = "/vms";
+                    mountOptions = [ "nodatacow" "noatime" ];
+                  };
+                  "@swap" = {
+                    mountpoint = "/.swapvol";
+                    mountOptions = [ "nodatacow" "noatime" ];
+                  };
+                };
+              };
+            };
+          };
+        };
+      };
+    };
+  };
+}
diff --git a/hosts/thinkpad/home.nix b/hosts/thinkpad/home.nix
new file mode 100644
index 0000000..666a3b0
--- /dev/null
+++ b/hosts/thinkpad/home.nix
@@ -0,0 +1,50 @@
+{ 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;
+    };
+    editors.nixvim.enable = true;
+    env = {
+      niri.enable = true;
+      cursor.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.brave.enable = true;
+      kdeconnect.enable = true;
+      media.enable = true;
+      mpv.enable = true;
+      nixcord.enable = true;
+      obsidian.enable = true;
+      spicetify.enable = true;
+      torrent.enable = true;
+      yt-dlp.enable = true;
+    };
+  };
+}