From bdb0aab8a185bfc4dbd6beaeb756a82a8110f643 Mon Sep 17 00:00:00 2001
From: prescientmoon <git@moonythm.dev>
Date: Tue, 27 Aug 2024 23:47:44 +0200
Subject: [PATCH] Make calypso non-minimal again

---
 home/calypso.nix                            | 35 ++++++++++-----------
 home/features/cli/default.nix               |  1 -
 home/tethys.nix                             |  9 +++---
 hosts/nixos/calypso/default.nix             | 10 +++---
 hosts/nixos/calypso/filesystems/default.nix |  2 +-
 scripts/repl.sh                             |  2 +-
 6 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/home/calypso.nix b/home/calypso.nix
index 781bba5..a17ec27 100644
--- a/home/calypso.nix
+++ b/home/calypso.nix
@@ -3,20 +3,19 @@
   imports = [
     ./global.nix
 
-    # ./features/desktop/zathura.nix
-    # ./features/desktop/spotify.nix
-    # ./features/desktop/obsidian.nix
+    ./features/desktop/zathura.nix
+    ./features/desktop/spotify.nix
+    ./features/desktop/obsidian.nix
     ./features/desktop/foot.nix
     ./features/desktop/firefox
     ./features/desktop/discord
-    # ./features/cli/productivity
-    # ./features/cli/pass.nix
-    # ./features/cli/zellij.nix
-    # ./features/cli/nix-index.nix
-    # ./features/cli/catgirl.nix
-    # ./features/cli/lazygit.nix
+    ./features/cli/productivity
+    ./features/cli/catgirl.nix
+    ./features/cli/lazygit.nix
+    ./features/cli/nix-index.nix
+    ./features/cli/zellij.nix
     ./features/wayland/hyprland
-    # ./features/neovim
+    ./features/neovim
   ];
 
   # Arbitrary extra packages
@@ -27,7 +26,7 @@
     # zoom-us # Zoom client 🤮
     # }}}
     # {{{ Editors for different formats
-    # gimp # Image editing
+    gimp # Image editing
     # lmms # Music software
     # kicad # PCB editing
     # libreoffice # Free office suite
@@ -41,17 +40,17 @@
     # sherlock # Search for usernames across different websites
     # }}}
     # {{{ Misc
-    # bitwarden # Password-manager
-    # qbittorrent # Torrent client
+    bitwarden # Password-manager
+    qbittorrent # Torrent client
     # google-chrome # Not my primary browser, but sometimes needed in webdev
     # plover.dev # steno engine
-    # overskride # Bluetooth client
+    overskride # Bluetooth client
     # }}}
     # {{{ Media playing/recording
-    # mpv # Video player
-    # imv # Image viewer
-    # peek # GIF recorder
-    # obs-studio # video recorder
+    mpv # Video player
+    imv # Image viewer
+    peek # GIF recorder
+    obs-studio # video recorder
     # }}}
   ];
 
diff --git a/home/features/cli/default.nix b/home/features/cli/default.nix
index 67ed814..4ee7e66 100644
--- a/home/features/cli/default.nix
+++ b/home/features/cli/default.nix
@@ -5,7 +5,6 @@
     ./eza.nix
     ./bat.nix
     ./ssh.nix
-    ./gpg.nix
     ./git.nix
     ./starship.nix
     ./direnv.nix
diff --git a/home/tethys.nix b/home/tethys.nix
index 10e133b..6cb6c9a 100644
--- a/home/tethys.nix
+++ b/home/tethys.nix
@@ -9,12 +9,13 @@
     ./features/desktop/foot.nix
     ./features/desktop/firefox
     ./features/desktop/discord
-    ./features/cli/productivity
-    ./features/cli/pass.nix
-    ./features/cli/zellij.nix
-    ./features/cli/nix-index.nix
     ./features/cli/catgirl.nix
+    ./features/cli/gpg.nix
     ./features/cli/lazygit.nix
+    ./features/cli/nix-index.nix
+    ./features/cli/pass.nix
+    ./features/cli/productivity
+    ./features/cli/zellij.nix
     ./features/wayland/hyprland
     ./features/neovim
   ];
diff --git a/hosts/nixos/calypso/default.nix b/hosts/nixos/calypso/default.nix
index 9a2deda..31f3b79 100644
--- a/hosts/nixos/calypso/default.nix
+++ b/hosts/nixos/calypso/default.nix
@@ -8,19 +8,19 @@
     ../common/global
     ../common/users/pilot.nix
 
-    # ../common/optional/bluetooth.nix
+    ../common/optional/bluetooth.nix
     ../common/optional/greetd.nix
     ../common/optional/oci.nix
     ../common/optional/quietboot.nix
 
     ../common/optional/desktop
-    # ../common/optional/desktop/steam.nix
+    ../common/optional/desktop/steam.nix
     ../common/optional/wayland/hyprland.nix
 
     ../common/optional/services/kanata.nix
-    # ../common/optional/services/nginx.nix
-    # ../common/optional/services/syncthing.nix
-    # ../common/optional/services/restic
+    ../common/optional/services/nginx.nix
+    ../common/optional/services/syncthing.nix
+    ../common/optional/services/restic
 
     ./services/snapper.nix
 
diff --git a/hosts/nixos/calypso/filesystems/default.nix b/hosts/nixos/calypso/filesystems/default.nix
index dd8cac2..177540d 100644
--- a/hosts/nixos/calypso/filesystems/default.nix
+++ b/hosts/nixos/calypso/filesystems/default.nix
@@ -33,7 +33,7 @@
 
       # We first mount the btrfs root to /mnt
       # so we can manipulate btrfs subvolumes.
-      mount -o subvol=/ /dev/mapper/enc /mnt
+      mount -o subvol=/ /dev/mapper/crypted /mnt
 
       # While we're tempted to just delete /root and create
       # a new snapshot from /root-blank, /root is already
diff --git a/scripts/repl.sh b/scripts/repl.sh
index 12ec9e4..c8cfb4f 100755
--- a/scripts/repl.sh
+++ b/scripts/repl.sh
@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-nix repl ".#nixosConfigurations.$1.config"
+nix repl .#nixosConfigurations.$1.config