misc changes

xmonad: added new layout+keybinds, removed useless code neovim: minor changes hosts/satori: changed kernel to zen again home/services and home/programs: minor changes overlays: changed picom src and other minor changes
2021-09-12 06:24:49 +05:30
parent 347c8bd00c
commit d49f0b473c
18 changed files with 178 additions and 273 deletions
--- a/home/config/xmonad/xmobar.hs
+++ b/home/config/xmonad/xmobar.hs
@@ -16,13 +16,13 @@ Config {
        Run BatteryP ["BAT1","BAT0","BAT2"] ["-t", "<acstatus>", "-L", "10", "-H", "80", "-l", "#D3869B", "-h", "#8EC07C", "-n", "#EBDBB2", "--", "-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=#fabd2f><rx>/<tx></fc>"] 10,
        Run Date "<fn=1>\xf073 </fn> %a - %b, %_d ║ %H:%M:%S " "date" 100,
-        Run MPD ["-t", "<statei><title>", "--", "-P", ">>: ", "-Z", "||: ", "-S", "Stopped", "-h", "127.0.0.1", "-p", "6600"] 10,
+        Run MPD ["-t", "<statei><title>", "--", "-P", ">> ", "-Z", "|| ", "-S", "Stopped", "-h", "127.0.0.1", "-p", "6600"] 10,
 --       Run Com "playerctl" ["--player", "playerctld", "metadata", "--format", "{{status}}: {{title}}"] "" 10,
        Run Com "pamixer" ["--get-volume"] "" 600,
        Run UnsafeStdinReader
    ],
    sepChar = "*",
    alignSep = "--",
-    template = "<action=`dmenu_run` button=1><icon=/home/natto/.xmonad/lib/nixos.xpm/></action> *UnsafeStdinReader* ║ <fn=1></fn> *mpd* -- *multicpu* ║ *memory* ║ *wlp0s20f3* ║ *battery* ║ <fn=1></fn> <fc=#83a598>*pamixer*%</fc> ║ <fc=#ebdbb2>*date*</fc>"
+    template = "<action=`dmenu_run` button=1><icon=/home/natto/.xmonad/lib/nixos.xpm/></action> *UnsafeStdinReader* | <fn=1></fn> *mpd* -- *multicpu* | *memory* | *wlp0s20f3* | *battery* | <fn=1></fn> <fc=#83a598>*pamixer*%</fc> | <fc=#ebdbb2>*date*</fc>"
 }

--- a/home/config/xmonad/xmonad.hs
+++ b/home/config/xmonad/xmonad.hs
@@ -15,6 +15,7 @@ import XMonad.Util.Run (spawnPipe)
 import XMonad.Actions.FloatKeys (keysMoveWindow,
                                 keysResizeWindow)
 import Graphics.X11.ExtraTypes.XF86
+import XMonad.Actions.CycleWindows
 import qualified XMonad.StackSet as W
 import qualified Data.Map        as M

@@ -74,10 +75,12 @@ myKeys conf@(XConfig {XMonad.modMask = modMask}) = M.fromList $
     spawn "pamixer --allow-boost -i 5")

  , ((modMask .|. shiftMask, xK_comma),
-     spawn "pamixer -d 5")
+     spawn "pamixer --allow-boost -d 5")

-  , ((modMask .|. shiftMask, xK_q),
-     kill)
+  , ((modMask .|. shiftMask, xK_q), kill)
+
+  , ((mod1Mask, xK_Tab), 
+     cycleRecentWindows [xK_Alt_L] xK_Tab xK_q)

  , ((modMask .|. mod1Mask, xK_0), spawn "light -A 5")

@@ -125,28 +128,28 @@ myKeys conf@(XConfig {XMonad.modMask = modMask}) = M.fromList $
     windows W.swapUp    )

  , ((mod1Mask, xK_m),
-     withFocused (keysResizeWindow (-20, 0) (0, 0)))
+     sendMessage Expand)

  , ((mod1Mask, xK_i),
-     withFocused (keysResizeWindow (20, 0) (0, 0)))
+     sendMessage Shrink)

  , ((mod1Mask, xK_n),
-     withFocused (keysResizeWindow (0, 20) (0, 0)))
+     sendMessage MirrorExpand)

  , ((mod1Mask, xK_e),
-     withFocused (keysResizeWindow (0, -20) (0, 0)))
+     sendMessage MirrorShrink)

  , ((mod1Mask .|. shiftMask, xK_m),
-     withFocused (keysMoveWindow (-40, 0)))
+     withFocused (keysMoveWindow (-30, 0)))

  , ((mod1Mask .|. shiftMask, xK_i),
-     withFocused (keysMoveWindow (40, 0)))
+     withFocused (keysMoveWindow (30, 0)))

  , ((mod1Mask .|. shiftMask, xK_n),
-     withFocused (keysMoveWindow (0, 40)))
+     withFocused (keysMoveWindow (0, 30)))

  , ((mod1Mask .|. shiftMask, xK_e),
-     withFocused (keysMoveWindow (0, -40)))
+     withFocused (keysMoveWindow (0, -30)))

  , ((modMask, xK_t),
     withFocused $ windows . W.sink)
@@ -170,6 +173,7 @@ myKeys conf@(XConfig {XMonad.modMask = modMask}) = M.fromList $


 myLayoutHook = smartSpacing 8 $ smartBorders $ avoidStruts (
+    ResizableTall 1 (3/100) (3/5) [] |||
    spiral (6/7) |||
    tabbed shrinkText tabConfig |||
    ThreeCol 1 (3/100) (1/2) |||
@@ -185,39 +189,9 @@ toggleFullscreen =
        let isFullFloat = w `M.lookup` W.floating ws == Just fullRect
        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
--- a/home/natto.nix
+++ b/home/natto.nix
@@ -44,7 +44,7 @@ in
      pamixer
      mpdas
      pavucontrol
-      anup
+      unstable.anup
      xfce.thunar
      xfce.xfconf
      xfce.tumbler
@@ -67,7 +67,6 @@ in
      xorg.xmodmap
      p7zip
      unrar
-      wineWowPackages.staging
      glxinfo
      sxiv
      vim
@@ -79,7 +78,15 @@ in
      xdotool
      arc-theme
      arc-icon-theme
-      osu-nix
+      tor-browser-bundle-bin
+      wineWowPackages.stable
+      (master.winetricks.override { wine = wineWowPackages.stable; })
+      csvtool
+      pmidi
+      dosbox
+      authy
+      unstable.premid
+      nbfc-linux
    ];

    file = {
--- a/home/stuff/programs.nix
+++ b/home/stuff/programs.nix
@@ -14,6 +14,10 @@
 #       userContent = builtins.readFile ../config/firefox/userContent.css;
      };
    };
+   /* chromium = {
+      enable = true;
+      package = pkgs.ungoogled-chromium;
+    };*/
    zathura = {
      enable = true;
      extraConfig = builtins.readFile ../config/zathura/zathurarc;
@@ -31,5 +35,6 @@
        save-position-on-quit = "yes";
      };
    };
+    go.enable = true;
  };
 }
--- a/home/stuff/services.nix
+++ b/home/stuff/services.nix
@@ -20,7 +20,7 @@ in
          blur-background = true;
          blur-method = "dual_kawase";
          blur-strength = 3;
-          blur-kern = "3x3box";
+          blur-kern = "11x11gaussian";
          fading = true;
          fade-in-step = 0.05;
          fade-out-step = 0.05;