Changes

modules/art/default.nix

@@ -0,0 +1,3 @@
+{ ... }: {
+  services.xserver.wacom.enable = true;
+}

modules/art/home.nix

@@ -0,0 +1,5 @@
+{ pkgs, ... }: {
+  home.packages = [
+    pkgs.gimp
+  ];
+}

modules/bspwm/home.nix

@@ -5,6 +5,7 @@
     ../qutesearch/home.nix
     ../tint2/home.nix
     ../rofi/home.nix
+    ../clipboard/home.nix
   ];
 
   config = {
@@ -23,10 +24,14 @@
     xdg.portal = {
       enable = true;
       extraPortals = [
-        pkgs.xdg-desktop-portal-kde
+        pkgs.xdg-desktop-portal-gtk
+
+        # pkgs.xdg-desktop-portal-kde
       ];
       configPackages = [
-        pkgs.xdg-desktop-portal-kde
+        pkgs.xdg-desktop-portal-gtk
+
+        # pkgs.xdg-desktop-portal-kde
       ];
     };
 
@@ -59,7 +64,7 @@
       bspc monitor -d I II III IV V
       '';
 
-      settings = {
+      settings = with config.custom.colors; {
         border_width = 1;
         window_gap = 4;
         split_ratio = 0.52;
@@ -70,6 +75,11 @@
 
         focus_follows_pointer = true;
         pointer_follows_focus = true;
+
+        presel_feedback_color = lib.mkDefault base00;
+        normal_border_color = base01;
+        active_border_color = base04;
+        focused_border_color = base0C;
       };
 
       rules = {

modules/bspwm/sxhkdrc

@@ -32,10 +32,10 @@ super + slash
 
 # Show clipmenu
 super + v
-	rofi -modi "clipboard:greenclip print" -show clipboard -run-command '{cmd}'
+	clipcat-menu
 
 super + shift + v
-    greenclip clear
+    clipcatctl clear
 
 #
 # bspwm hotkeys
@@ -72,6 +72,10 @@ super + alt + Return
 super + Print
   flameshot gui
 
+# Plumb selected text
+super + c
+  eval $(sselp | goawk $(cat ~/plumber.awk))
+
 #
 # state/flags
 #

modules/clipboard/clipcatctl.toml

@@ -0,0 +1,7 @@
+server_endpoint = "/run/user/1000/clipcat/grpc.sock"
+
+[log]
+emit_journald = true
+emit_stdout = false
+emit_stderr = false
+level = "INFO"

modules/clipboard/clipcatd.toml

@@ -0,0 +1,44 @@
+daemonize = true
+pid_file = "/run/user/1000/clipcatd.pid"
+max_history = 50
+synchronize_selection_with_clipboard = true
+history_file_path = "/home/dakedres/.cache/clipcat/clipcatd-history"
+snippets = []
+
+[log]
+emit_journald = true
+emit_stdout = false
+emit_stderr = false
+level = "INFO"
+
+[watcher]
+enable_clipboard = true
+enable_primary = true
+enable_secondary = true
+sensitive_x11_atoms = ["x-kde-passwordManagerHint"]
+filter_text_min_length = 1
+filter_text_max_length = 20000000
+denied_text_regex_patterns = []
+capture_image = true
+filter_image_max_size = 5242880
+
+[grpc]
+enable_http = false
+enable_local_socket = true
+host = "127.0.0.1"
+port = 45045
+local_socket = "/run/user/1000/clipcat/grpc.sock"
+
+[dbus]
+enable = true
+
+[metrics]
+enable = true
+host = "127.0.0.1"
+port = 45047
+
+[desktop_notification]
+enable = true
+icon = "accessories-clipboard"
+timeout_ms = 2000
+long_plaintext_length = 2000

modules/clipboard/home.nix

@@ -0,0 +1,12 @@
+{ pkgs, ... }: {
+  home.packages = [
+    pkgs.sselp
+    pkgs.xclip
+    pkgs.clipcat
+  ];
+
+  xdg.configFile."clipcat/clipcatd.toml".source = ./clipcatd.toml;
+  xdg.configFile."clipcat/clipcatctl.toml".source = ./clipcatctl.toml;
+
+  xsession.initExtra = "clipcatd";
+}

modules/discord/home.nix

@@ -8,5 +8,5 @@
     home.packages = [
       pkgs.discord
     ];
-  }
+  };
 }

modules/emacs/home.nix

