From f6ca946c04ce8aa691d95c7a4c5ea90f441aec69 Mon Sep 17 00:00:00 2001
From: Charlie Root <charlie@charlieroot.dev>
Date: Mon, 14 Oct 2024 12:06:17 +0200
Subject: [PATCH] hermit: working system

---
 hosts/hermit/configuration.nix      | 18 ++++++------------
 hosts/hermit/default.nix            |  1 +
 hosts/hermit/filesystem/default.nix | 12 ++++++------
 hosts/hermit/hardware/default.nix   |  2 +-
 hosts/hermit/hardware/fs.nix        | 14 --------------
 hosts/hermit/programs.nix           |  1 +
 6 files changed, 15 insertions(+), 33 deletions(-)
 delete mode 100644 hosts/hermit/hardware/fs.nix

diff --git a/hosts/hermit/configuration.nix b/hosts/hermit/configuration.nix
index 81ff88d..6ae4c8f 100644
--- a/hosts/hermit/configuration.nix
+++ b/hosts/hermit/configuration.nix
@@ -20,13 +20,11 @@
     printing.enable = true;
   };
 
-  meta = {
-    users = ["vali"];
-    # mainUser = "vali";
-  };
   modules = {
     system = {
+      impermanence.enable = true;
       hardware = {
+        nvidia.enable = true;
         bluetooth = {
           enable = true;
           powerOnBoot = false;
@@ -39,11 +37,9 @@
           neovim.enable = true;
           # sadly just not advanced enough, yet.
           helix.enable = true;
-          kakoune.enable = false;
         };
         discord.enable = true;
-        nushell.enable = true;
-        oh-my-posh.enable = true;
+        # nushell.enable = true;
         eza.enable = true;
         firefox.enable = true;
         spotify.enable = true;
@@ -51,7 +47,6 @@
         zellij.enable = true;
         terminals = {
           foot.enable = true;
-          kitty.enable = true;
         };
       };
       sound.enable = true;
@@ -75,7 +70,7 @@
 
         media.mpd = {
           enable = true;
-          musicDirectory = "/home/${config.modules.other.system.username}/Nextcloud/media/Music";
+          musicDirectory = "/home/${config.modules.other.system.username}/cloud/media/Music";
         };
       };
 
@@ -87,8 +82,7 @@
     other = {
       system = {
         hostname = "hermit";
-        username = "vali";
-        gitPath = "/home/vali/projects/nichts";
+        username = "cr";
       };
 
       home-manager = {
@@ -99,7 +93,7 @@
       ssh.enable = true;
       btop.enable = true;
       newsboat.enable = true;
-      # fish.enable = true;
+      fish.enable = true;
       nh.enable = true;
       waybar.enable = true;
     };
diff --git a/hosts/hermit/default.nix b/hosts/hermit/default.nix
index 0312dc8..72cb011 100644
--- a/hosts/hermit/default.nix
+++ b/hosts/hermit/default.nix
@@ -4,5 +4,6 @@ _: {
     ./programs.nix
     ./hardware-configuration.nix
     ./hardware
+    ./filesystem
   ];
 }
diff --git a/hosts/hermit/filesystem/default.nix b/hosts/hermit/filesystem/default.nix
index bad8be3..39e4a76 100644
--- a/hosts/hermit/filesystem/default.nix
+++ b/hosts/hermit/filesystem/default.nix
@@ -1,9 +1,9 @@
 {
   config = {
-    boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/96e8f3d6-8d2d-4e2d-abd9-3eb7f48fed02";
+    boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/70952ef8-1d73-49ae-bd86-b7614f01fa86";
     fileSystems = {
       "/boot" = {
-        device = "/dev/disk/by-uuid/7825-451F";
+        device = "/dev/disk/by-uuid/466A-F45E";
         fsType = "vfat";
       };
       # root on tmpfs
@@ -13,23 +13,23 @@
         options = ["defaults" "size=25%" "mode=755"];
       };
       "/nix" = {
-        device = "/dev/disk/by-uuid/f0569993-722e-4721-b0d9-8ac537a7a548";
+        device = "/dev/disk/by-uuid/7fd4eb96-c9e6-450d-a7d6-1b2ef137a9f5";
         fsType = "btrfs";
         options = ["subvol=nix" "compress=zstd" "noatime"];
       };
       "/persist" = {
-        device = "/dev/disk/by-uuid/f0569993-722e-4721-b0d9-8ac537a7a548";
+        device = "/dev/disk/by-uuid/7fd4eb96-c9e6-450d-a7d6-1b2ef137a9f5";
         neededForBoot = true;
         fsType = "btrfs";
         options = ["subvol=persist" "compress=zstd" "noatime"];
       };
       "/home" = {
-        device = "/dev/disk/by-uuid/f0569993-722e-4721-b0d9-8ac537a7a548";
+        device = "/dev/disk/by-uuid/7fd4eb96-c9e6-450d-a7d6-1b2ef137a9f5";
         fsType = "btrfs";
         options = ["subvol=home" "compress=zstd" "noatime"];
       };
       "/swap" = {
-        device = "/dev/disk/by-uuid/f0569993-722e-4721-b0d9-8ac537a7a548";
+        device = "/dev/disk/by-uuid/7fd4eb96-c9e6-450d-a7d6-1b2ef137a9f5";
         fsType = "btrfs";
 
         options = ["subvol=swap" "compress=lzo" "noatime"];
diff --git a/hosts/hermit/hardware/default.nix b/hosts/hermit/hardware/default.nix
index ced3517..715273e 100644
--- a/hosts/hermit/hardware/default.nix
+++ b/hosts/hermit/hardware/default.nix
@@ -1 +1 @@
-_: {imports = [./monitors.nix ./fs.nix];}
+_: {imports = [./monitors.nix];}
diff --git a/hosts/hermit/hardware/fs.nix b/hosts/hermit/hardware/fs.nix
deleted file mode 100644
index 76d42e6..0000000
--- a/hosts/hermit/hardware/fs.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/b51d0f6c-2980-4117-b9df-5cc2c8ddd2d6";
-    fsType = "ext4";
-  };
-
-  boot.initrd.luks.devices."luks-f1b24c23-8211-433e-983e-2ebad020826e".device = "/dev/disk/by-uuid/f1b24c23-8211-433e-983e-2ebad020826e";
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/E355-67EA";
-    fsType = "vfat";
-    options = ["fmask=0022" "dmask=0022"];
-  };
-}
diff --git a/hosts/hermit/programs.nix b/hosts/hermit/programs.nix
index d9ddcc2..9fcc6e2 100644
--- a/hosts/hermit/programs.nix
+++ b/hosts/hermit/programs.nix
@@ -18,6 +18,7 @@
     eza
     fftw
     grc
+    gparted
     git
     halloy
     helvum