summaryrefslogtreecommitdiffstats
path: root/lass/2configs
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2022-11-29 19:54:28 +0100
committertv <tv@krebsco.de>2022-11-29 19:54:28 +0100
commit43428ccca56bdf10572f1c93ebafa82cfdf7dbf5 (patch)
treeb6c79e4f047ccb8842c9e5f7b73688ccbc5ff053 /lass/2configs
parent5c05e2a9b68b01e1f0f69a1e4414bce21a801f1f (diff)
parent32b23666d15861f6f4d8b1f522ee53d4f21fabb6 (diff)
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'lass/2configs')
-rw-r--r--lass/2configs/baseX.nix4
-rw-r--r--lass/2configs/xmonad.nix3
2 files changed, 3 insertions, 4 deletions
diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix
index 9b2b58f22..efd6c8a24 100644
--- a/lass/2configs/baseX.nix
+++ b/lass/2configs/baseX.nix
@@ -79,9 +79,7 @@ in {
powertop
rxvt-unicode
sshvnc
- (pkgs.writers.writeDashBin "sxiv" ''
- ${pkgs.nsxiv}/bin/nsxiv "$@"
- '')
+ sxiv
nsxiv
taskwarrior
termite
diff --git a/lass/2configs/xmonad.nix b/lass/2configs/xmonad.nix
index fd70f8b15..05d719b8f 100644
--- a/lass/2configs/xmonad.nix
+++ b/lass/2configs/xmonad.nix
@@ -45,6 +45,7 @@ import XMonad.Layout.Minimize (minimize)
import XMonad.Layout.NoBorders (smartBorders)
import XMonad.Layout.MouseResizableTile (mouseResizableTile)
import XMonad.Layout.SimplestFloat (simplestFloat)
+import XMonad.Layout.StateFull
import XMonad.ManageHook (composeAll)
import XMonad.Prompt (autoComplete, font, searchPredicate, XPConfig)
import XMonad.Prompt.Window (windowPromptGoto, windowPromptBringCopy)
@@ -87,7 +88,7 @@ main = do
myLayoutHook = defLayout
where
- defLayout = minimize . boringWindows $ ((avoidStruts $ Mirror (Tall 1 (3/100) (1/2))) ||| Full ||| FixedColumn 2 80 80 1 ||| Tall 1 (3/100) (1/2) ||| simplestFloat ||| mouseResizableTile ||| Grid)
+ defLayout = minimize . boringWindows $ ((avoidStruts $ Mirror (Tall 1 (3/100) (1/2))) ||| StateFull ||| FixedColumn 2 80 80 1 ||| Tall 1 (3/100) (1/2) ||| simplestFloat ||| mouseResizableTile ||| Grid)
floatHooks = composeAll
[ className =? "Pinentry" --> doCenterFloat