@@ -0,0 +1,8 @@
+{ pkgs, ... }: {
+  programs.emacs = {
+    enable = true;
+    extraPackages = epkgs: [
+      epkgs.doom
+    ];
+  };
+}

modules/fish/home.nix

@@ -1,4 +1,12 @@
-{ pkgs, lib, config, ... }: {
+{ pkgs, lib, config, ... }:
+
+let
+  shellAliases = {
+    l = "ls -lh";
+    ll = "ls -lha";
+    skcd = "j $(sk)";
+  };
+in {
   home.packages = [
     pkgs.grc
     pkgs.fishPlugins.grc
@@ -8,8 +16,9 @@
     interactiveShellInit = ''
       set fish_greeting  # Disable greeting
     '';
-    shellAliases = {
-      l = "ls -lh";
-    };
+    inherit shellAliases;
   };
+
+  programs.kitty.shellIntegration.enableFishIntegration = true;
+  programs.skim.enableFishIntegration = true;
 }

modules/home.nix

@@ -1,5 +0,0 @@
-{ ... } : {
-  imports = [
-    
-  ]
-}

modules/hyprland/home.nix

@@ -22,7 +22,6 @@
     };
 
     xdg.portal = {
-      enable = true;
       extraPortals = [
         pkgs.xdg-desktop-portal-gtk
       ];

modules/kitty/colors.nix

@@ -1,13 +1,6 @@
 { config, lib,  ... }:
 
 {
-  options.custom.colors.kitty = {
-    enable = lib.mkOption {
-      type = lib.types.bool;
-      default = true;
-    };
-  };
-
   config = {
     programs.kitty.settings = with config.custom.colors; {
       # Based on https://github.com/mk12/base16-kitty

modules/kitty/home.nix

@@ -1,9 +1,9 @@
 { ... }: {
-  imports = [ ./colors.nix ];
+  # Temp
+  # imports = [ ./colors.nix ];
 
   programs.kitty = {
     enable = true;
-    shellIntegration.enableFishIntegration = true;
     settings = {
       editor = "micro";
 

modules/niri/home.nix

@@ -0,0 +1,15 @@
+{ inputs, system, ... }: {
+  imports = [
+    ../qutesearch/home.nix
+    ../waybar/home.nix
+    ../rofi/home.nix
+  ];
+
+  home.packages = [
+    inputs.niripkg.packages.${system}.default
+  ];
+
+#   xsession.windowManager.command = ''
+#   ${extraPkgs.niri}/bin/niri
+#   '';
+}

modules/picom/home.nix

@@ -0,0 +1,28 @@
+{ ... }:
+
+let
+  preselect_selector = "class_g = 'Bspwm' && class_i = 'presel_feedback'";
+in {
+  services.picom = {
+    enable = true;
+
+    # fade = true;
+    # fadeDelta = 3;
+
+    shadow = true;
+    shadowExclude = [
+      "window_type *= 'menu'"
+      "name = 'tint2'"
+      preselect_selector
+    ];
+
+    opacityRules = [
+      "10:${preselect_selector}" 
+    ];
+
+    vSync = true;
+  };
+
+  xsession.initExtra = "picom";
+  xsession.windowManager.bspwm.settings.presel_feedback_color = "#ffffff";
+}

modules/qutebrowser/home.nix

@@ -14,10 +14,13 @@
         tabs_are_windows = true;
         show = "never";
       };
-
-      colors = {
-        webpage.darkmode.enabled = true;
+ 
+      colors.webpage = {
+        preferred_color_scheme = "dark";
+        # darkmode.enabled = true;
       };
+
+      content.headers.user_agent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.3";
     };
   };
 }

modules/sioyek/home.nix

@@ -0,0 +1,11 @@
+{ config, ... }: {
+  programs.sioyek = {
+    enable = true;
+    config = with config.custom.colors; {
+      "background_color" = base00;
+      "text_highlight_color" = base05;
+      "link_highlight_color" = base0C;
+      "search_highlight_color" = base0A;
+    };
+  };
+}

modules/syncthing/home.nix

@@ -0,0 +1,7 @@
+{ ... }: {
+  services.syncthing = {
+    enable = true;
+  };
+
+  xsession.initExtra = "syncthing";
+}

modules/zsh/default.nix

@@ -0,0 +1,5 @@
+{ ... }: {
+  programs.zsh = {
+    enable = true;
+  };
+}