From d1a19ca964438013535a43c7eefc246b68fb69d4 Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sun, 23 May 2021 20:43:01 +0200 Subject: gkleen@sif: finish switch to alacritty --- accounts/gkleen@sif/alacritty.nix | 4 ++-- accounts/gkleen@sif/default.nix | 20 -------------------- accounts/gkleen@sif/systemd.nix | 14 -------------- accounts/gkleen@sif/xmonad/xmonad.hs | 27 ++++++++++----------------- user-profiles/tmux/tmux.conf | 2 +- 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 @@ scrolling.history = 0; bell = { - duration = 75; - color = "#d9d9d9"; + duration = 50; + color = "#000000"; }; } 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 { }; }; - urxvt = { - enable = true; - package = pkgs.rxvt_unicode-with-plugins; - fonts = [ "xft:FiraCode Nerd Font Mono:style=Regular:pixelsize=21" ]; - scroll = { - lines = 0; - bar.enable = false; - }; - extraConfig = { - urgentOnBell = false; - print-pipe = "cat >/dev/null"; - perl-ext-common = "52-osc,url-select"; - "url-select.launcher" = "firefox"; - "url-select.underline" = true; - }; - keybindings = { - "M-u" = "perl:url-select:select_next"; - }; - }; - alacritty = { enable = true; 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 { ExecStart = "${pkgs.lftp}/bin/lftp -f ${./store.kdbx.lftp}"; }; }; - urxvtd = { - Service = { - Type = "simple"; - WorkingDirectory = "~"; - ExecStart = "${cfg.programs.urxvt.package}/bin/urxvtd"; - Restart = "always"; - }; - Unit = { - After = ["graphical-session.target"]; - }; - Install = { - WantedBy = ["graphical-session.target"]; - }; - }; emacs = { Unit = { 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 | h `elem` ["hel", "sif"] = defaultHost { hName = h , hManageHook = namedScratchpadManageHook scratchpads <+> composeOne (catMaybes [ assign "mpv" $ className =? "mpv" - , assign "mpv" $ (className =? "URxvt" <&&> title =? "irssi") - , assign "mpv" $ (className =? "URxvt" <&&> resource =? "presentation") , assign "mpv" $ stringProperty "WM_WINDOW_ROLE" =? "presentation" , assign "read" $ stringProperty "WM_WINDOW_ROLE" =? "presenter" , assign "mpv" $ className =? "factorio" @@ -182,19 +180,15 @@ hostFromName h , assign "work" $ (appName =? "Devtools" <&&> className =? "Firefox") , assign "work" $ className =? "Postman" , assign "web" $ className =? "Firefox" - , assign "comm" $ (className =? "URxvt" <&&> resource =? "comm") , assign "comm" $ (className =? "Emacs" <&&> title =? "Mail") , assign "comm" $ className =? "Zulip" , assign "comm" $ className =? "Discord" - , assign "media" $ (className =? "URxvt" <&&> resource =? "media") - , assign "media" $ (className =? "URxvt" <&&> title =? "streamlink") - , assign "media" $ (className =? "URxvt" <&&> title =? "mpv") - , assign "monitor" $ (className =? "URxvt" <&&> fmap ("monitor" `isInfixOf`) title) + , assign "media" $ (className =? "Alacritty" <&&> resource =? "media") , assign "monitor" $ className =? "Grafana" - , Just $ (className =? "URxvt" <&&> resource =? "htop") -?> centerFloat + , Just $ (className =? "Alacritty" <&&> resource =? "htop") -?> centerFloat , Just $ (className =? "Scp-dbus-service.py") -?> centerFloat - , Just $ (className =? "URxvt" <&&> resource =? "log") -?> centerFloat - , assign "work" $ className =? "URxvt" + , Just $ (className =? "Alacritty" <&&> resource =? "log") -?> centerFloat + , assign "work" $ className =? "Alacritty" , assign' ["work", "uni"] $ (className =? "Emacs" <&&> appName /=? "Edit_with_Emacs_FRAME") , assign' ["work", "uni"] $ className =? "jetbrains-idea-ce" , assign "read" $ className =? "llpp" @@ -227,7 +221,6 @@ hostFromName h , hCoWsp = hCoWsp , hKeysMod = \conf -> Map.union $ (Map.fromList $ join $ map (spawnBindings conf) [ (xK_e, ["emacsclient -c"]) , (xK_d, [fromString browser, fromString $ browser ++ " $(xclip -o)", fromString $ "notmuch-links"]) - , (xK_f, ["urxvtc -name comm -title Feeds -e mosh odin -- tmux new-session -ADs comm"]) , (xK_c, [ inputPrompt xPConfig "dc" ?+ dc ]) , (xK_g, ["pidgin"]) , (xK_s, ["skype"]) @@ -235,7 +228,7 @@ hostFromName h , (xK_w, ["sudo rewacom"]) , (xK_y, [ "tmux new-window -dt media /var/media/link.hs $(xclip -o)" , "tmux new-window -dt media /var/media/download.hs $(xclip -o)" - , "urxvtc -name media -e tmuxp load /var/media" + , "alacritty --class media -e tmuxp load /var/media" ]) , (xK_l, [ "tmux new-window -dt media mpv $(xclip -o)" , "tmux new-window -dt media streamlink --retry-open 10 $(xclip -o)" @@ -250,8 +243,8 @@ hostFromName h , (xK_s, [ inputPromptWithCompl xPConfig "start synergy" synergyCompl ?+ synergyStart , inputPromptWithCompl xPConfig "stop synergy" synergyCompl ?+ synergyStop ]) - , (xK_h, [ "urxvtc -name htop -e htop" - , "urxvtc -name log -e journalctl -xef" + , (xK_h, [ "alacritty --class htop -e htop" + , "alacritty --class log -e journalctl -xef" ]) , (xK_x, [ "autorandr -c" , "autorandr -fl def" @@ -312,7 +305,7 @@ hostFromName h , (9, "media") , (10, "mpv") ] - scratchpads = [ NS "term" "urxvtc -name scratchpad -title scratchpad -e tmux new-session -AD -s scratch" (resource =? "scratchpad") centerFloat + scratchpads = [ NS "term" "alacritty --class scratchpad --title scratchpad -e tmux new-session -AD -s scratch" (resource =? "scratchpad") centerFloat , NS "pavucontrol" "pavucontrol" (resource =? "pavucontrol") centerFloat , NS "alarms" "alarm-clock-applet" (className =? "Alarm-clock-applet" <&&> title =? "Alarms") centerFloat , NS "blueman" "blueman-manager" (className =? ".blueman-manager-wrapped") centerFloat @@ -480,7 +473,7 @@ main = do setEnv "HOST" hostname let myConfig = withHostUrgency . ewmh $ docks def { manageHook = hManageHook host - , terminal = "urxvtc" + , terminal = "alacritty" , layoutHook = smartBorders . avoidStruts $ windowNavigation layout' , logHook = do dynamicLogString xmobarPP' >>= writeProps @@ -768,7 +761,7 @@ myKeys' conf host = Map.fromList $ -- launch dmenu --, ((modm, xK_d ), spawn "exe=`dmenu_path | dmenu` && eval \"exec $exe\"") , ((modm, xK_d ), shellPrompt "Run: " xPConfig) - , ((modm .|. shiftMask, xK_d ), prompt "Run in Terminal: " ("urxvtc" ++ " -e") xPConfig) + , ((modm .|. shiftMask, xK_d ), prompt "Run in Terminal: " ("alacritty" ++ " -e") xPConfig) , ((modm, xK_at ), sshPrompt (sshOverrides . Just $ hName host) xPConfig) -- 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 set-option -g terminal-overrides 'rxvt-uni*:XT:Ms=\E]52;%p1%s;%p2%s\007' ## determine if we should enable 256-colour support -if "[[ ''${TERM} =~ 256color || ''${TERM} == fbterm ]]" 'set -g default-terminal tmux-256color' +if "[[ ''${TERM} =~ 256color || ''${TERM} == fbterm || ''${TERM} =~ alacritty ]]" 'set -g default-terminal tmux-256color' set-option -g status-right "" -- cgit v1.2.3