home: big refactor

3 files changed, 49 insertions, 65 deletions

diff --git a/home/desktop/default.nix b/home/desktop/default.nix
new file mode 100644
index 0000000..1608693
--- /dev/null
+++ b/home/desktop/default.nix
@@ -0,0 +1,14 @@
+{ config, lib, pkgs, ... }:
+with lib; let
+  cfg = config.local.desktop;
+in
+{
+  imports = [
+    ./firefox.nix
+    ./sway.nix
+  ];
+
+  options.local.desktop = {
+    enable = mkEnableOption "desktop";
+  };
+}
diff --git a/home/desktop/firefox.nix b/home/desktop/firefox.nix
new file mode 100644
index 0000000..4a7bbac
--- /dev/null
+++ b/home/desktop/firefox.nix
@@ -0,0 +1,30 @@
+{ config, lib, pkgs, ... }:
+with lib; let
+  cfg = config.local.desktop;
+in
+{
+  config = mkIf cfg.enable {
+    programs.firefox = {
+      enable = true;
+
+      package = pkgs.firefox.override {
+        nativeMessagingHosts = [ pkgs.passff-host ];
+      };
+
+      profiles."main.profile" = {
+        id = 0;
+        name = "default";
+
+        extensions = with pkgs.nur.repos.rycee.firefox-addons; [
+          decentraleyes
+          darkreader
+          old-reddit-redirect
+          passff
+          privacy-badger
+          ublock-origin
+          umatrix
+        ];
+      };
+    };
+  };
+}
diff --git a/home/desktop.nix b/home/desktop/sway.nix
index fea1f35..1162e87 100644
--- a/home/desktop.nix
+++ b/home/desktop/sway.nix
@@ -1,38 +1,10 @@
 { config, lib, pkgs, ... }:
-with lib; {
-  config = mkIf (!config.home.isolation.active) {
-    home.pointerCursor = {
-      package = pkgs.adwaita-icon-theme;
-
-      gtk.enable = true;
-      name = "Adwaita";
-      x11.enable = true;
-    };
-
+with lib; let
+  cfg = config.local.desktop;
+in
+{
+  config = mkIf cfg.enable {
     programs = {
-      firefox = {
-        enable = true;
-
-        package = pkgs.firefox.override {
-          nativeMessagingHosts = [ pkgs.passff-host ];
-        };
-
-        profiles."main.profile" = {
-          id = 0;
-          name = "default";
-
-          extensions = with pkgs.nur.repos.rycee.firefox-addons; [
-            decentraleyes
-            darkreader
-            old-reddit-redirect
-            passff
-            privacy-badger
-            ublock-origin
-            umatrix
-          ];
-        };
-      };
-
       swaylock = {
         enable = true;
 
@@ -43,38 +15,6 @@ with lib; {
         };
       };
 
-      tmux = {
-        enable = true;
-        aggressiveResize = true;
-        clock24 = true;
-        escapeTime = 10;
-        terminal = "xterm-256color";
-        keyMode = "vi";
-
-        plugins = [
-          {
-            plugin = pkgs.local.tmux-pass;
-            extraConfig = ''
-              set -g @pass-key BSpace
-              set -g @pass-copy-to-clipboard on
-              set -g @pass-window-size 15
-              set -g @pass-hide-pw-from-preview 'on'
-              set -g @pass-hide-preview on
-            '';
-          }
-        ];
-
-        extraConfig = ''
-          set -g mouse on
-          set -ga update-environment " LIFT_PID"
-          set -g set-titles on
-          set -g renumber-windows on
-          set -sa terminal-overrides ',xterm-termite:RGB'
-          set -g status-right "#{?window_bigger,[#{window_offset_x}#,#{window_offset_y}] ,} %H:%M %d-%b-%y"
-          bind-key X set-window-option synchronize-panes\; display-message "synchronize-panes is now #{?pane_synchronized,on,off}"
-        '';
-      };
-
       waybar.enable = true;
 
       wofi.enable = true;