diff options
| -rw-r--r-- | lib/cfg.def.h | 6 | ||||
| -rw-r--r-- | lib/xmonad.hs | 13 | ||||
| -rw-r--r-- | machines/helium.nix | 5 |
3 files changed, 13 insertions, 11 deletions
diff --git a/lib/cfg.def.h b/lib/cfg.def.h index 57709fc..c6b72b5 100644 --- a/lib/cfg.def.h +++ b/lib/cfg.def.h @@ -51,13 +51,12 @@ static struct command mumble[] = { }; static struct command apps[] = { - DEFCMD ("c", "chromium" , "chromium") DEFCMD ("d", "dolphin" , "dolphin") DEFCMD ("f", "firefox" , "firefox") - DEFCMD ("h", "xterm htop" , "xterm htop") + DEFCMD ("h", "htop" , "urxvt htop") // DEFCMD ("k", "keybase" , "keybase-gui") DEFPREFIX ("m", "mumble" , mumble) - DEFCMD ("r", "ranger" , "xterm ranger") + DEFCMD ("r", "ranger" , "urxvt ranger") DEFCMD ("t", "telegram" , "telegram-desktop") DEFCMD ("q", "qutebrowser", "qutebrowser") }; @@ -78,6 +77,7 @@ static struct command system_commands[] = { // DEFPREFIX("c", "copy/sync", sync_commands) DEFCMD("R", "reboot", "reboot") DEFCMD("S", "suspend", "systemctl suspend") + DEFCMD("L", "logout", "/home/ben/bin/logout") DEFCMD("h", "h-m switch", "home-manager switch") DEFCMD("w", "fresh wall", "wal") DEFCMD("x", "restart xbindkeys", "pkill xbindkeys && xbindkeys") diff --git a/lib/xmonad.hs b/lib/xmonad.hs index 75dd652..047dd83 100644 --- a/lib/xmonad.hs +++ b/lib/xmonad.hs @@ -23,6 +23,7 @@ import Graphics.X11.ExtraTypes.XF86 import XMonad import XMonad.Actions.CopyWindow import XMonad.Config +import XMonad.Config.Desktop import XMonad.Hooks.EwmhDesktops (ewmh) import XMonad.Hooks.ManageDocks import XMonad.Hooks.ManageHelpers (doFullFloat, isFullscreen) @@ -109,7 +110,7 @@ insKeys conf@(XConfig {modMask = modMask}) = ((modMask, xK_o), spawn "rofi -sidebar-mode -show run"), ((modMask, xK_n), spawn "rofi -sidebar-mode -show window"), ((modMask, xK_u), spawn "rofi -show calc -modi calc -no-show-match -no-sort"), - ((modMask, xK_h), scratchpadSpawnActionTerminal transparentTerm), + ((modMask, xK_s), scratchpadSpawnActionTerminal transparentTerm), ((modMask .|. shiftMask, xK_p), namedScratchpadAction scratchpads "pavucontrol"), -- ((modMask, xK_h), spawn transparentTerm), -- refresh display via autorandr @@ -146,9 +147,9 @@ addSpace :: l a -> ModifiedLayout Spacing l a addSpace = spacingRaw False - (Border 15 15 15 15) + (Border 5 5 5 5) True - (Border 15 15 15 15) + (Border 5 5 5 5) True myTabCfg theme = @@ -166,8 +167,8 @@ myLayout theme = ||| (addSpace $ noBorders Full) ||| twopane ||| Mirror twopane - -- ||| ThreeCol 1 (3 / 100) (1 / 2) - -- ||| ThreeColMid 1 (3 / 100) (1 / 2) + ||| ThreeCol 1 (3 / 100) (1 / 2) + ||| ThreeColMid 1 (3 / 100) (1 / 2) ||| tiled ||| Mirror tiled ||| emptyBSP @@ -191,7 +192,7 @@ myLayout theme = myConf theme = additionalKeys cfg (insKeys cfg) where cfg = - def + desktopConfig { modMask = mod4Mask, -- super instead of alt normalBorderColor = background theme, focusedBorderColor = highlight theme, diff --git a/machines/helium.nix b/machines/helium.nix index 75ff74e..3c290ce 100644 --- a/machines/helium.nix +++ b/machines/helium.nix @@ -112,11 +112,12 @@ in { ''; xserver.libinput.mouse.buttonMapping = "1 2 8 4 5 6 7 3 9"; xserver.xkbOptions = "caps:ctrl_modifier"; - xserver.dpi = 166; + xserver.dpi = 156; xserver.displayManager.sddm.enable = true; xserver.windowManager.xmonad.enable = true; - xserver.desktopManager.xterm.enable = true; + xserver.desktopManager.plasma5.enable = true; + xserver.desktopManager.wallpaper.mode = "fill"; xserver.xautolock.enable = false; xserver.xautolock.locker = "${pkgs.xlockmore}/bin/xlock -mode matrix"; |