From befa5307a98e0c96565b87599fd5ee6ddd880b9f Mon Sep 17 00:00:00 2001
From: death916 <mail@trentnelson.dev>
Date: Fri, 26 Dec 2025 01:01:34 -0800
Subject: [PATCH 1/8] rm kopia for restic

---
 home-manager/home.nix                   |  3 ++-
 modules/nixos/homelab/services.nix      | 27 -------------------------
 modules/nixos/laptop/desktop.nix        |  1 -
 modules/nixos/orac/services.nix         | 27 -------------------------
 modules/nixos/oracle-proxy/services.nix | 27 -------------------------
 nixos/homelab.nix                       |  4 ----
 6 files changed, 2 insertions(+), 87 deletions(-)

diff --git a/home-manager/home.nix b/home-manager/home.nix
index 4cb0b3d..b7d8101 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -100,7 +100,6 @@ in
     cava
     fedistar
     yazi
-    lazygit
   ];
 
   nixpkgs.overlays = [
@@ -222,4 +221,6 @@ in
   };
 
   programs.btop.enable = true;
+
+  programs.lazygit.enable = true;
 }
diff --git a/modules/nixos/homelab/services.nix b/modules/nixos/homelab/services.nix
index b32a1d7..2a829b1 100644
--- a/modules/nixos/homelab/services.nix
+++ b/modules/nixos/homelab/services.nix
@@ -94,32 +94,6 @@
     };
   };
 
-  systemd.services.kopia-backup = {
-    description = "Kopia backup service for NixOS server";
-    after = [ "network-online.target" ];
-    wants = [ "network-online.target" ];
-    serviceConfig = {
-      Type = "oneshot";
-      User = "root";
-      ExecStart = "/usr/local/bin/nixos-kopia-backup.sh";
-      path = with pkgs; [
-        coreutils
-        kopia
-      ];
-    };
-  };
-
-  systemd.timers.kopia-backup = {
-    description = "Daily Kopia backup timer";
-    wantedBy = [ "timers.target" ];
-    partOf = [ "kopia-backup.service" ];
-    timerConfig = {
-      OnCalendar = "hourly";
-      Persistent = true;
-      Unit = "kopia-backup.service";
-    };
-  };
-
   users.users.adguardhome = {
     isSystemUser = true;
     group = "adguardhome";
@@ -169,7 +143,6 @@
     pkgs.jellyfin-ffmpeg
     pkgs.jellyfin
     unzip
-    kopia
     manix
     qemu
     virt-manager
diff --git a/modules/nixos/laptop/desktop.nix b/modules/nixos/laptop/desktop.nix
index 7310c4e..d7dd42a 100644
--- a/modules/nixos/laptop/desktop.nix
+++ b/modules/nixos/laptop/desktop.nix
@@ -50,7 +50,6 @@
     halloy
     conda
     inputs.flox.packages.${pkgs.system}.flox
-    kopia-ui
     wl-clipboard
     tail-tray
     clementine
diff --git a/modules/nixos/orac/services.nix b/modules/nixos/orac/services.nix
index 1078475..c732a82 100644
--- a/modules/nixos/orac/services.nix
+++ b/modules/nixos/orac/services.nix
@@ -8,32 +8,6 @@
 
   virtualisation.docker.enable = true;
 
-  systemd.services.kopia-backup = {
-    description = "Kopia backup service for NixOS server";
-    after = [ "network-online.target" ];
-    wants = [ "network-online.target" ];
-    serviceConfig = {
-      Type = "oneshot";
-      User = "root";
-      ExecStart = "/home/death916/nixconfig/modules/nixos/orac/kopia-backup.sh";
-      path = with pkgs; [
-        coreutils
-        kopia
-      ];
-    };
-  };
-
-  systemd.timers.kopia-backup = {
-    description = "Daily Kopia backup timer";
-    wantedBy = [ "timers.target" ];
-    partOf = [ "kopia-backup.service" ];
-    timerConfig = {
-      OnCalendar = "hourly";
-      Persistent = true;
-      Unit = "kopia-backup.service";
-    };
-  };
-
   programs.nh = {
     enable = true;
     # clean.enable = true;
@@ -86,7 +60,6 @@
     btop
     wget
     unzip
-    kopia
     manix
     pipes-rs
   ];
diff --git a/modules/nixos/oracle-proxy/services.nix b/modules/nixos/oracle-proxy/services.nix
index e2d6320..f40fb16 100644
--- a/modules/nixos/oracle-proxy/services.nix
+++ b/modules/nixos/oracle-proxy/services.nix
@@ -7,32 +7,6 @@
 
   virtualisation.docker.enable = true;
 
-  systemd.services.kopia-backup = {
-    description = "Kopia backup service for NixOS server";
-    after = [ "network-online.target" ];
-    wants = [ "network-online.target" ];
-    serviceConfig = {
-      Type = "oneshot";
-      User = "root";
-      ExecStart = "/usr/local/bin/nixos-kopia-backup.sh";
-      path = with pkgs; [
-        coreutils
-        kopia
-      ];
-    };
-  };
-
-  systemd.timers.kopia-backup = {
-    description = "Daily Kopia backup timer";
-    wantedBy = [ "timers.target" ];
-    partOf = [ "kopia-backup.service" ];
-    timerConfig = {
-      OnCalendar = "hourly";
-      Persistent = true;
-      Unit = "kopia-backup.service";
-    };
-  };
-
   programs.nh = {
     enable = true;
     clean.enable = true;
@@ -50,7 +24,6 @@
     btop
     wget
     unzip
-    kopia
     manix
   ];
 }
