glorious refactor (part 2

modules/desktop-environment/home/compositing.nix

@@ -0,0 +1,28 @@
+{...}: {
+  services.picom = {
+    enable = true;
+    backend = "glx";
+
+    shadow = true;
+    shadowOffsets = [(-40) (-30)];
+    shadowOpacity = 0.2;
+    shadowExclude = [
+      "class_g ?= 'Notify-osd'"
+      "_GTK_FRAME_EXTENTS@:c"
+      "!(class_g = 'Rofi' || class_g = 'Dunst')"
+    ];
+
+    vSync = true;
+    settings = {
+      "shadow-radius" = 40;
+      # fading rofi
+      "fading" = true;
+      "fade-in-step" = 0.25;
+      "fade-out-step" = 0.2;
+      "fade-delta" = 20;
+      "fade-exclude" = ["class_g != 'Rofi'"];
+      # use damage information
+      "use-damage" = true;
+    };
+  };
+}

modules/desktop-environment/home/default.nix

@@ -0,0 +1,11 @@
+{...}: {
+  home-manager.users.jade = {...}: {
+    imports = [
+      ./notifications.nix
+      ./terminal.nix
+      ./compositing.nix
+      ./panels
+      ./xmonad
+    ];
+  };
+}

modules/desktop-environment/home/notifications.nix

@@ -0,0 +1,17 @@
+{pkgs, ...}: {
+  services.dunst = {
+    enable = true;
+    settings = {
+      global = {
+        dmenu = "${pkgs.rofi}/bin/rofi -theme gruvbox-dark -dmenu -p dunst";
+        browser = "${pkgs.librewolf}/bin/librewolf";
+        mouse_left_click = "context";
+        mouse_middle_click = "close_current";
+        background = "#282828";
+        foreground = "#ebdbb2";
+        frame_color = "#504945";
+        frame_width = 2;
+      };
+    };
+  };
+}

modules/desktop-environment/home/panels/default.nix

@@ -0,0 +1,6 @@
+{...}: {
+  imports = [
+    ./xmobar
+    ./polybar.nix
+  ];
+}

modules/desktop-environment/home/panels/polybar.nix

@@ -0,0 +1,146 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: {
+  services.polybar = {
+    enable = true;
+    package = pkgs.polybarFull;
+
+    script = "";
+    settings = {
+      colors = {
+        background = "#282828";
+        background-alt = "#3c3836";
+        foreground = "#ebdbb2";
+        primary = "#d65d0e";
+        secondary = "#fe8019";
+        alert = "#cc241d";
+        disabled = "#504945";
+      };
+      "bar/status" = {
+        # Style
+        bottom = true;
+        width = "100%";
+        height = "24px";
+        radius = 0;
+        tray-position = "center";
+        background = "\${colors.background}";
+        foreground = "\${colors.foreground}";
+        line-size = "4px";
+        border-color = "#00000000";
+        padding-left = 0;
+        padding-right = 1;
+        module-margin = 1;
+        separator = "|";
+        separator-foreground = "\${colors.disabled}";
+        font-0 = "FiraCode Nerd Font";
+        modules-left = "xworkspaces xwindow";
+        modules-right = "memory cpu wlan bat0 bat1";
+        cursor-click = "pointer";
+        cursor-scroll = "ns-resize";
+        enable-ipc = true;
+        wm-restack = "generic";
+        override-redirect = false;
+      };
+
+      "module/xworkspaces" = {
+        type = "internal/xworkspaces";
+        label-active = "";
+        label-active-padding = 1;
+        label-occupied = "";
+        label-occupied-padding = 1;
+        label-urgent = "";
+        label-urgent-foreground = "\${colors.alert}";
+        label-urgent-padding = 1;
+        label-empty = "";
+        label-empty-foreground = "\${colors.disabled}";
+        label-empty-padding = 1;
+      };
+
+      "module/xwindow" = {
+        type = "internal/xwindow";
+        label = "%title:0:60:...%";
+      };
+
+      "module/memory" = {
+        type = "internal/memory";
+        interval = 2;
+        format-prefix = "󰍛 ";
+        format-prefix-foreground = "\${colors.primary}";
+        label = "%percentage_used:2%%";
+      };
+
+      "module/cpu" = {
+        type = "internal/cpu";
+        interval = "2";
+        format-prefix = "󰻠 ";
+        format-prefix-foreground = "\${colors.primary}";
+        label = "%percentage:2%%";
+      };
+
+      "network-base" = {
+        type = "internal/network";
+        interval = 5;
+        format-connected = "<ramp-signal> <label-connected>";
+        format-disconnected = "<label-disconnected>";
+        label-disconnected = "󰣼";
+        label-disconnected-foreground = "#d65d0e";
+        ramp.signal = [
+          "%{F#cc241d}󰣾"
+          "%{F#d79921}󰣴"
+          "%{F#98971a}󰣶"
+          "%{F#98971a}󰣸"
+          "%{F#98971a}󰣺"
+        ];
+      };
+
+      "module/wlan" = {
+        "inherit" = "network-base";
+        interface-type = "wireless";
+        label-connected = "%{F#F0C674}%{F-} %local_ip%";
+      };
+      "battery-base" = {
+        type = "internal/battery";
+        poll-interval = 1;
+        time-format = "%H%{F#7c6f64}:%{F#d5c4a1}%M";
+        label-charging = "%{F#98971a}󰚥 %{F#ebdbb2}%percentage%%%{F#d5c4a1} %time%";
+        format-charging = "<ramp-capacity> <label-charging>";
+        label-discharging = "%{F#ebdbb2}%percentage%%%{F#bdae93} %time%";
+        format-discharging = "<ramp-capacity> <label-discharging>";
+        label-full = "%{F#98971a}󰁹%{F#ebdbb2} %percentage%%";
+        format-full = "<label-full>";
+        label-low = "%{F#cc241d}󰂎%{F#ebdbb2} %percentage%%";
+        format-low = "<label-low>";
+        ramp.capacity = [
+          "%{F#cc241d}󰁺"
+          "%{F#d79921}󰁻"
+          "%{F#98971a}󰁼"
+          "%{F#98971a}󰁽"
+          "%{F#98971a}󰁾"
+          "%{F#98971a}󰁿"
+          "%{F#98971a}󰂀"
+          "%{F#98971a}󰂁"
+          "%{F#98971a}󰂂"
+          "%{F#98971a}󰁹"
+        ];
+      };
+      "module/bat0" = {
+        "inherit" = "battery-base";
+        battery = "BAT0";
+        adapter = "ADP1";
+      };
+      "module/bat1" = {
+        "inherit" = "battery-base";
+        battery = "BAT1";
+        adapter = "ADP1";
+      };
+
+      "settings" = {
+        screenchange-reload = true;
+        pseudo-transparency = true;
+      };
+    };
+  };
+}

modules/desktop-environment/home/panels/xmobar/default.nix

@@ -0,0 +1,27 @@
+{
+  lib,
+  pkgs,
+  ...
+}: let
+  xmobarGhc = pkgs.haskellPackages.ghcWithPackages (pkgs:
+    with pkgs; [
+      xmobar
+      statgrab
+    ]);
+in {
+  home = {
+    packages = [xmobarGhc];
+    file."xmobar.hs" = rec {
+      source = ./xmobar.hs;
+      target = ".config/xmobar/xmobar.hs";
+      onChange = ''
+        ${xmobarGhc}/bin/ghc -threaded ${target}
+        ${pkgs.busybox}/bin/pkill xmobar
+        ${pkgs.haskellPackages.xmonad}/bin/xmonad --restart
+      '';
+    };
+  };
+  programs.xmobar = {
+    enable = true;
+  };
+}

modules/desktop-environment/home/panels/xmobar/xmobar.hs

@@ -0,0 +1,47 @@
+import Xmobar
+import System.Statgrab
+
+-- TODOS:
+-- - custom cpu module
+-- - custom mem module
+-- - custom network/ping module with avg of n pings and blah
+-- - custom graph rendering based on braille characters
+-- - custom "ramp" thingies 
+-- - newsticker?
+-- - mail/message monitoring
+-- - if possible, different bars per workspace
+
+data CustomCpu = CustomCpu
+  deriving (Read, Show)
+
+instance Exec CustomCpu where
+  alias CustomCpu = "cpu"
+  run CustomCpu = do 
+    -- return (show :: IO String (snapshot :: Stats CPUPercent))
+    return "meow"
+
+fc code content = "<fc=" ++ code ++ ">" ++ content ++ "</fc>"
+
+sep = fc "#7c6f64"
+icon = fc "#d65d0e"
+
+config :: Config
+config =
+  defaultConfig
+    { font = "FiraCode Nerd Font",
+      allDesktops = True,
+      alpha = 255,
+      bgColor = "#282828",
+      fgColor = "#ebdbb2",
+      commands =
+        [ Run $ Xmobar.Memory ["t", "Mem: <usedratio>%"] 10,
+          Run $ CustomCpu,
+          Run $ Date (icon "\983277" ++ " %Y" ++ sep "-" ++ "%m" ++ sep "-" ++ "%d " ++ icon "\988236" ++ " %H" ++ sep ":" ++ "%M" ++ sep ":" ++ "%S ") "date" 10
+        ],
+      template = "%memory% }{ %cpu% }{ %date%",
+      alignSep = "}{",
+      position = TopH 24
+    }
+
+main :: IO ()
+main = xmobar config  -- or: configFromArgs config >>= xmobar

modules/desktop-environment/home/terminal.nix

@@ -0,0 +1,34 @@
+{...}: {
+  programs.kitty = {
+    enable = true;
+    font = {
+      name = "FiraCode Nerd Font";
+      size = 11;
+    };
+    settings = {
+      #adjust_column_width = "70%";
+      color0 = "#282828";
+      color8 = "#928374";
+      color1 = "#cc241d";
+      color9 = "#fb4934";
+      color2 = "#98971a";
+      color10 = "#b8bb26";
+      color3 = "#d79921";
+      color11 = "#fabd2f";
+      color4 = "#458588";
+      color12 = "#83a598";
+      color5 = "#b16286";
+      color13 = "#d3869b";
+      color6 = "#689d6a";
+      color14 = "#8ec07c";
+      color7 = "#a89984";
+      color15 = "#ebdbb2";
+      foreground = "#ebdbb2";
+      background = "#282828";
+      confirm_os_window_close = 0;
+    };
+  };
+  home.sessionVariables = {
+    TERMINAL = "kitty";
+  };
+}

modules/desktop-environment/home/xmonad/default.nix

@@ -0,0 +1,9 @@
+{pkgs, ...}: {
+  imports = [./wallpaper];
+  home.packages = [pkgs.xmonadctl];
+  xsession.windowManager.xmonad = {
+    enable = true;
+    enableContribAndExtras = true;
+    config = ./xmonad.hs;
+  };
+}

modules/desktop-environment/home/xmonad/wallpaper/default.nix

@@ -0,0 +1,9 @@
+{...}: {
+  home.file.wallpaper = {
+    target = "Pictures/wallpaper.jpg";
+    source = ./wallpaper.jpg;
+    onChange = ''
+      feh --bg-fill ~/Pictures/wallpaper.jpg;
+    '';
+  };
+}

modules/desktop-environment/home/xmonad/xmonad.hs

@@ -0,0 +1,175 @@
+import Control.Monad (when)
+import Data.Map qualified as M
+import Data.Monoid
+import Data.Ratio
+import Graphics.X11.ExtraTypes.XF86
+import System.Exit
+import XMonad
+import XMonad.Actions.KeyRemap
+import XMonad.Hooks.EwmhDesktops
+import XMonad.Hooks.ManageDocks
+import XMonad.Hooks.StatusBar
+import XMonad.Hooks.StatusBar.PP
+import XMonad.Layout.Circle
+import XMonad.Layout.DraggingVisualizer
+import XMonad.Layout.Grid
+import XMonad.Layout.IfMax
+import XMonad.Layout.Magnifier
+import XMonad.Layout.Spacing
+import XMonad.Layout.Tabbed
+import XMonad.Layout.ThreeColumns
+import XMonad.Layout.VoidBorders
+import XMonad.Layout.WindowSwitcherDecoration
+import XMonad.Prompt
+import XMonad.Prompt.Layout
+import XMonad.StackSet qualified as W
+import XMonad.Actions.NoBorders
+import XMonad.Util.EZConfig
+import XMonad.Hooks.ServerMode
+
+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:desktopctl -show-icons"),
+      ((modm, xK_m), spawn "menu-qalc -- -theme gruvbox-dark"),
+      ((modm, xK_i), spawn "rofimoji --selector-args '-theme gruvbox-dark' -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
+      ((modm, xK_w), spawn "window-screenshot.nu"),
+      ((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 .|. shiftMask, xK_t), spawn "DEVICE=\"bcm5974\"; if [ $(xinput list-props \"$DEVICE\" | awk '/^\\tDevice Enabled \\([0-9]+\\):\\t[01]/ {print $NF}') = \"1\" ]; then xinput disable \"$DEVICE\"; else xinput enable \"$DEVICE\"; fi"),
+      -- Push window back into tiling
+      ((modm .|. shiftMask, xK_space), withFocused $ windows . W.sink),
+      -- Resize viewed windows to the correct size
+      ((modm, xK_n), refresh),
+      -- Move focus to the next window
+      ((modm, xK_Tab), layoutPrompt def),
+      -- Move focus
+      ((modm, xK_j), windows W.focusDown),
+      ((modm, xK_k), windows W.focusUp),
+      -- Swap the focused window with the next window
+      ((modm .|. shiftMask, xK_j), windows W.swapDown),
+      ((modm .|. shiftMask, xK_k), windows W.swapUp),
+      -- Shrink the master area
+      ((modm, xK_h), sendMessage Shrink),
+      ((modm, xK_l), sendMessage Expand),
+      -- Increment the number of windows in the master area
+      ((modm, xK_comma), sendMessage (IncMasterN 1)),
+      ((modm, xK_period), sendMessage (IncMasterN (-1))),
+      ((modm, xK_b), sendMessage ToggleStruts >> withFocused toggleBorder),
+      -- volume keys
+      -- TODO: other media keys
+      ((0, xF86XK_AudioRaiseVolume), spawn "amixer -D pulse sset Master 10%+"),
+      ((0, xF86XK_AudioLowerVolume), spawn "amixer -D pulse sset Master 10%-"),
+      ((0, xF86XK_AudioMute), spawn "amixer -D pulse sset Master toggle"),
+      ((0, xF86XK_AudioNext), spawn "playerctl next"),
+      ((0, xF86XK_AudioPrev), spawn "playerctl previous"),
+      ((0, xF86XK_AudioPause), spawn "playerctl play-pause")
+    ]
+      ++ [ ((m .|. modm, k), windows $ f i)
+           | (i, k) <- zip (XMonad.workspaces conf) [xK_1 .. xK_9],
+             (f, m) <- [(W.greedyView, 0), (W.shift, shiftMask)]
+         ]
+
+-- TODO: figure out multi screen stuff, including xinerama
+
+-- 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 -> do
+          focus w
+          mouseMoveWindow w
+          windows W.shiftMaster
+      ),
+      -- mod-button2, Raise the window to the top of the stack
+      ( (modm, button3),
+        \w -> do
+          focus w
+          mouseResizeWindow w
+          windows W.shiftMaster
+      )
+    ]
+
+tabCfg =
+  def
+    { activeColor = "#282828",
+      inactiveColor = "#1d2021",
+      urgentColor = "#9d0006",
+      activeBorderColor = "#504945",
+      inactiveBorderColor = "#3c3836",
+      urgentBorderColor = "#cc241d",
+      activeTextColor = "#ebdbb2",
+      inactiveTextColor = "#bdae93",
+      urgentTextColor = "#ebdbb2"
+    }
+
+myLayout = setupSpacing $ avoidStruts $ autoChoose ||| tabbed shrinkText tabCfg
+  where
+    -- default tiling algorithm partitions the screen into two panes
+    autoChoose = IfMax 2 tiled $ IfMax 3 tiled_mag $ IfMax 4 grid_mag threeCol
+    setupSpacing = spacingRaw True (Border 0 0 0 0) True (Border 7 7 7 7) True 
+    grid_mag = magnifiercz 1.4 Grid
+    tiled = Tall nmaster delta ratio
+    tiled_mag = magnifiercz' 1.4 tiled
+    threeCol = magnifiercz' 1.6 $ ThreeColMid nmaster delta ratio
+    -- The default number of windows in the master pane
+    nmaster = 1
+    -- Default proportion of screen occupied by master pane
+    ratio = 1 / 2
+    -- Percent of screen to increment by when resizing panes
+    delta = 3 / 100
+
+myManageHook =
+  composeAll
+    [ className =? "MPlayer" --> doFloat,
+      className =? "Gimp" --> doFloat,
+      className =? "firefox" --> doShift "browser",
+      className =? "Evolution" --> doShift "comms",
+      className =? "Signal" --> doShift "comms",
+      className =? "SchildiChat" --> doShift "comms",
+      resource =? "desktop_window" --> doIgnore,
+      resource =? "kdesktop" --> doIgnore
+    ]
+
+myStartupHook = do
+  spawn "pgrep oneko || oneko -tofocus -tora -position +-1+5 -fg palevioletred3 -bg pink -name 'Rose the desktop kitty'"
+  spawn "pgrep volumeicon || volumeicon"
+  spawn "pgrep nm-applet || nm-applet"
+  spawn "pgrep mullvad-gui || mullvad-vpn"
+  spawn "feh --bg-fill ~/Pictures/wallpaper.jpg"
+
+xmeowbar = statusBarProp "~/.config/xmobar/xmobar" $ pure xmobarPP
+polybar = statusBarProp "polybar" $ pure xmobarPP
+barSpawner 0 = pure $ xmeowbar <> polybar 
+barSpawner _ = mempty
+
+main :: IO()
+main = xmonad $ docks $ dynamicSBs barSpawner $ ewmh defaults
+
+defaults =
+  def
+    { -- simple stuff
+      terminal = "kitty",
+      focusFollowsMouse = False,
+      clickJustFocuses = False,
+      borderWidth = 2,
+      modMask = mod4Mask,
+      workspaces = ["comms", "browser"] ++ map show [3 .. 9],
+      normalBorderColor = "#3c3836",
+      focusedBorderColor = "#504945",
+      keys = myKeys,
+      mouseBindings = myMouseBindings,
+      layoutHook =myLayout,
+      manageHook = myManageHook,
+      startupHook = myStartupHook,
+      handleEventHook = serverModeEventHook
+    }