more swayfx

7 files changed, 245 insertions, 22 deletions

diff --git a/modules/user/desktop/blossoms.jpg b/modules/user/desktop/blossoms.jpg
new file mode 100644
index 0000000..a420e12
--- /dev/null
+++ b/modules/user/desktop/blossoms.jpg
diff --git a/modules/user/desktop/default.nix b/modules/user/desktop/default.nix
index 1cfd36b..a480d86 100644
--- a/modules/user/desktop/default.nix
+++ b/modules/user/desktop/default.nix
@@ -19,29 +19,80 @@
   };
 
   config = {
-    home.packages = with pkgs; [
-      fira-code # monospace font
-    ];
+    home = {
+      file."Pictures/blossoms.jpg" = {
+        enable = (config.desktop.windowManager != null);
+        source = ./blossoms.jpg;
+      };
 
-    programs.foot = {
-      enable = lib.mkDefault (config.desktop != null);
-      settings = {
-        bell = {
-          notify = true;
-          urgent = true;
-        };
+      packages = with pkgs; [
+        fira-code # monospace font
+      ];
+    };
+
+    programs = {
+      foot = {
+        enable = lib.mkDefault (config.desktop.windowManager != null);
+        settings = {
+          bell = {
+            notify = true;
+            urgent = true;
+          };
 
-        colors = {
-          alpha = 0.7;
+          colors = {
+            alpha = 0.8;
+            background = "191724";
+            foreground = "e0def4";
+            regular0 = "26233a";
+            regular1 = "eb6f92";
+            regular2 = "9ccfd8";
+            regular3 = "f6c177";
+            regular4 = "31748f";
+            regular5 = "c4a7e7";
+            regular6 = "ebbcba";
+            regular7 = "e0def4";
+            bright0 = "47435d";
+            bright1 = "ff98ba";
+            bright2 = "c5f9ff";
+            bright3 = "ffeb9e";
+            bright4 = "5b9ab7";
+            bright5 = "eed0ff";
+            bright6 = "ffe5e3";
+            bright7 = "fefcff";
+            flash = "f6c177";
+            cursor = "191724 e0def4";
+          };
+
+          cursor.blink = true;
+          main = {
+            font = "Fira Code:size=8";
+            dpi-aware = true;
+          };
+
+          mouse.hide-when-typing = true;
         };
+      };
 
-        cursor.blink = true;
-        main = {
-          font = "Fira Code:size=8";
-          dpi-aware = true;
+      librewolf = {
+        enable = lib.mkDefault (config.desktop.windowManager != null);
+        profiles = {
+          default = { };
+          noRFP = {
+            id = 1;
+            settings = {
+              "privacy.resistFingerprinting" = false;
+              "webgl.disabled" = false;
+            };
+          };
         };
 
-        mouse.hide-when-typing = true;
+        settings = {
+          "browser.uidensity" = 1;
+          "sidebar.animation.enabled" = false;
+          "sidebar.new-sidebar.has-used" = true;
+          "sidebar.verticalTabs" = true;
+          "sidebar.visibility" = "hide-sidebar";
+        };
       };
     };
   };
diff --git a/modules/user/desktop/swayfx.nix b/modules/user/desktop/swayfx.nix
index 2ea2e85..8763124 100644
--- a/modules/user/desktop/swayfx.nix
+++ b/modules/user/desktop/swayfx.nix
@@ -26,8 +26,59 @@
             };
           };
 
+          colors = # rose pine theme
+            let
+              gold = "#f6c177";
+              hl3 = "#524f67";
+              love = "#eb6f92";
+              muted = "#6e6a86";
+              nothing = "#00000000";
+              overlay = "#26233a";
+              rose = "#ebbcba";
+              subtle = "#908caa";
+              text = "#e0def4";
+            in
+            {
+              focused = {
+                background = "${rose}";
+                border = "${rose}";
+                childBorder = "${rose}";
+                indicator = "${gold}";
+                text = "${hl3}";
+              };
+
+              focusedInactive = {
+                background = "${muted}";
+                border = "${nothing}";
+                childBorder = "${nothing}";
+                indicator = "${nothing}";
+                text = "${text}";
+              };
+
+              unfocused = {
+                background = "${overlay}";
+                border = "${nothing}";
+                childBorder = "${nothing}";
+                indicator = "${nothing}";
+                text = "${subtle}";
+              };
+
+              urgent = {
+                background = "${love}";
+                border = "${love}";
+                childBorder = "${love}";
+                indicator = "${love}";
+                text = "${text}";
+              };
+            };
+
           floating.titlebar = false;
           focus.followMouse = false;
+          fonts = {
+            names = [ "Fira Code" ];
+            size = 8.0;
+          };
+
           gaps = {
             inner = 4;
             outer = 8;
@@ -50,14 +101,50 @@
             let
               mod = config.wayland.windowManager.sway.config.modifier;
             in
-            lib.mkOptionDefault {
+            {
               "${mod}+Return" = "exec foot";
               "${mod}+Q" = "kill";
+              "${mod}+Alt+Q" = "exit";
+              "${mod}+V" = "splitt";
+              "${mod}+H" = "focus left";
+              "${mod}+J" = "focus down";
+              "${mod}+K" = "focus up";
+              "${mod}+L" = "focus right";
+              "${mod}+Shift+H" = "move left";
+              "${mod}+Shift+J" = "move down";
+              "${mod}+Shift+K" = "move up";
+              "${mod}+Shift+L" = "move right";
+              "${mod}+Minus" = "resize shrink width 5";
+              "${mod}+Shift+Equal" = "resize grow height 5";
+              "${mod}+Shift+Minus" = "resize shrink height 5";
+              "${mod}+Equal" = "resize grow width 5";
+              "${mod}+1" = "workspace 1";
+              "${mod}+2" = "workspace 2";
+              "${mod}+3" = "workspace 3";
+              "${mod}+4" = "workspace 4";
+              "${mod}+5" = "workspace 5";
+              "${mod}+6" = "workspace 6";
+              "${mod}+7" = "workspace 7";
+              "${mod}+8" = "workspace 8";
+              "${mod}+9" = "workspace 9";
+              "${mod}+Shift+1" = "move workspace 1";
+              "${mod}+Shift+2" = "move workspace 2";
+              "${mod}+Shift+3" = "move workspace 3";
+              "${mod}+Shift+4" = "move workspace 4";
+              "${mod}+Shift+5" = "move workspace 5";
+              "${mod}+Shift+6" = "move workspace 6";
+              "${mod}+Shift+7" = "move workspace 7";
+              "${mod}+Shift+8" = "move workspace 8";
+              "${mod}+Shift+9" = "move workspace 9";
+              "${mod}+F" = "floating toggle";
+              "${mod}+G" = "layout toggle split tabbed";
             };
 
+          modes = { };
           modifier = "Mod4";
           output = {
             "eDP-1" = {
+              background = "~/Pictures/blossoms.jpg fill";
               mode = "2256x1504@60Hz";
               position = "0 0";
               scale = "1.5";
@@ -67,10 +154,14 @@
           window.titlebar = false;
         };
 
+        # inactive windows cast no shadow to avoid rendering shadows on top of
+        # the active window
         extraConfig = ''
           blur enable
+          blur_xray enable
           corner_radius 10
           shadows enable
+          shadow_inactive_color #00000000
         '';
       }
     else
diff --git a/user/home/default.nix b/user/home/default.nix
index 8d76df9..a768574 100644
--- a/user/home/default.nix
+++ b/user/home/default.nix
@@ -1,4 +1,4 @@
-{ config, ... }:
+{ config, pkgs, ... }:
 {
   home-manager = {
     useGlobalPkgs = true;
@@ -12,6 +12,10 @@
 
       home = {
         homeDirectory = "/home/rosa";
+        packages = with pkgs; [
+          links2
+        ];
+
         stateVersion = "26.05";
         username = "rosa";
       };
diff --git a/user/home/kakoune/default.nix b/user/home/kakoune/default.nix
index ec7b89b..f5dea88 100644
--- a/user/home/kakoune/default.nix
+++ b/user/home/kakoune/default.nix
@@ -2,9 +2,8 @@
 {
   programs.kakoune = {
     enable = true;
-    colorSchemePackage = pkgs.kakounePlugins.kakoune-catppuccin;
     config = {
-      #colorScheme = "catppuccin_mocha";
+      colorScheme = "rose-pine";
       hooks = [
         {
           commands = "set window indentwidth 2";
@@ -67,4 +66,6 @@
       kakoune-lsp
     ];
   };
+
+  xdg.configFile."kak/colors/rose-pine.kak".source = ./rose-pine.kak;
 }
diff --git a/user/home/kakoune/rose-pine.kak b/user/home/kakoune/rose-pine.kak
new file mode 100644
index 0000000..0c96095
--- /dev/null
+++ b/user/home/kakoune/rose-pine.kak
@@ -0,0 +1,76 @@
+evaluate-commands %sh{
+    
+base=rgb:191724
+surface=rgb:1f1d2e
+overlay=rgb:26233a
+inactive=rgb:555169
+subtle=rgb:6e6a86
+text=rgb:e0def4
+love=rgb:eb6f92
+gold=rgb:f6c177
+rose=rgb:ebbcba
+pine=rgb:31748f
+foam=rgb:9ccfd8
+iris=rgb:c4a7e7
+highlight=rgb:2a2837
+highlightInactive=rgb:211f2d
+highlightOverlay=rgb:3a384a
+
+    
+## code
+echo "
+    face global value ${iris}
+    face global type ${iris}
+    face global identifier ${subtle}
+    face global string ${gold}
+    face global keyword ${pine}
+    face global operator default
+    face global attribute ${foam}
+    face global comment ${subtle}+i
+    face global meta ${foam}
+    face global builtin ${pine}
+
+    face global variable ${rose}
+    face global module ${foam}
+    face global function ${foam}
+"
+
+## markup
+echo "
+    face global title ${rose}+b
+    face global header ${rose}
+    face global bold default
+    face global italic default
+    face global mono ${rose}
+    face global block ${pine}
+    face global link ${love}
+    face global bullet ${rose}
+    face global list ${rose}
+"
+
+## builtin
+echo "
+    face global Default ${text},${base}
+    face global PrimarySelection default,${highlight}
+    face global SecondarySelection default,${highlightInactive}
+    face global PrimaryCursor ${base},${text}
+    face global SecondaryCursor default,${inactive}
+    face global LineNumbers ${subtle},${base}
+    face global LineNumberCursor ${gold},${base}
+    face global MenuForeground ${text},${overlay}
+    face global MenuBackground ${subtle},${surface}
+    face global MenuInfo ${inactive}
+    face global Information ${text},${overlay}
+    face global Error ${base},${love}
+    face global StatusLine ${text},${surface}
+    face global StatusLineMode ${rose}
+    face global StatusLineInfo ${foam}
+    face global StatusLineValue ${pine}
+    face global StatusCursor ${base},${text}
+    face global Prompt ${foam},${surface}
+    face global MatchingChar default+u
+    face global BufferPadding ${inactive},${base}
+    face global Whitespace ${inactive}+f
+"
+
+}
diff --git a/user/home/zsh.nix b/user/home/zsh.nix
index d264bd9..c19b147 100644
--- a/user/home/zsh.nix
+++ b/user/home/zsh.nix
@@ -8,7 +8,7 @@
     defaultKeymap = "viins";
     history.ignoreAllDups = true;
     initContent = ''
-      PS1="%F{1}%n %5~ %F{8}%# %f"
+      PS1="%F{1}%n %B%5~%b %F{8}%# %f"
     '';
 
     syntaxHighlighting.enable = true;