diff --git a/nixos/homelab.nix b/nixos/homelab.nix
index 3551ca1..d1ad073 100644
--- a/nixos/homelab.nix
+++ b/nixos/homelab.nix
@@ -13,7 +13,6 @@
     ../modules/nixos/common/base.nix
     ../modules/nixos/homelab/user.nix
     ../modules/nixos/common/tailscale.nix
-    ../modules/containers/kopia-server.nix
   ];
 
   config = {
@@ -35,11 +34,8 @@
       "network-online.target"
       "postgresql.service"
     ];
-    systemd.services.kopia-server.after = [ "network-online.target" ];
-    systemd.services.kopia-server.requires = [ "network-online.target" ];
 
     arrSuite.unpackerr.enable = true;
-    services.kopia-server.enable = true;
     system.stateVersion = "24.11";
 
     # Auto-reboot the system if it hangs (5 minute timeout)

From dad88cd50ed288c21f1fd635464c78b5097e0805 Mon Sep 17 00:00:00 2001
From: death916 <mail@trentnelson.dev>
Date: Fri, 26 Dec 2025 01:19:38 -0800
Subject: [PATCH 2/8] deprecation warning cleanups and dead module rm

---
 home-manager/home.nix            |  4 ----
 modules/home-manager/common.nix  |  8 +++++---
 modules/nixos/laptop/desktop.nix |  6 +++---
 nixos/configuration.nix          |  2 +-
 overlays/default.nix             | 23 -----------------------
 5 files changed, 9 insertions(+), 34 deletions(-)
 delete mode 100644 overlays/default.nix

diff --git a/home-manager/home.nix b/home-manager/home.nix
index b7d8101..0619e10 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -102,10 +102,6 @@ in
     yazi
   ];
 
