1
0
mirror of https://github.com/ellmau/nixos.git synced 2025-12-20 09:39:39 +01:00

Compare commits

..

4 Commits

Author SHA1 Message Date
c786e21bbe
Add named scratchpad 2023-05-30 10:49:51 +02:00
82a322e8f0
Fix kill binding 2023-05-30 10:11:40 +02:00
661ce347a4
Update key-bindings to kill a window 2023-05-30 10:09:06 +02:00
c75f955ab6
flake.lock: Update
Flake lock file updates:

• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/3dedbf675c93de8941778a12676cc8fd39c27d3f' (2023-05-25)
  → 'github:nix-community/emacs-overlay/04f25058fbe3ae1aadd435aba49b66493e939f83' (2023-05-30)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/99fe1b870522d6ee3e692c2b6e663d6868a3fde4' (2023-05-24)
  → 'github:NixOS/nixpkgs/c8a17ce7abc03c50cd072e9e6c9b389c5f61836b' (2023-05-28)
• Updated input 'nixpkgs-unstable':
    'github:NixOS/nixpkgs/f91ee3065de91a3531329a674a45ddcb3467a650' (2023-05-24)
  → 'github:NixOS/nixpkgs/5e871d8aa6f57cc8e0dc087d1c5013f6e212b4ce' (2023-05-29)
• Updated input 'sops-nix':
    'github:Mic92/sops-nix/4ccdfb573f323a108a44c13bb7730e42baf962a9' (2023-05-21)
  → 'github:Mic92/sops-nix/3e016341d4dca6ce7c62316f90e66341841a30f9' (2023-05-28)
• Updated input 'sops-nix/nixpkgs-stable':
    'github:NixOS/nixpkgs/d0dade110dc7072d67ce27826cfe9ab2ab0cf247' (2023-05-21)
  → 'github:NixOS/nixpkgs/ba6e4ddeb3e8ad3f3e3bec63dafbc9fe558729bb' (2023-05-27)
2023-05-30 09:28:53 +02:00
2 changed files with 31 additions and 17 deletions

30
flake.lock generated
View File

@ -71,11 +71,11 @@
]
},
"locked": {
"lastModified": 1684986439,
"narHash": "sha256-ZTBRHdNjvhBYjL/MKsmFKzLyrfJU0j/3funrnaCF6+Q=",
"lastModified": 1685412232,
"narHash": "sha256-Oifn6uAP+IS0jEGs50tlRBCIwtUVIN4f+8RdlxbvK88=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "3dedbf675c93de8941778a12676cc8fd39c27d3f",
"rev": "04f25058fbe3ae1aadd435aba49b66493e939f83",
"type": "github"
},
"original": {
@ -292,11 +292,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1684632198,
"narHash": "sha256-SdxMPd0WmU9MnDBuuy7ouR++GftrThmSGL7PCQj/uVI=",
"lastModified": 1685215858,
"narHash": "sha256-IRMFoDXA6cYx3ifVw3B2JcC4JrjT5v7tRAx2vro2Ffs=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d0dade110dc7072d67ce27826cfe9ab2ab0cf247",
"rev": "ba6e4ddeb3e8ad3f3e3bec63dafbc9fe558729bb",
"type": "github"
},
"original": {
@ -308,11 +308,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1684935479,
"narHash": "sha256-6QMMsXMr2nhmOPHdti2j3KRHt+bai2zw+LJfdCl97Mk=",
"lastModified": 1685383865,
"narHash": "sha256-3uQytfnotO6QJv3r04ajSXbEFMII0dUtw0uqYlZ4dbk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "f91ee3065de91a3531329a674a45ddcb3467a650",
"rev": "5e871d8aa6f57cc8e0dc087d1c5013f6e212b4ce",
"type": "github"
},
"original": {
@ -324,11 +324,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1684936879,
"narHash": "sha256-BOSq/QiX7MDs8tUnAt4+nYTJctgYkzVSNL95qlfMYeM=",
"lastModified": 1685314633,
"narHash": "sha256-8LXBPqTQXl5ofkjpJ18JcbmLJ/lWDoMxtUwiDYv0wro=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "99fe1b870522d6ee3e692c2b6e663d6868a3fde4",
"rev": "c8a17ce7abc03c50cd072e9e6c9b389c5f61836b",
"type": "github"
},
"original": {
@ -384,11 +384,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1684637723,
"narHash": "sha256-0vAxL7MVMhGbTkAyvzLvleELHjVsaS43p+PR1h9gzNQ=",
"lastModified": 1685242617,
"narHash": "sha256-UBPXGfGwGMJm2Wj9kDj8+TMMK2PTouSM/TpiXYtaqtQ=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "4ccdfb573f323a108a44c13bb7730e42baf962a9",
"rev": "3e016341d4dca6ce7c62316f90e66341841a30f9",
"type": "github"
},
"original": {

View File

@ -31,6 +31,8 @@ import XMonad.Layout.Tabbed
import XMonad.Layout.Renamed
import XMonad.Layout.ThreeColumns
import XMonad.Layout.PerWorkspace
import XMonad.Util.NamedScratchpad
main :: IO ()
main' :: D.Client -> IO ()
@ -51,7 +53,7 @@ main' dbus = do
, layoutHook = layout
, modMask = mod4Mask -- rebind mod to super key
, keys = keyMap
, manageHook = myHookManager
, manageHook = myHookManager <+> namedScratchpadManageHook scratchpads
, startupHook = do -- autostart
startupHook def
spawn "autorandr -c"
@ -81,7 +83,7 @@ keyMap c = mkKeymap c $
[ ("M-<Return>" , spawn $ XMonad.terminal c)
, ("M-d" , spawn "rofi -show drun")
, ("M-<Tab>" , spawn "rofi -show window")
, ("M-S-q" , kill)
, ("M-S-c" , kill)
, ("M-<Space>" , sendMessage NextLayout)
, ("M-S-r" , refresh)
, ("M-j" , windows W.focusUp)
@ -104,6 +106,8 @@ keyMap c = mkKeymap c $
, ("M-t" , withFocused $ windows . W.sink)
, ("M-C-l" , spawn "betterlockscreen -l")
, ("M-S-<Tab>" , spawn keyboardtoggle)
-- scratchPad terminal
, ("M-C-t" , namedScratchpadAction scratchpads "term")
] ++
[(m ++ k, windows $ f w)
| (w, k) <- zip (XMonad.workspaces c) (map show $ [1..9] ++ [0]),
@ -186,3 +190,13 @@ fadeAllBut qry amt inact = do isInactive <- isUnfocused
else return amt
polybarLogHook dbus = fadeHook 0.95 0.75 <+> dynamicLogWithPP (polybarHook dbus)
-- scratchPads
scratchpads :: [NamedScratchpad]
scratchpads =
[ NS
"term"
"alacritty --class AlacrittyNSP -t scratchpad"
(className =? "AlacrittyNSP")
(customFloating $ W.RationalRect (3 / 5) (4 / 6) (1 / 5) (1 / 6))
]