tmux wrapped terminal script

11 files changed, 86 insertions, 112 deletions

diff --git a/common/modules/window_managers/default.nix b/common/modules/window_managers/default.nix
index 6591583..bc93e35 100644
--- a/common/modules/window_managers/default.nix
+++ b/common/modules/window_managers/default.nix
@@ -63,6 +63,7 @@ in
           cliphist
           brightnessctl
           maim
+          wtype
         ];
       }
     else
diff --git a/common/modules/window_managers/dwm/default.nix b/common/modules/window_managers/dwm/default.nix
index d1f7850..49537a2 100644
--- a/common/modules/window_managers/dwm/default.nix
+++ b/common/modules/window_managers/dwm/default.nix
@@ -12,19 +12,6 @@
 }:
 let
   cfg = config.${moduleNameSpace}.windowManagers;
-  snipx11 = pkgs.writeShellScript "snipx11" ''
-    case $1 in
-      full)
-        ${pkgs.maim}/bin/maim | xclip -selection clipboard -t image/png
-        ;;
-      selection)
-        ${pkgs.maim}/bin/maim -s | xclip -selection clipboard -t image/png
-        ;;
-      window)
-        ${pkgs.maim}/bin/maim -i $(xdotool getactivewindow) | xclip -selection clipboard -t image/png
-        ;;
-    esac
-  '';
   st-patched =
     (pkgs.st.override {
       extraLibs = [ pkgs.libXcursor ];
@@ -32,18 +19,6 @@ let
       (oldAttrs: rec {
         patches = map pkgs.fetchpatch [
           {
-            url = "https://st.suckless.org/patches/scrollback/st-scrollback-0.9.2.diff";
-            sha256 = "sha256-ZypvRONAHS//wnZjivmqpWIqZlKTqAQ0Q8DhQpZVaqU=";
-          }
-          {
-            url = "https://st.suckless.org/patches/scrollback/st-scrollback-mouse-0.9.2.diff";
-            sha256 = "sha256-CuNJ5FdKmAtEjwbgKeBKPJTdEfJvIdmeSAphbz0u3Uk=";
-          }
-          {
-            url = "https://st.suckless.org/patches/scrollback/st-scrollback-mouse-altscreen-20220127-2c5edf2.diff";
-            sha256 = "sha256-8oVLgbsYCfMhNEOGadb5DFajdDKPxwgf3P/4vOXfUFo=";
-          }
-          {
             url = "https://st.suckless.org/patches/xresources/st-xresources-20230320-45a15676.diff";
             sha256 = "sha256-WcL9IeyanXFiOFDGGRU0QNT8DU7wSo2o+3n+TaqASUY=";
           }
@@ -71,16 +46,13 @@ let
             url = "https://st.suckless.org/patches/boxdraw/st-boxdraw_v2-0.8.5.diff";
             sha256 = "sha256-WN/R6dPuw1eviHOvVVBw2VBSMDtfi1LCkXyX36EJKi4=";
           }
-          # {
-          #   url = "https://st.suckless.org/patches/themed_cursor/st-themed_cursor-0.8.1.diff";
-          #   sha256 = "sha256-Q/6VN9oCrdJiZPPjKMpw3UB09tIs4eJ1Hi5c8k7O7uo=";
-          # }
+          {
+            url = "https://st.suckless.org/patches/bold-is-not-bright/st-bold-is-not-bright-20190127-3be4cf1.diff";
+            sha256 = "sha256-IhrTgZ8K3tcf5HqSlHm3GTacVJLOhO7QPho6SCGXTHw=";
+          }
         ];
 
         postPatch = oldAttrs.postPatch or "" + ''
-          sed -i 's/Button4, *kscrollup, *{.i = 1}/Button4, kscrollup, {.i = 10}/g' config.def.h
-          sed -i 's/Button5, *kscrolldown, *{.i = 1}/Button5, kscrolldown, {.i = 10}/g' config.def.h
-
           sed -i 's/const int boxdraw = 0;/const int boxdraw = 1;/g' config.def.h
           sed -i 's/const int boxdraw_bold = 0;/const int boxdraw_bold = 1;/g' config.def.h
 
@@ -194,10 +166,10 @@ in
           "Xft.hintstyle" = "hintfull";
           "Xft.rgba" = "rgb";
           "st.font" =
-            "${config.beeMods.terminal.font.family}:size=${toString config.beeMods.terminal.font.size}:antialias=true:autohint=true";
+            "JetBrainsMono Nerd Font:size=${toString config.beeMods.terminal.font.size}:antialias=true:autohint=true";
           "dmenu.font" =
             "${config.beeMods.terminal.font.family}:size=${toString config.beeMods.terminal.font.size}";
-          "st.borderpx" = 2;
+          # "st.borderpx" = 2;
         };
       }
   );
