From 81f24d95b37c137743ee76951a94f02bd8659280 Mon Sep 17 00:00:00 2001 From: Gerg-L Date: Tue, 21 Mar 2023 15:26:31 -0400 Subject: [PATCH] reconfigured dwm --- modules/DE/dwm.nix | 16 +++++++++++- modules/X11.nix | 45 -------------------------------- systems/gerg-desktop/default.nix | 1 - 3 files changed, 15 insertions(+), 47 deletions(-) diff --git a/modules/DE/dwm.nix b/modules/DE/dwm.nix index 97bc2ce..2b7a0cc 100644 --- a/modules/DE/dwm.nix +++ b/modules/DE/dwm.nix @@ -22,6 +22,7 @@ in { sessionCommands = '' ${pkgs.feh}/bin/feh --bg-center ${self + /misc/recursion.png} ${pkgs.numlockx}/bin/numlockx + ${pkgs.picom}/bin/picom & ''; defaultSession = "none+dwm"; }; @@ -30,7 +31,20 @@ in { { name = "dwm"; start = '' - dwm & + update_time () { + while : + do + sleep 1 + xsetroot -name "$(date +"%I:%M %p")" + done + } + + dont_stop() { + while type dwm >/dev/null ; do dwm && continue || break ; done + } + + update_time & + dont_stop & waitPID=$! ''; }; diff --git a/modules/X11.nix b/modules/X11.nix index 92d6e18..dd66805 100644 --- a/modules/X11.nix +++ b/modules/X11.nix @@ -9,7 +9,6 @@ with lib; let cfg = config.localModules.X11Programs; in { options.localModules.X11Programs = { - picom.enable = mkEnableOption ""; sxhkd.enable = mkEnableOption ""; }; config = mkMerge [ @@ -24,50 +23,6 @@ in { desktopManager.xterm.enable = false; }; } - - ( - mkIf cfg.picom.enable { - services.picom = { - enable = true; - backend = "glx"; - shadow = false; - shadowOpacity = 0.5; - vSync = false; - settings = { - blur = false; - - shadow-radius = 12; - frame-opacity = 1.0; - inactive-opacity-override = false; - corner-radius = 12; - rounded-corners-exclude = [ - "window_type = 'desktop'" - "window_type = 'tooltip'" - ]; - mark-wmwin-focused = true; - mark-ovredir-focused = true; - detect-rounded-corners = true; - detect-client-opacity = true; - detect-transient = true; - use-damage = true; - log-level = "warn"; - wintypes = { - tooltip = { - fade = true; - shadow = false; - opacity = 1.0; - focus = true; - full-shadow = false; - }; - dock = {shadow = true;}; - dnd = {shadow = true;}; - popup_menu = {opacity = 1.0;}; - dropdown_menu = {opacity = 1.0;}; - }; - }; - }; - } - ) ( let configFile = pkgs.writeText "sxhkdrc" '' diff --git a/systems/gerg-desktop/default.nix b/systems/gerg-desktop/default.nix index 22fee65..e48da38 100644 --- a/systems/gerg-desktop/default.nix +++ b/systems/gerg-desktop/default.nix @@ -19,7 +19,6 @@ inputs: { localModules = { X11Programs = { sxhkd.enable = true; - picom.enable = true; }; DE.dwm.enable = true; DM = {