-  nixpkgs.overlays = [
-    (import ../overlays/waveterm-overlay.nix ../overlays/halloy-overlay.nix)
-  ];
-
   programs.ghostty = {
     enable = true;
     enableBashIntegration = true;
diff --git a/modules/home-manager/common.nix b/modules/home-manager/common.nix
index affe33c..36d2d05 100644
--- a/modules/home-manager/common.nix
+++ b/modules/home-manager/common.nix
@@ -9,9 +9,11 @@
 {
   programs.git = {
     enable = true;
-    userName = "death916";
-    userEmail = "mail@trentnelson.dev";
-    extraConfig = {
+    settings = {
+      user = {
+        name = "death916";
+        email = "mail@trentnelson.dev";
+      };
       credential.helper = "store";
     };
   };
diff --git a/modules/nixos/laptop/desktop.nix b/modules/nixos/laptop/desktop.nix
index d7dd42a..93883f5 100644
--- a/modules/nixos/laptop/desktop.nix
+++ b/modules/nixos/laptop/desktop.nix
@@ -19,8 +19,8 @@
   services.gnome.gnome-keyring.enable = true;
   services.dbus.enable = true; # for nextcloud client
   # Enable the GNOME Desktop Environment.
-  services.xserver.displayManager.gdm.enable = true;
-  services.xserver.desktopManager.gnome.enable = true;
+  services.displayManager.gdm.enable = true;
+  services.desktopManager.gnome.enable = true;
   #cosmic instead
   services.desktopManager.cosmic.enable = true;
   # services.displayManager.cosmic-greeter.enable = true;
@@ -49,7 +49,7 @@
     unstablePkgs.cosmic-session
     halloy
     conda
-    inputs.flox.packages.${pkgs.system}.flox
+    inputs.flox.packages.${pkgs.stdenv.hostPlatform.system}.flox
     wl-clipboard
     tail-tray
     clementine
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index abc931f..90d8b49 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -41,7 +41,7 @@
     enable = true;
     settings = {
       default_session = {
-        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --cmd Hyprland";
+        command = "${pkgs.tuigreet}/bin/tuigreet --cmd start-hyprland";
         user = "death916";
       };
     };
diff --git a/overlays/default.nix b/overlays/default.nix
deleted file mode 100644
index 7bfcb4c..0000000
--- a/overlays/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# This file defines overlays
-{inputs, ...}: {
-  # This one brings our custom packages from the 'pkgs' directory
-  additions = final: _prev: import ../pkgs final.pkgs;
-
-  # This one contains whatever you want to overlay
-  # You can change versions, add patches, set compilation flags, anything really.
-  # https://nixos.wiki/wiki/Overlays
-  modifications = final: prev: {
-    # example = prev.example.overrideAttrs (oldAttrs: rec {
-    # ...
-    # });
-  };
-
-  # When applied, the unstable nixpkgs set (declared in the flake inputs) will
-  # be accessible through 'pkgs.unstable'
-  unstable-packages = final: _prev: {
-    unstable = import inputs.nixpkgs-unstable {
-      system = final.system;
-      config.allowUnfree = true;
-    };
-  };
-}

From 44bc82d29e7ececed0679b32b4d9cc2e800c49ac Mon Sep 17 00:00:00 2001
From: death916 <mail@trentnelson.dev>
Date: Fri, 26 Dec 2025 03:02:29 -0800
Subject: [PATCH 3/8] theme

---
 home-manager/theme.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/home-manager/theme.nix b/home-manager/theme.nix
index a556f7c..3795215 100644
--- a/home-manager/theme.nix
+++ b/home-manager/theme.nix
@@ -7,7 +7,7 @@
 
 {
   imports = [
-    ./themes/ferra.nix
+    ./themes/aether.nix
   ];
 
   stylix.enable = true;

From e0a716363578712550a3667f696e9555ed1b09c3 Mon Sep 17 00:00:00 2001
From: death916 <mail@trentnelson.dev>
Date: Fri, 26 Dec 2025 03:07:28 -0800
Subject: [PATCH 4/8] theme

---
 home-manager/home.nix  | 2 +-
 home-manager/theme.nix | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/home-manager/home.nix b/home-manager/home.nix
index 0619e10..f9e0b85 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -210,7 +210,7 @@ in
   };
 
   programs.zellij.enable = true;
-
+  programs.halloy.enable = true;
   programs.zed-editor = {
     enable = true;
     package = pkgs.zed-editor-fhs;
diff --git a/home-manager/theme.nix b/home-manager/theme.nix
index 3795215..bbbf48f 100644
--- a/home-manager/theme.nix
+++ b/home-manager/theme.nix
@@ -7,7 +7,7 @@
 
 {
   imports = [
-    ./themes/aether.nix
+    ./themes/sunset.nix
   ];
 
   stylix.enable = true;
@@ -50,5 +50,6 @@
     zellij.enable = true;
     zellij.colors.enable = true;
     btop.enable = true;
+    halloy.enable = true;
   };
 }

From 975a477048bd797ae245b996eb46d8f0d2346fd4 Mon Sep 17 00:00:00 2001
From: death916 <mail@trentnelson.dev>
Date: Fri, 26 Dec 2025 03:30:44 -0800
Subject: [PATCH 5/8] hally hm

---
 home-manager/home.nix | 71 +++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 69 insertions(+), 2 deletions(-)

diff --git a/home-manager/home.nix b/home-manager/home.nix
index f9e0b85..f553b39 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -69,7 +69,6 @@ in
     pciutils
     usbutils
     waveterm
-    halloy
     tmux
     nextcloud-client
     obsidian
@@ -210,7 +209,75 @@ in
   };
 
   programs.zellij.enable = true;
-  programs.halloy.enable = true;
+  programs.halloy = {
+    enable = true;
+    settings = {
+      notifications = {
+        direct_message = {
+          sound = "peck";
+          show_toast = true;
+        };
+        connected = {
+          sound = "peck";
+          show_toast = true;
+        };
+        highlight = {
+          sound = "dong";
+          show_toast = true;
+          show_content = true;
+          exclude = [ "NickServ" ];
+        };
+      };
+
+      servers.libera = {
+        nickname = "death916";
+        username = "death916/libera";
+        server = "100.72.187.12";
+        port = 6667;
+        chathistory = true;
+        use_tls = false;
+        dangerously_accept_invalid_certs = true;
+        logging = true;
+        buffer = "replace-pane";
+        password_file = "/home/death916/.config/halloy/libera.pass";
+        sasl.plain = {
+          username = "death916";
+          password_file = "/home/death916/.config/halloy/libera.pass";
+        };
+      };
+
+      actions = {
+        buffer.click_channel_name = "replace-pane";
+        sidebar = {
+          click_channel_name = "replace-pane";
+          buffer = "replace-pane";
+        };
+      };
+
+      buffer = {
+        server_messages = {
+          join = {
+            smart = 30;
+            enabled = false;
+          };
+          part = { smart = 30; };
+          quit = { smart = 30; };
+          topic = { enabled = false; };
+        };
+        channel.nicklist.width = 100;
+        scroll_position_on_open = "newest";
+        chathistory.infinite_scroll = true;
+      };
+
+      sidebar = {
+        click_channel_name = "replace-pane";
+        default_action = "replace-pane";
+        buffer = "replace-pane";
+      };
+
+      logging.enabled = true;
+    };
+  };
   programs.zed-editor = {
     enable = true;
     package = pkgs.zed-editor-fhs;

From 5faf17ab610a2408163b3ecb3f0ad912bd3a3657 Mon Sep 17 00:00:00 2001
From: death916 <mail@trentnelson.dev>
Date: Fri, 26 Dec 2025 03:35:31 -0800
Subject: [PATCH 6/8] hally hm

---
 home-manager/home.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/home-manager/home.nix b/home-manager/home.nix
index f553b39..1baf3ac 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -254,6 +254,8 @@ in
         };
       };
 
+      font.size = 16;
+
       buffer = {
         server_messages = {
           join = {

From 59a0d059d037e8affef04f4b36c7559615d63774 Mon Sep 17 00:00:00 2001
From: death916 <mail@trentnelson.dev>
Date: Fri, 26 Dec 2025 03:39:52 -0800
Subject: [PATCH 7/8] yazi hm

---
 home-manager/home.nix | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/home-manager/home.nix b/home-manager/home.nix
index 1baf3ac..d422e00 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -98,7 +98,6 @@ in
     restic-browser
     cava
     fedistar
-    yazi
   ];
 
   programs.ghostty = {
@@ -262,9 +261,15 @@ in
             smart = 30;
             enabled = false;
           };
-          part = { smart = 30; };
-          quit = { smart = 30; };
-          topic = { enabled = false; };
+          part = {
+            smart = 30;
+          };
+          quit = {
+            smart = 30;
+          };
+          topic = {
+            enabled = false;
+          };
         };
         channel.nicklist.width = 100;
         scroll_position_on_open = "newest";
@@ -286,6 +291,11 @@ in
   };
 
   programs.btop.enable = true;
-
+  programs.yazi = {
+    enable = true;
+    settings = {
+      show_hidden = true;
+    };
+  };
   programs.lazygit.enable = true;
 }

From d4e05f1b650fac75ee6fff662b1e9f0f449c94eb Mon Sep 17 00:00:00 2001
From: death916 <mail@trentnelson.dev>
Date: Fri, 26 Dec 2025 03:49:12 -0800
Subject: [PATCH 8/8] cava hm

---
 home-manager/home.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/home-manager/home.nix b/home-manager/home.nix
index d422e00..344d9c2 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -96,7 +96,6 @@ in
     # libsForQt5.kdeconnect-kde
     kdePackages.kdeconnect-kde
     restic-browser
-    cava
     fedistar
   ];
 
@@ -297,5 +296,6 @@ in
       show_hidden = true;
     };
   };
+  programs.cava.enable = true;
   programs.lazygit.enable = true;
 }