home/natto: update xmonad config

Signed-off-by: Amneesh Singh <natto@weirdnatto.in>
This commit is contained in:
2022-10-14 09:58:28 +05:30
parent 994a22a6da
commit 6faf1756d3
4 changed files with 96 additions and 118 deletions

144
flake.lock generated
View File

@@ -22,11 +22,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1656843353,
"narHash": "sha256-tIbbKYUh84tV1CL0+gOna6CFRPpaYgorcVnMureqU2g=",
"lastModified": 1663268366,
"narHash": "sha256-nQL25OVRJNxT5xdNjuz0W0HCZ4abd9gn96nJEYq1Fl8=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "dc48cd35bdf435d31e4ee6f488ba868b1a07bac5",
"rev": "19952866828a8d8a08e0e264ad1842e585eadc23",
"type": "github"
},
"original": {
@@ -53,11 +53,11 @@
},
"flake-utils": {
"locked": {
"lastModified": 1656065134,
"narHash": "sha256-oc6E6ByIw3oJaIyc67maaFcnjYOz1mMcOtHxbEf9NwQ=",
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "bee6a7250dd1b01844a2de7e02e4df7d8a0a206c",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
"type": "github"
},
"original": {
@@ -68,11 +68,11 @@
},
"flake-utils_2": {
"locked": {
"lastModified": 1644229661,
"narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
"type": "github"
},
"original": {
@@ -83,11 +83,11 @@
},
"flake-utils_3": {
"locked": {
"lastModified": 1656065134,
"narHash": "sha256-oc6E6ByIw3oJaIyc67maaFcnjYOz1mMcOtHxbEf9NwQ=",
"lastModified": 1656928814,
"narHash": "sha256-RIFfgBuKz6Hp89yRr7+NR5tzIAbn52h8vT6vXkYjZoM=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "bee6a7250dd1b01844a2de7e02e4df7d8a0a206c",
"rev": "7e2a3b3dfd9af950a856d66b0a7d01e3c18aa249",
"type": "github"
},
"original": {
@@ -102,11 +102,11 @@
"utils": "utils"
},
"locked": {
"lastModified": 1656367977,
"narHash": "sha256-0hV17V9Up9pnAtPJ+787FhrsPnawxoTPA/VxgjRMrjc=",
"lastModified": 1663227421,
"narHash": "sha256-8M2ZQPLQw0CUylKbF8pgDMQ5vxOH4i0rxwUhtPIsf7Q=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "3bf16c0fd141c28312be52945d1543f9ce557bb1",
"rev": "5408e27961599b1350b651f88715daf6e67244a7",
"type": "github"
},
"original": {
@@ -142,11 +142,11 @@
"utils": "utils_2"
},
"locked": {
"lastModified": 1655930346,
"narHash": "sha256-ht56HHOzEhjeIgAv5ZNFjSVX/in1YlUs0HG9c1EUXTM=",
"lastModified": 1658267644,
"narHash": "sha256-NJRe1rnlF112eZwxNASlRL8/ghwD8g+lpHIYRkWQxC8=",
"owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver",
"rev": "f535d8123c4761b2ed8138f3d202ea710a334a1d",
"rev": "004c229ca44c069d93c92abf67ff1619fb508c6a",
"type": "gitlab"
},
"original": {
@@ -157,11 +157,11 @@
},
"master": {
"locked": {
"lastModified": 1656835607,
"narHash": "sha256-zONMAG6JSfGyW20AsVWGnlZwNWws6Q/7IT0oDNGc1xY=",
"lastModified": 1663270227,
"narHash": "sha256-HWnPdlG+48f5Vgmco2Iij/20AjQuKjaNUJhh/VgbV5Q=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "18b14a254dca6b68ca0ce2ce885ce2b550065799",
"rev": "c2e7745b08a303b468fcaced4bf0774900aba9bc",
"type": "github"
},
"original": {
@@ -177,11 +177,11 @@
"utils": "utils_3"
},
"locked": {
"lastModified": 1656085955,
"narHash": "sha256-Q/W/O2cevofDNzn2ly1r6mfl39VnSrYxocKLr+JxQ3s=",
"lastModified": 1662138272,
"narHash": "sha256-qklVL7qFzyiIIm00AKRLE+uCYppTQ/S5C6exg0j2fSY=",
"owner": "nbfc-linux",
"repo": "nbfc-linux",
"rev": "d104ac58278d9fa23404bd614c67d8c9f38414cb",
"rev": "c6abef1b9f4ec4bb8a2eb4d7e70c1fccbb320677",
"type": "github"
},
"original": {
@@ -200,11 +200,11 @@
},
"locked": {
"dir": "contrib",
"lastModified": 1656801796,
"narHash": "sha256-hPc0lYOADYHnrwIE+xqUqDpvCPHF5IpOLtfI69Fwels=",
"lastModified": 1663212973,
"narHash": "sha256-d0dhVnwoWZEsEdtRIZiiadOcCNcddkdk4QHKg2Vnt9E=",
"owner": "neovim",
"repo": "neovim",
"rev": "e837f29ce6c7784340ae2cd866aa239462d3920c",
"rev": "89b9eab638d5e6467156c25f0d54df48d861ca16",
"type": "github"
},
"original": {
@@ -219,11 +219,11 @@
"nixpkgs": "nixpkgs_6"
},
"locked": {
"lastModified": 1656538843,
"narHash": "sha256-LOz946WwnE1no0J4RZeXxhb9w/9ndo4KAJPw8YA8Izk=",
"lastModified": 1662742160,
"narHash": "sha256-zamqdHF0Pp0AkgfDnZdLnAZTfgrTV11dYO9rDsfqfW8=",
"owner": "fufexan",
"repo": "nix-gaming",
"rev": "76923470f96d5ca3e3899dc733bc6168fefafee0",
"rev": "a37f98a7a81d5ffac328fac06c3f6ad17f90c7d7",
"type": "github"
},
"original": {
@@ -234,11 +234,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1655481042,
"narHash": "sha256-XHbcywq2vIQ5CeH1OK3TN793jkiNAAZsSctS1PFgseo=",
"lastModified": 1663235518,
"narHash": "sha256-q8zLK6rK/CLXEguaPgm9yQJcY0VQtOBhAT9EV2UFK/A=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "103a4c0ae46afa9cf008c30744175315ca38e9f9",
"rev": "2277e4c9010b0f27585eb0bed0a86d7cbc079354",
"type": "github"
},
"original": {
@@ -263,11 +263,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1654230545,
"narHash": "sha256-8Vlwf0x8ow6pPOK2a04bT+pxIeRnM1+O0Xv9/CuDzRs=",
"lastModified": 1662996720,
"narHash": "sha256-XvLQ3SuXnDMJMpM1sv1ifPjBuRytiDYhB12H/BNTjgY=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "236cc2971ac72acd90f0ae3a797f9f83098b17ec",
"rev": "5f326e2a403e1cebaec378e72ceaf5725983376d",
"type": "github"
},
"original": {
@@ -279,11 +279,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1655481042,
"narHash": "sha256-XHbcywq2vIQ5CeH1OK3TN793jkiNAAZsSctS1PFgseo=",
"lastModified": 1663235518,
"narHash": "sha256-q8zLK6rK/CLXEguaPgm9yQJcY0VQtOBhAT9EV2UFK/A=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "103a4c0ae46afa9cf008c30744175315ca38e9f9",
"rev": "2277e4c9010b0f27585eb0bed0a86d7cbc079354",
"type": "github"
},
"original": {
@@ -339,11 +339,11 @@
},
"nixpkgs_7": {
"locked": {
"lastModified": 1656755932,
"narHash": "sha256-TGThfOxr+HjFK464+UoUE6rClp2cwxjiKvHcBVdIGSQ=",
"lastModified": 1663235518,
"narHash": "sha256-q8zLK6rK/CLXEguaPgm9yQJcY0VQtOBhAT9EV2UFK/A=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "660ac43ff9ab1f12e28bfb31d4719795777fe152",
"rev": "2277e4c9010b0f27585eb0bed0a86d7cbc079354",
"type": "github"
},
"original": {
@@ -355,11 +355,11 @@
},
"nixpkgs_8": {
"locked": {
"lastModified": 1656753965,
"narHash": "sha256-BCrB3l0qpJokOnIVc3g2lHiGhnjUi0MoXiw6t1o8H1E=",
"lastModified": 1663087123,
"narHash": "sha256-cNIRkF/J4mRxDtNYw+9/fBNq/NOA2nCuPOa3EdIyeDs=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "0ea7a8f1b939d74e5df8af9a8f7342097cdf69eb",
"rev": "9608ace7009ce5bc3aeb940095e01553e635cbc7",
"type": "github"
},
"original": {
@@ -371,11 +371,11 @@
},
"nixpkgs_9": {
"locked": {
"lastModified": 1656401090,
"narHash": "sha256-bUS2nfQsvTQW2z8SK7oEFSElbmoBahOPtbXPm0AL3I4=",
"lastModified": 1659102345,
"narHash": "sha256-Vbzlz254EMZvn28BhpN8JOi5EuKqnHZ3ujFYgFcSGvk=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "16de63fcc54e88b9a106a603038dd5dd2feb21eb",
"rev": "11b60e4f80d87794a2a4a8a256391b37c59a1ea7",
"type": "github"
},
"original": {
@@ -387,11 +387,11 @@
},
"nur": {
"locked": {
"lastModified": 1656835264,
"narHash": "sha256-sCHGbrrxvJ6US7JJLRhFtH7ai7gOorw8Qq1P8R+AJnU=",
"lastModified": 1663266400,
"narHash": "sha256-6A/5qljK1pauDxSrHS8IR8ZS0raFB4UFwL7e+TjM3qU=",
"owner": "nix-community",
"repo": "NUR",
"rev": "3574ef870a60a93ee4e2aebec4039572fb36361d",
"rev": "e77ed0cd9190592525937030c68fa487ce79e0e0",
"type": "github"
},
"original": {
@@ -407,11 +407,11 @@
"nixpkgs": "nixpkgs_8"
},
"locked": {
"lastModified": 1656836079,
"narHash": "sha256-iFtDARirUZeDd6qEN9Kgrn1L0P4daQ4tCvnFaDRgfa8=",
"lastModified": 1663230013,
"narHash": "sha256-te3ZzGAWGoWhbUmk8KTO+Tidn5nShRVcStpDAV167Fg=",
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
"rev": "8adbfbd9d4802aa1358b0094c0e0f3bb56fb2fce",
"rev": "a11980308a32ec895bdc8a2ea3d6ed022d7a615d",
"type": "github"
},
"original": {
@@ -422,11 +422,11 @@
},
"old": {
"locked": {
"lastModified": 1656608236,
"narHash": "sha256-ZRsimvpsuj5FI0R7uuTVq7vV/C3zKn4Kcfm6roOaNjA=",
"lastModified": 1659446231,
"narHash": "sha256-hekabNdTdgR/iLsgce5TGWmfIDZ86qjPhxDg/8TlzhE=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "399c514226ac48d7855838d0777f47f2fa59730a",
"rev": "eabc38219184cc3e04a974fe31857d8e0eac098d",
"type": "github"
},
"original": {
@@ -461,11 +461,11 @@
"nixpkgs": "nixpkgs_9"
},
"locked": {
"lastModified": 1656816597,
"narHash": "sha256-Y3f7wOZIvgr5IGW0u3d8stemjQPPRs4n93DjKJbrvXs=",
"lastModified": 1663210994,
"narHash": "sha256-CvuR+v3FClg/En4LDdLOhLQApAZ9xZZaxeDadfwIBkw=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "bbba5e73a21c8c67d5fe1d4d8b3fde60ab6946cd",
"rev": "f34d44aef4ca7c11e66ed30ef46a93058a578c0f",
"type": "github"
},
"original": {
@@ -476,11 +476,11 @@
},
"stable": {
"locked": {
"lastModified": 1656679828,
"narHash": "sha256-akGA97pR1BAQew1FrVTCME3p8qvYxJXB2X3a13aBphs=",
"lastModified": 1663067291,
"narHash": "sha256-1BTrqhLMamWf53sJobtMiUDI91PEw6xF8YEwg2VE8w4=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "915f5a5b3cc4f8ba206afd0b70e52ba4c6a2796b",
"rev": "d86a4619b7e80bddb6c01bc01a954f368c56d1df",
"type": "github"
},
"original": {
@@ -492,11 +492,11 @@
},
"stable-small": {
"locked": {
"lastModified": 1656753894,
"narHash": "sha256-N1urCClfrU5/f3Z/j23HEPxqYMJmhTP7RqNzmevMbCU=",
"lastModified": 1663209136,
"narHash": "sha256-camNbaOhv/AD6vDr51H9xNjA7ytPvo8uKVlH5Bc+ZWQ=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "f04e77d4904b8c7bf19294061c0ebb1e2b11771b",
"rev": "01ec6cc8e9064f51f538428fdb7311bcc44927ea",
"type": "github"
},
"original": {
@@ -508,11 +508,11 @@
},
"utils": {
"locked": {
"lastModified": 1653893745,
"narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
"type": "github"
},
"original": {
@@ -553,11 +553,11 @@
},
"utils_4": {
"locked": {
"lastModified": 1656065134,
"narHash": "sha256-oc6E6ByIw3oJaIyc67maaFcnjYOz1mMcOtHxbEf9NwQ=",
"lastModified": 1659877975,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "bee6a7250dd1b01844a2de7e02e4df7d8a0a206c",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
"type": "github"
},
"original": {

View File

@@ -26,6 +26,7 @@
mkPkgs = channel: system: import channel {
inherit system;
config.allowUnfree = true;
config.allowBroken = true;
};
channels = final: prev: {
stable = mkPkgs stable prev.system;
@@ -45,7 +46,7 @@
overlays = overlays ++ [
inputs.nur.overlay
inputs.nvim.overlay
inputs.rust.overlay
inputs.rust.overlays.default
inputs.emacs.overlay
channels
(_: _: {

View File

@@ -33,7 +33,7 @@ config =
[ Run $ MultiCpu ["-t", "<fn=1>\xf2db</fn> <total>%", "-L", "20", "-H", "80", "-h", magenta, "-l", green, "-n", yellow] 10,
Run $ Memory ["-t", "<fn=1>\xf538</fn> <usedratio>%", "-H", "10240", "-L", "6144", "-h", magenta, "-l", green, "-n", yellow] 20,
Run $ BatteryP ["BAT1", "BAT0", "BAT2"] ["-t", "<acstatus>", "-L", "10", "-H", "80", "-l", magenta, "-h", green, "-n", yellow, "--", "-O", "Charging", "-o", "<left>%", "-a", "notify-send -u critical 'Battery running out!'", "-A", "5", "--lows", "<fn=1>\xf243</fn> ", "--mediums", "<fn=1>\xf242</fn> ", "--highs", "<fn=1>\xf240</fn> "] 300,
Run $ Network "wlp0s20f3" ["-t", "<fn=1>\xf1eb</fn> <fc=" ++ magenta ++ "><rx>/<tx></fc>"] 10,
Run $ DynNetwork ["-t", "<fn=1>\xf1eb</fn> <fc=" ++ magenta ++ "><rx>/<tx></fc>"] 10,
Run $ Date "<fn=1>\xf073</fn> %-d/%-m/%-y/%w" "date" 10000,
Run $ Date "%H:%M:%S" "time" 10,
Run $ MPD ["-t", "<statei><title><fn=" ++ magenta ++ "> \xf001</fn>", "--", "-P", ">> ", "-Z", "|| ", "-S", "Stopped", "-h", "127.0.0.1", "-p", "6600"] 10,
@@ -43,7 +43,7 @@ config =
],
sepChar = "*",
alignSep = "--",
template = "<action=`dmenu_run` button=1><icon=/home/natto/.xmonad/lib/nixos.xpm/></action> *UnsafeStdinReader* " ++ sep ++ " <fn=1></fn>*mpd* -- *multicpu* " ++ sep ++ " *memory* " ++ sep ++ " *wlp0s20f3* " ++ sep ++ " *battery* " ++ sep ++ " <fn=1>\xf028</fn> <fc=" ++ green ++ ">*pamixer*%</fc> " ++ sep ++ " *date* - *time* " ++ sep ++ "*tray*"
template = "<action=`dmenu_run` button=1><icon=/home/natto/.xmonad/lib/nixos.xpm/></action> *UnsafeStdinReader* " ++ sep ++ " <fn=1></fn>*mpd* -- *multicpu* " ++ sep ++ " *memory* " ++ sep ++ " *dynnetwork* " ++ sep ++ " *battery* " ++ sep ++ " <fn=1>\xf028</fn> <fc=" ++ green ++ ">*pamixer*%</fc> " ++ sep ++ " *date* - *time* " ++ sep ++ "*tray*"
}
main :: IO ()

View File

@@ -56,7 +56,7 @@ myKeys conf@(XConfig {XMonad.modMask = modMask}) = M.fromList $
, ((modMask, xK_d),
spawn "dmenu_run -l 20")
, ((shiftMask, xK_Print),
spawn "flameshot gui")
@@ -69,32 +69,40 @@ myKeys conf@(XConfig {XMonad.modMask = modMask}) = M.fromList $
, ((modMask, xK_p),
spawn "mpc toggle")
, ((modMask, xK_h),
, ((0, xF86XK_AudioPlay),
spawn "mpc toggle")
, ((modMask, xF86XK_AudioNext),
spawn "mpc next")
, ((modMask, xK_k),
, ((modMask, xF86XK_AudioPrev),
spawn "mpc prev")
, ((modMask .|. shiftMask, xK_a),
, ((0, xF86XK_AudioPrev),
spawn "mpc seek -00:00:05")
, ((modMask .|. shiftMask, xK_s),
, ((0, xF86XK_AudioNext),
spawn "mpc seek +00:00:05")
, ((modMask .|. shiftMask, xK_period),
spawn "pamixer --allow-boost -i 5")
, ((0, xF86XK_AudioRaiseVolume),
spawn "pamixer --allow-boost -ui 5")
, ((modMask .|. shiftMask, xK_comma),
spawn "pamixer --allow-boost -d 5")
, ((0, xF86XK_AudioLowerVolume),
spawn "pamixer --allow-boost -ud 5")
, ((0, xF86XK_AudioMute),
spawn "pamixer -t")
, ((modMask .|. shiftMask, xK_q), kill)
, ((mod1Mask, xK_Tab),
cycleRecentWindows [xK_Alt_L] xK_Tab xK_q)
, ((modMask .|. mod1Mask, xK_0), spawn "light -A 5")
, ((0, xF86XK_MonBrightnessUp),
spawn "light -A 5")
, ((modMask .|. mod1Mask, xK_9), spawn "light -U 5")
, ((0, xF86XK_MonBrightnessDown),
spawn "light -U 5")
, ((modMask .|. shiftMask, xK_F1),
spawn "setxkbmap us-colemak")
@@ -200,39 +208,8 @@ toggleFullscreen =
windows $ if isFullFloat then W.sink w else W.float w fullRect
--}}}
--{{{
--couldnt get fullScreenEventHook to work normally so using this for now
--source code: https://github.com/xmonad/xmonad-contrib/blob/v0.16/XMonad/Hooks/EwmhDesktops.hs
fullscreenFix :: XConfig a -> XConfig a
fullscreenFix c = c {
startupHook = startupHook c +++ setSupportedWithFullscreen
}
where x +++ y = mappend x y
setSupportedWithFullscreen :: X ()
setSupportedWithFullscreen = withDisplay $ \dpy -> do
r <- asks theRoot
a <- getAtom "_NET_SUPPORTED"
c <- getAtom "ATOM"
supp <- mapM getAtom ["_NET_WM_STATE_HIDDEN"
,"_NET_WM_STATE_FULLSCREEN"
,"_NET_NUMBER_OF_DESKTOPS"
,"_NET_CLIENT_LIST"
,"_NET_CLIENT_LIST_STACKING"
,"_NET_CURRENT_DESKTOP"
,"_NET_DESKTOP_NAMES"
,"_NET_ACTIVE_WINDOW"
,"_NET_WM_DESKTOP"
,"_NET_WM_STRUT"
]
io $ changeProperty32 dpy r a c propModeReplace (fmap fromIntegral supp)
setWMName "xmonad"
--}}}
main = do xmproc <- spawnPipe ("xmobar " ++ myXmobarrc)
xmonad $ docks $ fullscreenFix $ ewmh def
xmonad $ docks $ ewmh def
{ borderWidth = myBorderWidth
, manageHook = manageDocks <+> myManageHook
, handleEventHook = handleEventHook def <+> fullscreenEventHook