diff --git a/common/modules/window_managers/hyprland/default.nix b/common/modules/window_managers/hyprland/default.nix
index aaf202f..fea9db6 100644
--- a/common/modules/window_managers/hyprland/default.nix
+++ b/common/modules/window_managers/hyprland/default.nix
@@ -12,21 +12,7 @@
 }:
 let
   cfg = config.${moduleNameSpace}.windowManagers;
-  smart-alacritty = pkgs.writeShellScript "smart-alacritty" ''
-    alacritty msg create-window || exec alacritty
-  '';
-
-  smart-ghostty = pkgs.writeShellScript "smart-ghostty" ''
-    ghostty +new-window || exec ghostty
-  '';
-
-  terminal =
-    if config.beeMods.terminal.default == "alacritty" then
-      smart-alacritty
-    else if config.beeMods.terminal.default == "ghostty" then
-      smart-ghostty
-    else
-      config.beeMods.terminal.default;
+  scripts = import ../scripts.nix { inherit pkgs config; };
 in
 {
   config = lib.mkIf cfg.hyprland.enable (
@@ -222,7 +208,7 @@ in
 
             bind = [
               "$mainMod, r, exec, hyprctl reload"
-              "$mainMod, Return, exec, ${terminal}"
+              "$mainMod, Return, exec, ${scripts.terminal}"
               "$mainMod, a, exec,noctalia-shell ipc call launcher toggle"
               "$mainMod, y, exec,noctalia-shell ipc call wallpaper toggle"
               "$mainMod, v, exec,noctalia-shell ipc call launcher clipboard"
diff --git a/common/modules/window_managers/mango/default.nix b/common/modules/window_managers/mango/default.nix
index 41c6f5c..73db1ab 100644
--- a/common/modules/window_managers/mango/default.nix
+++ b/common/modules/window_managers/mango/default.nix
@@ -12,6 +12,7 @@
 }:
 let
   cfg = config.${moduleNameSpace}.windowManagers;
+  scripts = import ../scripts.nix { inherit pkgs config; };
   snip = pkgs.writeShellScript "snip" ''
     case $1 in
       full)
@@ -32,19 +33,6 @@ let
         ;;
     esac
   '';
-  smart-alacritty = pkgs.writeShellScript "smart-alacritty" ''
-    alacritty msg create-window || exec alacritty
-  '';
-  smart-ghostty = pkgs.writeShellScript "smart-ghostty" ''
-    ghostty +new-window || exec ghostty
-  '';
-  terminal =
-    if config.beeMods.terminal.default == "alacritty" then
-      smart-alacritty
-    else if config.beeMods.terminal.default == "ghostty" then
-      smart-ghostty
-    else
-      config.beeMods.terminal.default;
 in
 {
   imports =
@@ -224,7 +212,7 @@ in
             # reload config
             bind=SUPER,r,reload_config
 
-            bind=SUPER,Return,spawn,${terminal}
+            bind=SUPER,Return,spawn,${scripts.terminal}
 
             bind=SUPER,v,spawn,noctalia-shell ipc call launcher clipboard
             bind=SUPER,a,spawn,noctalia-shell ipc call launcher toggle
diff --git a/common/modules/window_managers/scripts.nix b/common/modules/window_managers/scripts.nix
new file mode 100644
index 0000000..1d854ae
--- /dev/null
+++ b/common/modules/window_managers/scripts.nix
@@ -0,0 +1,23 @@
+{ pkgs, config }:
+
+{
+  terminal = pkgs.writeShellScript "terminal" ''
+    TERM="${config.beeMods.terminal.default}"
+    SESSION="_main"
+
+    if pgrep -x "$TERM" >/dev/null; then
+        if tmux ls &>/dev/null; then
+            tmux neww
+            exit 0
+        else
+            exec $TERM -e tmux new -s $SESSION
+        fi
+    else 
+        if tmux ls &>/dev/null; then
+            exec $TERM -e tmux attach
+        else
+          exec $TERM -e tmux new -s $SESSION
+        fi
+    fi
+  '';
+}
diff --git a/common/programs/tmux.nix b/common/programs/tmux.nix
index 906fa82..9b59dba 100644
--- a/common/programs/tmux.nix
+++ b/common/programs/tmux.nix
@@ -1,18 +1,21 @@
 {
   programs.tmux = {
     enable = true;
+    terminal = "tmux-256color";
+    keyMode = "vi";
+    prefix = "C-a";
+    escapeTime = 0;
+    shortcut = "a";
+    mouse = true;
+    baseIndex = 1;
     extraConfig = ''
       set -g status-position top
       set -g status-justify absolute-centre
       set -g status-right ""
       set -g status-left "#S"
-      set -g base-index 1
       set -g renumber-windows on
-      set -g mode-key vi
-      set -sg escape-time 0
       set-option -g status-style bg=default
       set-option -g window-status-current-style "fg=blue bold"
-      set -g prefix C-SPACE
     '';
   };
 }
diff --git a/flake.lock b/flake.lock
index 22971b8..8c378a3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -11,11 +11,11 @@
         "wrappers": "wrappers"
       },
       "locked": {
-        "lastModified": 1778074724,
-        "narHash": "sha256-UBpqNuD0nyab/I02ctUmKB7/O2zdcHDkw3DOZ+xBt1o=",
+        "lastModified": 1778185716,
+        "narHash": "sha256-38EPNNNfc3jZH4UUA8CDrCXwKh4xiaEzVETTlOpEp0M=",
         "ref": "refs/heads/main",
-        "rev": "1cdfedc4284cad70075f119e2bf3de0b017bef42",
-        "revCount": 25,
+        "rev": "3ab5bbeda2c86b62999b5a662374c38e3ef0c01b",
+        "revCount": 27,
         "type": "git",
         "url": "https://codeberg.org/brustybee/beeVim"
       },
@@ -27,11 +27,11 @@
     "doomemacs": {
       "flake": false,
       "locked": {
-        "lastModified": 1777326848,
-        "narHash": "sha256-7ErKUgw6Ch7hP1oBjMSos8xXRD+rxxjaOldRn+TcClo=",
+        "lastModified": 1778017961,
+        "narHash": "sha256-+HR9w67PvNg25TJURz3GJDA81LER67tSJJKVubmeKEg=",
         "owner": "doomemacs",
         "repo": "doomemacs",
-        "rev": "6be3337b49867bd86f90fe5ca4beeb6b38afaddb",
+        "rev": "a174a69259e082bcc743d472377a9a2035c79537",
         "type": "github"
       },
       "original": {
@@ -50,11 +50,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1777712875,
-        "narHash": "sha256-WVpNYPgTnyoBvpOxQoOh+1HGkFUPGP6qHt6TZoXCSPk=",
+        "lastModified": 1778062824,
+        "narHash": "sha256-lpEMrAykaMevuhTutXvKysBibhb3aEWIG5Skew9vcaE=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "0c01d3f81a5df88f78d92e8750dcae295237bf7b",
+        "rev": "12320c4f8cca562e2b032ff3f6d29372867c27c7",
         "type": "github"
       },
       "original": {
@@ -68,11 +68,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1777678872,
-        "narHash": "sha256-EPIFsulyon7Z1vLQq5Fk64GR8L7cQsT+IPhcsukVbgk=",
+        "lastModified": 1777988971,
+        "narHash": "sha256-qIoWPDs+0/8JecyYgE3gpKQxW/4bLW/gp45vow9ioCQ=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "5250617bffd85403b14dbf43c3870e7f255d2c16",
+        "rev": "0678d8986be1661af6bb555f3489f2fdfc31f6ff",
         "type": "github"
       },
       "original": {
@@ -106,11 +106,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1777780644,
-        "narHash": "sha256-CYpc+mk28rmcQWGygeM8CA+Z8SZYy8BOyQtiW18spao=",
+        "lastModified": 1778144356,
+        "narHash": "sha256-dGM+QCstz/DyLB68+JK5GWyMx4QSqmOJEVgZmy63d/g=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "b9311028044a9e9b2cf27db15ef0a87d464e212d",
+        "rev": "e4419d3123b780d5f4c0bceeace450424387638c",
         "type": "github"
       },
       "original": {
@@ -128,11 +128,11 @@
         "scenefx": "scenefx"
       },
       "locked": {
-        "lastModified": 1776999768,
-        "narHash": "sha256-RP7eVqbnQ/uNCXh0HH8SXRIerMlkyHco+wpI9oxon0U=",
+        "lastModified": 1778128166,
+        "narHash": "sha256-B6bhitxPXuO2WJ2ddp5s1agPypLrqJSx9Lc8O0AYk0M=",
         "owner": "mangowm",
         "repo": "mango",
-        "rev": "b9c6a2c1964cb59536c5d3e02d2ff981a7eb36d2",
+        "rev": "18fa5a22c2236ca8efb53e1dd23366f01c21a5ec",
         "type": "github"
       },
       "original": {
@@ -148,11 +148,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1777765363,
-        "narHash": "sha256-U9AamF2wAtJV+egN2ViUszUFCBlEWsMgkrdHfT83AZE=",
+        "lastModified": 1778148240,
+        "narHash": "sha256-1QxxJVPOEkSv8f5fATb30te6dxlii8Q2woHqrUS1LbQ=",
         "ref": "refs/heads/main",
-        "rev": "770354080922fa7d8f3988f88b01bc9cc85b1681",
-        "revCount": 13,
+        "rev": "6ff3df54d519ebad91572ee1e246633b4338129d",
+        "revCount": 16,
         "type": "git",
         "url": "https://codeberg.org/brustybee/mydwm"
       },
@@ -169,11 +169,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1777714515,
-        "narHash": "sha256-+zWBvULVf6KA0517tj4jl+XaY8fwbaWY8+xLoGeoAlY=",
+        "lastModified": 1778063352,
+        "narHash": "sha256-BbZ/5spDn++PKnnQcCHtefJGzisRBf307OF7nl4eitg=",
         "owner": "marienz",
         "repo": "nix-doom-emacs-unstraightened",
-        "rev": "aeed34ebdbb0c11a7340ac3cb1900619452d7540",
+        "rev": "e36071aafae22e1784339be38bfa9a0f7f6527eb",
         "type": "github"
       },
       "original": {
@@ -184,11 +184,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1777578337,
-        "narHash": "sha256-Ad49moKWeXtKBJNy2ebiTQUEgdLyvGmTeykAQ9xM+Z4=",
+        "lastModified": 1777954456,
+        "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "15f4ee454b1dce334612fa6843b3e05cf546efab",
+        "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1",
         "type": "github"
       },
       "original": {
@@ -236,11 +236,11 @@
         "noctalia-qs": "noctalia-qs"
       },
       "locked": {
-        "lastModified": 1777772763,
-        "narHash": "sha256-MIFrNTX+x42UdOiL9lWmwyyymh80/pxtU4afvEizZDk=",
+        "lastModified": 1778104114,
+        "narHash": "sha256-+tbqLv7IW5Aem8kGF6cp4n3MtNBcwqmuGlMt6S1kQjs=",
         "owner": "noctalia-dev",
         "repo": "noctalia-shell",
-        "rev": "f0469d2d6f9b1ca873932dcef6583f9d6a2eee28",
+        "rev": "eb2b53ddaa7564f5c93031cbe65cd5b6ef3c12a9",
         "type": "github"
       },
       "original": {
@@ -259,11 +259,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1777380063,
-        "narHash": "sha256-q5mWOEICcZzr+KnjIwDHV9EXiBxOC9cnBpxZbDAViU8=",
+        "lastModified": 1777773024,
+        "narHash": "sha256-pLU+KB84A0Jei/vTD6pOS4Ovkmq3QDfPQHg1MlKsRqM=",
         "owner": "noctalia-dev",
         "repo": "noctalia-qs",
-        "rev": "8742a7a748c43bf44eb6862a8ebd3591ed71502d",
+        "rev": "d3e26ccd9eecde9139be00caf5dc2d4260fb31ee",
         "type": "github"
       },
       "original": {
@@ -362,11 +362,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1777338324,
-        "narHash": "sha256-bc+ZZCmOTNq86/svGnw0tVpH7vJaLYvGLLKFYP08Q8E=",
+        "lastModified": 1777944972,
+        "narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "8eaee5c45428b28b8c47a83e4c09dccec5f279b5",
+        "rev": "c591bf665727040c6cc5cb409079acb22dcce33c",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index f339e3e..076a591 100644
--- a/flake.nix
+++ b/flake.nix
@@ -42,6 +42,7 @@
     };
     beevim = {
       url = "git+https://codeberg.org/brustybee/beeVim";
+      # url = "git+file:/home/bee/.config/beevim";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
diff --git a/hosts/common.nix b/hosts/common.nix
index 17f5c92..a6ec249 100644
--- a/hosts/common.nix
+++ b/hosts/common.nix
@@ -147,13 +147,14 @@
   fonts.packages = with pkgs; [
     ioskeley-input
     nerd-fonts.symbols-only
+    nerd-fonts.jetbrains-mono
     # ioskeley-mono
     # maple-mono.NF
-    # nerd-fonts.jetbrains-mono
   ];
 
   fonts.fontconfig.defaultFonts.monospace = [
     "IosevkaInput"
+    "JetBrainsMono Nerd Font"
     "Symbols Nerd Font"
   ];
 
diff --git a/hosts/nixios/default.nix b/hosts/nixios/default.nix
index 7920378..18b2474 100644
--- a/hosts/nixios/default.nix
+++ b/hosts/nixios/default.nix
@@ -25,7 +25,7 @@
     windowManagers = {
       mango.enable = false;
       hyprland.enable = true;
-      dwm.enable = true;
+      dwm.enable = false;
     };
   };
 
diff --git a/users/bee/default.nix b/users/bee/default.nix
index 0204d13..32cd026 100644
--- a/users/bee/default.nix
+++ b/users/bee/default.nix
@@ -37,7 +37,7 @@
           input_path = "~/.config/matugen/templates/discord.css";
           output_path = "~/.config/equibop/themes/matugen-sys24.css";
         };
-        xresources = {
+        xresources = lib.mkIf config.beeMods.windowManagers.dwm.enable {
           input_path = "~/.config/matugen/templates/colors-xresources";
           output_path = "~/.config/x11/matugen.Xresources";
         };
@@ -52,7 +52,7 @@
 
   beeMods = {
     windowManagers = {
-      dwm.enable = true;
+      dwm.enable = false;
       hyprland.enable = true;
       mango.enable = false;
       eyeCandy = {
@@ -69,8 +69,7 @@
     matugen.enable = true;
     emacs.enable = false;
     terminal = {
-      alacritty = true;
-      default = "alacritty";
+      foot = true;
       font.family = "IosevkaInput";
       font.size = 11.0;
     };