summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--accounts/gkleen@sif/alacritty.nix4
-rw-r--r--accounts/gkleen@sif/default.nix20
-rw-r--r--accounts/gkleen@sif/systemd.nix14
-rw-r--r--accounts/gkleen@sif/xmonad/xmonad.hs27
-rw-r--r--user-profiles/tmux/tmux.conf2
5 files changed, 13 insertions, 54 deletions
diff --git a/accounts/gkleen@sif/alacritty.nix b/accounts/gkleen@sif/alacritty.nix
index a2c19182..883c85b7 100644
--- a/accounts/gkleen@sif/alacritty.nix
+++ b/accounts/gkleen@sif/alacritty.nix
@@ -33,7 +33,7 @@
33 scrolling.history = 0; 33 scrolling.history = 0;
34 34
35 bell = { 35 bell = {
36 duration = 75; 36 duration = 50;
37 color = "#d9d9d9"; 37 color = "#000000";
38 }; 38 };
39} 39}
diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index 43ead4f5..a318a8ee 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -86,26 +86,6 @@ in {
86 }; 86 };
87 }; 87 };
88 88
89 urxvt = {
90 enable = true;
91 package = pkgs.rxvt_unicode-with-plugins;
92 fonts = [ "xft:FiraCode Nerd Font Mono:style=Regular:pixelsize=21" ];
93 scroll = {
94 lines = 0;
95 bar.enable = false;
96 };
97 extraConfig = {
98 urgentOnBell = false;
99 print-pipe = "cat >/dev/null";
100 perl-ext-common = "52-osc,url-select";
101 "url-select.launcher" = "firefox";
102 "url-select.underline" = true;
103 };
104 keybindings = {
105 "M-u" = "perl:url-select:select_next";
106 };
107 };
108
109 alacritty = { 89 alacritty = {
110 enable = true; 90 enable = true;
111 settings = import ./alacritty.nix; 91 settings = import ./alacritty.nix;
diff --git a/accounts/gkleen@sif/systemd.nix b/accounts/gkleen@sif/systemd.nix
index a5b71417..7faef31a 100644
--- a/accounts/gkleen@sif/systemd.nix
+++ b/accounts/gkleen@sif/systemd.nix
@@ -11,20 +11,6 @@ in {
11 ExecStart = "${pkgs.lftp}/bin/lftp -f ${./store.kdbx.lftp}"; 11 ExecStart = "${pkgs.lftp}/bin/lftp -f ${./store.kdbx.lftp}";
12 }; 12 };
13 }; 13 };
14 urxvtd = {
15 Service = {
16 Type = "simple";
17 WorkingDirectory = "~";
18 ExecStart = "${cfg.programs.urxvt.package}/bin/urxvtd";
19 Restart = "always";
20 };
21 Unit = {
22 After = ["graphical-session.target"];
23 };
24 Install = {
25 WantedBy = ["graphical-session.target"];
26 };
27 };
28 emacs = { 14 emacs = {
29 Unit = { 15 Unit = {
30 After = ["graphical-session-pre.target"]; 16 After = ["graphical-session-pre.target"];
diff --git a/accounts/gkleen@sif/xmonad/xmonad.hs b/accounts/gkleen@sif/xmonad/xmonad.hs
index 579456ad..d21debdf 100644
--- a/accounts/gkleen@sif/xmonad/xmonad.hs
+++ b/accounts/gkleen@sif/xmonad/xmonad.hs
@@ -172,8 +172,6 @@ hostFromName h
172 | h `elem` ["hel", "sif"] = defaultHost { hName = h 172 | h `elem` ["hel", "sif"] = defaultHost { hName = h
173 , hManageHook = namedScratchpadManageHook scratchpads <+> composeOne (catMaybes 173 , hManageHook = namedScratchpadManageHook scratchpads <+> composeOne (catMaybes
174 [ assign "mpv" $ className =? "mpv" 174 [ assign "mpv" $ className =? "mpv"
175 , assign "mpv" $ (className =? "URxvt" <&&> title =? "irssi")
176 , assign "mpv" $ (className =? "URxvt" <&&> resource =? "presentation")
177 , assign "mpv" $ stringProperty "WM_WINDOW_ROLE" =? "presentation" 175 , assign "mpv" $ stringProperty "WM_WINDOW_ROLE" =? "presentation"
178 , assign "read" $ stringProperty "WM_WINDOW_ROLE" =? "presenter" 176 , assign "read" $ stringProperty "WM_WINDOW_ROLE" =? "presenter"
179 , assign "mpv" $ className =? "factorio" 177 , assign "mpv" $ className =? "factorio"
@@ -182,19 +180,15 @@ hostFromName h
182 , assign "work" $ (appName =? "Devtools" <&&> className =? "Firefox") 180 , assign "work" $ (appName =? "Devtools" <&&> className =? "Firefox")
183 , assign "work" $ className =? "Postman" 181 , assign "work" $ className =? "Postman"
184 , assign "web" $ className =? "Firefox" 182 , assign "web" $ className =? "Firefox"
185 , assign "comm" $ (className =? "URxvt" <&&> resource =? "comm")
186 , assign "comm" $ (className =? "Emacs" <&&> title =? "Mail") 183 , assign "comm" $ (className =? "Emacs" <&&> title =? "Mail")
187 , assign "comm" $ className =? "Zulip" 184 , assign "comm" $ className =? "Zulip"
188 , assign "comm" $ className =? "Discord" 185 , assign "comm" $ className =? "Discord"
189 , assign "media" $ (className =? "URxvt" <&&> resource =? "media") 186 , assign "media" $ (className =? "Alacritty" <&&> resource =? "media")
190 , assign "media" $ (className =? "URxvt" <&&> title =? "streamlink")
191 , assign "media" $ (className =? "URxvt" <&&> title =? "mpv")
192 , assign "monitor" $ (className =? "URxvt" <&&> fmap ("monitor" `isInfixOf`) title)
193 , assign "monitor" $ className =? "Grafana" 187 , assign "monitor" $ className =? "Grafana"
194 , Just $ (className =? "URxvt" <&&> resource =? "htop") -?> centerFloat 188 , Just $ (className =? "Alacritty" <&&> resource =? "htop") -?> centerFloat
195 , Just $ (className =? "Scp-dbus-service.py") -?> centerFloat 189 , Just $ (className =? "Scp-dbus-service.py") -?> centerFloat
196 , Just $ (className =? "URxvt" <&&> resource =? "log") -?> centerFloat 190 , Just $ (className =? "Alacritty" <&&> resource =? "log") -?> centerFloat
197 , assign "work" $ className =? "URxvt" 191 , assign "work" $ className =? "Alacritty"
198 , assign' ["work", "uni"] $ (className =? "Emacs" <&&> appName /=? "Edit_with_Emacs_FRAME") 192 , assign' ["work", "uni"] $ (className =? "Emacs" <&&> appName /=? "Edit_with_Emacs_FRAME")
199 , assign' ["work", "uni"] $ className =? "jetbrains-idea-ce" 193 , assign' ["work", "uni"] $ className =? "jetbrains-idea-ce"
200 , assign "read" $ className =? "llpp" 194 , assign "read" $ className =? "llpp"
@@ -227,7 +221,6 @@ hostFromName h
227 , hCoWsp = hCoWsp 221 , hCoWsp = hCoWsp
228 , hKeysMod = \conf -> Map.union $ (Map.fromList $ join $ map (spawnBindings conf) [ (xK_e, ["emacsclient -c"]) 222 , hKeysMod = \conf -> Map.union $ (Map.fromList $ join $ map (spawnBindings conf) [ (xK_e, ["emacsclient -c"])
229 , (xK_d, [fromString browser, fromString $ browser ++ " $(xclip -o)", fromString $ "notmuch-links"]) 223 , (xK_d, [fromString browser, fromString $ browser ++ " $(xclip -o)", fromString $ "notmuch-links"])
230 , (xK_f, ["urxvtc -name comm -title Feeds -e mosh odin -- tmux new-session -ADs comm"])
231 , (xK_c, [ inputPrompt xPConfig "dc" ?+ dc ]) 224 , (xK_c, [ inputPrompt xPConfig "dc" ?+ dc ])
232 , (xK_g, ["pidgin"]) 225 , (xK_g, ["pidgin"])
233 , (xK_s, ["skype"]) 226 , (xK_s, ["skype"])
@@ -235,7 +228,7 @@ hostFromName h
235 , (xK_w, ["sudo rewacom"]) 228 , (xK_w, ["sudo rewacom"])
236 , (xK_y, [ "tmux new-window -dt media /var/media/link.hs $(xclip -o)" 229 , (xK_y, [ "tmux new-window -dt media /var/media/link.hs $(xclip -o)"
237 , "tmux new-window -dt media /var/media/download.hs $(xclip -o)" 230 , "tmux new-window -dt media /var/media/download.hs $(xclip -o)"
238 , "urxvtc -name media -e tmuxp load /var/media" 231 , "alacritty --class media -e tmuxp load /var/media"
239 ]) 232 ])
240 , (xK_l, [ "tmux new-window -dt media mpv $(xclip -o)" 233 , (xK_l, [ "tmux new-window -dt media mpv $(xclip -o)"
241 , "tmux new-window -dt media streamlink --retry-open 10 $(xclip -o)" 234 , "tmux new-window -dt media streamlink --retry-open 10 $(xclip -o)"
@@ -250,8 +243,8 @@ hostFromName h
250 , (xK_s, [ inputPromptWithCompl xPConfig "start synergy" synergyCompl ?+ synergyStart 243 , (xK_s, [ inputPromptWithCompl xPConfig "start synergy" synergyCompl ?+ synergyStart
251 , inputPromptWithCompl xPConfig "stop synergy" synergyCompl ?+ synergyStop 244 , inputPromptWithCompl xPConfig "stop synergy" synergyCompl ?+ synergyStop
252 ]) 245 ])
253 , (xK_h, [ "urxvtc -name htop -e htop" 246 , (xK_h, [ "alacritty --class htop -e htop"
254 , "urxvtc -name log -e journalctl -xef" 247 , "alacritty --class log -e journalctl -xef"
255 ]) 248 ])
256 , (xK_x, [ "autorandr -c" 249 , (xK_x, [ "autorandr -c"
257 , "autorandr -fl def" 250 , "autorandr -fl def"
@@ -312,7 +305,7 @@ hostFromName h
312 , (9, "media") 305 , (9, "media")
313 , (10, "mpv") 306 , (10, "mpv")
314 ] 307 ]
315 scratchpads = [ NS "term" "urxvtc -name scratchpad -title scratchpad -e tmux new-session -AD -s scratch" (resource =? "scratchpad") centerFloat 308 scratchpads = [ NS "term" "alacritty --class scratchpad --title scratchpad -e tmux new-session -AD -s scratch" (resource =? "scratchpad") centerFloat
316 , NS "pavucontrol" "pavucontrol" (resource =? "pavucontrol") centerFloat 309 , NS "pavucontrol" "pavucontrol" (resource =? "pavucontrol") centerFloat
317 , NS "alarms" "alarm-clock-applet" (className =? "Alarm-clock-applet" <&&> title =? "Alarms") centerFloat 310 , NS "alarms" "alarm-clock-applet" (className =? "Alarm-clock-applet" <&&> title =? "Alarms") centerFloat
318 , NS "blueman" "blueman-manager" (className =? ".blueman-manager-wrapped") centerFloat 311 , NS "blueman" "blueman-manager" (className =? ".blueman-manager-wrapped") centerFloat
@@ -480,7 +473,7 @@ main = do
480 setEnv "HOST" hostname 473 setEnv "HOST" hostname
481 let myConfig = withHostUrgency . ewmh $ docks def 474 let myConfig = withHostUrgency . ewmh $ docks def
482 { manageHook = hManageHook host 475 { manageHook = hManageHook host
483 , terminal = "urxvtc" 476 , terminal = "alacritty"
484 , layoutHook = smartBorders . avoidStruts $ windowNavigation layout' 477 , layoutHook = smartBorders . avoidStruts $ windowNavigation layout'
485 , logHook = do 478 , logHook = do
486 dynamicLogString xmobarPP' >>= writeProps 479 dynamicLogString xmobarPP' >>= writeProps
@@ -768,7 +761,7 @@ myKeys' conf host = Map.fromList $
768 -- launch dmenu 761 -- launch dmenu
769 --, ((modm, xK_d ), spawn "exe=`dmenu_path | dmenu` && eval \"exec $exe\"") 762 --, ((modm, xK_d ), spawn "exe=`dmenu_path | dmenu` && eval \"exec $exe\"")
770 , ((modm, xK_d ), shellPrompt "Run: " xPConfig) 763 , ((modm, xK_d ), shellPrompt "Run: " xPConfig)
771 , ((modm .|. shiftMask, xK_d ), prompt "Run in Terminal: " ("urxvtc" ++ " -e") xPConfig) 764 , ((modm .|. shiftMask, xK_d ), prompt "Run in Terminal: " ("alacritty" ++ " -e") xPConfig)
772 , ((modm, xK_at ), sshPrompt (sshOverrides . Just $ hName host) xPConfig) 765 , ((modm, xK_at ), sshPrompt (sshOverrides . Just $ hName host) xPConfig)
773 766
774 -- close focused window 767 -- close focused window
diff --git a/user-profiles/tmux/tmux.conf b/user-profiles/tmux/tmux.conf
index 1403698d..f9a3e11f 100644
--- a/user-profiles/tmux/tmux.conf
+++ b/user-profiles/tmux/tmux.conf
@@ -11,7 +11,7 @@ set-option -g set-clipboard on
11set-option -g terminal-overrides 'rxvt-uni*:XT:Ms=\E]52;%p1%s;%p2%s\007' 11set-option -g terminal-overrides 'rxvt-uni*:XT:Ms=\E]52;%p1%s;%p2%s\007'
12 12
13## determine if we should enable 256-colour support 13## determine if we should enable 256-colour support
14if "[[ ''${TERM} =~ 256color || ''${TERM} == fbterm ]]" 'set -g default-terminal tmux-256color' 14if "[[ ''${TERM} =~ 256color || ''${TERM} == fbterm || ''${TERM} =~ alacritty ]]" 'set -g default-terminal tmux-256color'
15 15
16set-option -g status-right "" 16set-option -g status-right ""
17 17
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-21 17:52:12 +0000