ellmau/nixos
1
0
Fork 0
mirror of https://github.com/ellmau/nixos.git synced 2025-12-20 09:39:39 +01:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: ellmau:c786e21bbe7f22850183c8e8df3dd4c9bd223a8c
Branches Tags
ellmau:main
ellmau:fix/zsh
ellmau:flake/packages
ellmau:release-23.05
ellmau:xmonad
ellmau:dap-mode
ellmau:service/gitea
ellmau:swayfy
ellmau:redesign/flake
..
compare: ellmau:80bf4d1071be34b36ac6a2f573184e76c8ceb5da
Branches Tags
ellmau:main
ellmau:fix/zsh
ellmau:flake/packages
ellmau:release-23.05
ellmau:xmonad
ellmau:dap-mode
ellmau:service/gitea
ellmau:swayfy
ellmau:redesign/flake

No commits in common. "c786e21bbe7f22850183c8e8df3dd4c9bd223a8c" and "80bf4d1071be34b36ac6a2f573184e76c8ceb5da" have entirely different histories.
c786e21bbe ... 80bf4d1071

2 changed files with 17 additions and 31 deletions
Show Stats Expand all files Collapse all files

30
flake.lock generated
View File

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

18
users/ellmau/conf/xmonad/xmonad.hs
View File

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