5 files changed, 10 insertions, 57 deletions
diff --git a/modules/terminal/home/default.nix b/modules/terminal/home/default.nix
deleted file mode 100644
index a874872..0000000
--- a/modules/terminal/home/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{pkgs, ...}: {
-  imports = [
-    ./emulators/blackbox.nix # can't do dbus with hjem
-  ];
-}
diff --git a/modules/terminal/home/emulators/blackbox.nix b/modules/terminal/home/emulators/blackbox.nix
deleted file mode 100644
index 7da15a9..0000000
--- a/modules/terminal/home/emulators/blackbox.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  pkgs,
-  lib,
-  config,
-  ...
-}: let
-  cfg = config.collinux.terminal.terminalEmulators.blackbox;
-in
-  lib.mkIf cfg.enable {
-    home.packages = [pkgs.blackbox-terminal];
-
-    dconf = {
-      enable = true;
-      settings = {
-        "com/raggesilver/BlackBox" = {
-          context-aware-header-bar = true;
-          fill-tabs = true;
-          notify-process-completion = true;
-          opacity = 100;
-          pixel-scrolling = true;
-          pretty = true;
-          show-scrollbars = false;
-          terminal-padding = "(10, 10, 10, 10)";
-
-          floating-controls = false;
-          show-headerbar = true;
-        };
-      };
-    };
-  }
diff --git a/modules/terminal/options.nix b/modules/terminal/options.nix
index b728f99..41d1ded 100644
--- a/modules/terminal/options.nix
+++ b/modules/terminal/options.nix
@@ -2,21 +2,11 @@
   pkgs,
   config,
   lib,
+  my-lib,
   ...
 }: let
   inherit (lib) mkOption mkEnableOption types;
-
-  mkProgramOption' = name: extraOpts:
-    {
-      enable = mkEnableOption "whether to enable ${name}";
-      theme = mkOption {
-        type = types.enum ["catppuccin" "adwaita"];
-        default = config.collinux.terminal.theme;
-      };
-    }
-    // extraOpts;
-
-  mkProgramOption = name: mkProgramOption' name {};
+  inherit (my-lib.options {inherit lib config;}) mkProgramOption' mkProgramOption;
 in {
   options = {
     collinux.terminal = {
diff --git a/modules/terminal/system/default.nix b/modules/terminal/system/default.nix
index 32ca3f9..d5cd1f5 100644
--- a/modules/terminal/system/default.nix
+++ b/modules/terminal/system/default.nix
@@ -1,18 +1,19 @@
 {
   config,
   pkgs,
+  my-lib,
   ...
 }: let
   cfg = config.collinux.terminal.shells;
 in {
   imports = [
-    ./programs/helix.nix
-    ./programs/tmux.nix
-    ./programs/fish.nix
-    ./programs/starship.nix
-    ./programs/lazygit.nix
     ./programs/cmus.nix
+    ./programs/fish.nix
     ./programs/git.nix
+    ./programs/helix.nix
+    ./programs/lazygit.nix
+    ./programs/starship.nix
+    ./programs/tmux.nix
   ];
 
   programs.command-not-found.enable = false; # broken without nix-channels
diff --git a/modules/terminal/system/programs/tmux.nix b/modules/terminal/system/programs/tmux.nix
index b947d95..ecb5e21 100644
--- a/modules/terminal/system/programs/tmux.nix
+++ b/modules/terminal/system/programs/tmux.nix
@@ -143,13 +143,10 @@
     run-shell "${scripts.bar}/bin/bar.sh"
 
     # Sessions
-    # set-hook -ag client-detached 'run-shell ${scripts.cleanSessions}/bin/clean-sessions.sh'
-    # set-hook -ag client-session-changed 'run-shell ${scripts.cleanSessions}/bin/clean-sessions.sh'
+    set-hook -ag client-detached 'run-shell ${scripts.cleanSessions}/bin/clean-sessions.sh'
+    set-hook -ag client-session-changed 'run-shell ${scripts.cleanSessions}/bin/clean-sessions.sh'
 
     bind-key -n C-f run-shell "${scripts.primeProjects}/bin/projects.sh"
-    bind-key -n M-1 run-shell "${scripts.primeProjects}/bin/projects.sh ~/Music"
-    bind-key -n M-2 run-shell "${scripts.primeProjects}/bin/projects.sh ~/Documents/brain2.0"
-    bind-key -n M-3 run-shell "${scripts.primeProjects}/bin/projects.sh ~/nixos"
 
     bind-key -n C-g display-popup -E -w 80% -h 80% -x C -y C -d "#{pane_current_path}" "${pkgs.lazygit}/bin/lazygit"
   '';