ugehgrhegh

homes/x86_64-linux/marshall@navis/default.nix

@@ -21,6 +21,7 @@
   };
 
   colorScheme = inputs.nix-colors.colorSchemes.catppuccin-mocha;
+
   wayland.windowManager.river = {
     enable = true;
     systemd.enable = true;
@@ -30,8 +31,12 @@
   home = {
     packages = with pkgs;
       [
+        alacritty
+        fuzzel
         alejandra
         beeper
+        bitwarden-cli
+        bitwarden-desktop
         duf
         eternal-terminal
         ((pkgs.emacsPackagesFor pkgs.emacs30-pgtk).emacsWithPackages (epkgs:
@@ -72,6 +77,7 @@
         libnotify
         lm_sensors
         loupe
+        mullvad-vpn
         nodejs
         playerctl
         prismlauncher
@@ -136,6 +142,7 @@
 
   catppuccin = {
     enable = true;
+    pointerCursor.enable = true;
     flavor = "mocha";
     accent = "green";
   };

homes/x86_64-linux/marshall@navis/hyprland/default.nix

@@ -7,6 +7,8 @@ with pkgs; {
   ];
 
   home.packages = [
+    hyprpanel
+    swww
     wl-clipboard
   ];
 
@@ -15,7 +17,7 @@ with pkgs; {
     systemd.variables = ["--all"];
 
     settings = let
-      rofi-clipboard = pkgs.writeScriptBin "rofi-clipboard" ''
+      rofi-clipboard = pkgs.writeScript "rofi-clipboard" ''
         tmp_dir="/tmp/cliphist"
         rm -rf "$tmp_dir"
 
@@ -39,7 +41,7 @@ with pkgs; {
         cliphist list | gawk "$prog"
       '';
 
-      scratchpad = pkgs.writeScriptBin "hyprscratchpad" ''
+      scratchpad = pkgs.writeScript "hyprscratchpad" ''
         COMMAND=$1
         CLASS=$2
         WORKSPACE=$3
@@ -55,19 +57,20 @@ with pkgs; {
       modC = "SUPER CTRL";
       modS = "SUPER SHIFT";
 
-      browser = "firefox-nightly";
-      colorPicker = "notify-send -i gtk-color-picker $(${hyprpicker}/bin/hyprpicker -a) 'Copied to clipboard.'";
+      browser = "zen-bin";
+      colorPicker = "notify-send -i gtk-color-picker $(${lib.getExe hyprpicker} -a) 'Copied to clipboard.'";
       fileManager = "nautilus";
       launcher = "rofi -show drun";
-      clipboard = "rofi -modi '   ':${rofi-clipboard}/bin/rofi-clipboard -show '   ' -show-icons";
+      clipboard = "rofi -modi '   ':${rofi-clipboard} -show '   ' -show-icons";
       terminal = "wezterm";
 
-      screenshot = mode: "${hyprshot}/bin/hyprshot --clipboard-only -m ${mode}";
+      screenshot = mode: "${lib.getExe hyprshot} --clipboard-only -m ${mode}";
     in {
       cursor.no_hardware_cursors = true;
-      decoration.rounding = 10;
+      decoration.rounding = 5;
       dwindle.preserve_split = true;
       gestures.workspace_swipe = true;
+
       input.touchpad = {
         clickfinger_behavior = true;
         natural_scroll = true;
@@ -75,13 +78,13 @@ with pkgs; {
 
       device = [
         {
-          name = "logitech-g502-x-plus";
+          name = "logitech-usb-receiver";
           sensitivity = -0.5;
         }
       ];
 
       windowrule = [
-        "float, ^(vesktop)$"
+        "float, ^(equibop)$"
         "float, ^(org.telegram.desktop)$"
       ];
 
@@ -110,21 +113,21 @@ with pkgs; {
         gaps_in = 10;
         resize_on_border = true;
 
-        "col.active_border" = "rgba(33ccffee) rgba(00ff99ee) 45deg";
+        "col.active_border" = "rgba(a6e3a1ee) rgba(cba6f7ee) 45deg";
         "col.inactive_border" = "rgba(595959aa)";
       };
 
       exec-once = [
-        "${mpvpaper.overrideAttrs {
-          version = "unstable-2024-07-05";
-          src = fetchFromGitHub {
-            owner = "GhostNaN";
-            repo = "mpvpaper";
-            rev = "a445391ff7491053fef78e3645eeed934f0c8fae";
-            sha256 = "sha256-3wHsUtIkh765EiMnx3BPzztvffIDf1NCqF0I/OATTZ4=";
-          };
-        }}/bin/mpvpaper -vp -o 'no-audio loop' DP-1 ${builtins.toString ./wall.mp4}"
-        "waybar"
+        "hyprpanel"
+        "swww-daemon"
+        "${writeScript "wallpaper" ''
+          while : ; do
+            for file in $(${uutils-coreutils}/bin/uutils-ls ${./walls}/*.jpg | sort -R | tail -1); do
+              swww img "$file" --transition-fps 165
+              sleep 5m
+            done
+          done
+        ''}"
       ];
 
       misc = {
@@ -133,8 +136,6 @@ with pkgs; {
       };
 
       monitor = [
-        "eDP-1, disable"
-        "Unknown-1, disable"
         "DP-1,  2560x1440@165, auto, auto"
       ];
 
@@ -165,8 +166,8 @@ with pkgs; {
           "${mod}, Return, exec, ${terminal}"
 
           # Scratchpads
-          "${mod}, d, exec, ${scratchpad}/bin/hyprscratchpad vesktop vesktop vesktop"
-          "${mod}, t, exec, ${scratchpad}/bin/hyprscratchpad telegram-desktop org.telegram.desktop telegram"
+          "${mod}, d, exec, ${scratchpad} equibop equibop equibop"
+          "${mod}, t, exec, ${scratchpad} telegram-desktop org.telegram.desktop telegram"
 
           # Screenshots
           "${modS}, s, exec, ${screenshot "window"}"

homes/x86_64-linux/marshall@navis/wezterm.lua

@@ -115,15 +115,15 @@ local config = {
   enable_kitty_graphics = true,
   enable_scroll_bar = false,
   enable_wayland = true,
-  font_size = 12,
-  font = wezterm.font('Iosevka Comfy Motion'),
+  font_size = 10,
+  font = wezterm.font('Maple Mono NF'),
   front_end = 'WebGpu',
   keys = keybinds,
   underline_position = -4,
   use_fancy_tab_bar = false,
+  window_background_opacity = 0.8,
   window_decorations = 'NONE',
   warn_about_missing_glyphs = false,
-  window_background_opacity = 0.8,
   window_padding = { left = 0, right = 0, top = 0, bottom = 0 },
 }