Merge branch 'master' of gitlab.com:schrottkatze/nix-configs

haskell/xmonad/xmonad.hs

@@ -20,6 +20,8 @@ import qualified Data.Map        as M
 import XMonad.Layout.Spacing
 import XMonad.Layout.Tabbed
 
+import XMonad.Actions.KeyRemap
+
 import XMonad.Prompt
 import XMonad.Prompt.Layout
 import Graphics.X11.ExtraTypes.XF86
@@ -66,10 +68,27 @@ myWorkspaces    = ["comms","browser","3","4","5","6","7","8","9"]
 myNormalBorderColor  = "#3c3836"
 myFocusedBorderColor = "#504945"
 
+myRemaps = KeymapTable [ ((0, xK_a), (0, xK_b)) ]
+
 ------------------------------------------------------------------------
 -- Key bindings. Add, modify or remove key bindings here.
 --
 myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $
+  [ ((modm, xK_Return), spawn $ XMonad.terminal conf)
+  , ((modm .|. shiftMask, xK_q), kill)
+  -- Rotate through the available layout algorithms
+  , ((modm,               xK_space ), sendMessage NextLayout)
+  -- rofiing
+  , ((modm, xK_d), spawn "rofi -show drun")
+  , ((modm .|. shiftMask, xK_e), spawn "rofi -show \"desktopctl\" -modes \"desktopctl:$(which desktopctl)\"")
+  , ((modm, xK_m), spawn "menu-qalc")
+  , ((modm, xK_i), spawn "rofimoji -f alchemical_symbols anatolian_hieroglyphs emojis braille_patterns box_drawing chess_symbols emoticons geometric_shapes gothic greek_extended math mathematical_alphanumeric_symbols mathematical_operators miscellaneous_symbols miscellaneous_mathematical_symbols-a miscellaneous_mathematical_symbols-b miscellaneous_symbols_and_arrows miscellaneous_symbols_and_pictographs miscellaneous_technical modi modifier_tone_letters musical_symbols nerd_font number_forms shorthand_format_controls specials variation_selectors vertical_forms -a copy")
+  -- screenshotting
+  -- TODO: Fix/rewrite window-screenshot.sh
+  , ((modm, xK_w), spawn "window-screenshot.sh")
+  , ((modm, xK_s), spawn "flameshot gui -c -p $HOME/Pictures/screenshots")
+  , ((modm, xK_a), spawn "flameshot screen -c -p $HOME/Pictures/screenshots")
+  , ((modm, xK_t), spawn "ocr-screenshot.sh")
 
   [ ((modm, xK_Return), spawn $ XMonad.terminal conf)
   , ((modm .|. shiftMask, xK_q), kill)
@@ -168,7 +187,6 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) = M.fromList $
 -- Mouse bindings: default actions bound to mouse events
 --
 myMouseBindings (XConfig {XMonad.modMask = modm}) = M.fromList $
-
   -- mod-button1, Set the window to floating mode and move by dragging
   [ ((modm, button1), (\w -> focus w >> mouseMoveWindow w
                                      >> windows W.shiftMaster))
@@ -278,6 +296,7 @@ myStartupHook = do
   spawn "pkill volumeicon; volumeicon"
   spawn "pkill nm-applet; nm-applet"
   spawn "mullvad-vpn --background"
+  setDefaultKeyRemap myRemaps [myRemaps]
 
 
 
@@ -316,4 +335,3 @@ defaults = def
 	, logHook            = myLogHook
 	, startupHook        = myStartupHook
   }
-

hosts/monosodium-glutamate-g/configuration.nix

@@ -57,7 +57,7 @@
     # latest linux kernel
     #boot.kernelPackages = pkgs.linuxPackages_latest;
     #boot.kernelPackages = pkgs.linux_zen_xeniafied;
-    boot.kernelPackages = pkgs.linuxPackages_zen;
+    kernelPackages = pkgs.linuxPackages_zen;
     # boot.kernelPatches = [ 
     #   {
     #     name = "fomx";