Syzygial/NixMachines
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

universedesktop: back to dwm & st

Browse Source
This commit is contained in:
David Crompton
2025-03-11 12:39:05 -04:00
parent a4215f7a37
commit 6e4c4c83bc
4 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
machines/universedesktop/desktop/default.nix
View File

@@ -2,6 +2,7 @@
imports = [ imports = [
./audio.nix ./audio.nix
./graphics.nix ./graphics.nix
./dwm.nix # Sadly, nVidia seems to be too broken too often # ./dwl.nix # Sadly, nVidia seems to be too broken too often on wayland
./dwm.nix
]; ];
} }

13
machines/universedesktop/desktop/dwm.nix
View File

@@ -2,11 +2,11 @@
nixpkgs.overlays = [ nixpkgs.overlays = [
(final: prev: { (final: prev: {
st = prev.st.override { st = prev.st.override {
conf = pkgs.substituteAll { conf = builtins.readFile (pkgs.substituteAll {
src = ./dwm/; src = ./dwm/st-config.def.h;
env = { env = {
}; };
}; });
}; };
}) })
]; ];
@@ -30,7 +30,7 @@
''; '';
scrncmd=pkgs.writeScript "screenshot-region" '' scrncmd=pkgs.writeScript "screenshot-region" ''
#!${pkgs.bash}/bin/bash #!${pkgs.bash}/bin/bash
${pkgs.slurp}/bin/slurp | ${pkgs.grim}/bin/grim -g - - | ${pkgs.wl-clipboard}/bin/wl-copy ${pkgs.maim}/bin/maim -o -s | ${pkgs.xclip}/bin/xclip -sel clip -t image/png
''; '';
}; };
}; };
@@ -40,8 +40,13 @@
}; };
}; };
services.xserver.enable = true; services.xserver.enable = true;
# services.xserver.xrandrHeads should work, but alas
services.xserver.displayManager.setupCommands = ''
${pkgs.xorg.xrandr}/bin/xrandr --output DP-4 --auto --output DP-2 --auto --right-of DP-4 --primary --output HDMI-0 --auto --right-of DP-2;
'';
services.xserver.displayManager.lightdm = { services.xserver.displayManager.lightdm = {
enable = true; enable = true;
background = "#000000";
}; };
environment.sessionVariables = { environment.sessionVariables = {
GTK_THEME="Adwaita-dark"; GTK_THEME="Adwaita-dark";

7
machines/universedesktop/desktop/dwm/config.h
View File

@@ -1,3 +1,4 @@
#include <X11/XF86keysym.h>
/* See LICENSE file for copyright and license details. */ /* See LICENSE file for copyright and license details. */
/* appearance */ /* appearance */
@@ -34,7 +35,7 @@ static const Rule rules[] = {
/* layout(s) */ /* layout(s) */
static const float mfact = 0.5; /* factor of master area size [0.05..0.95] */ static const float mfact = 0.5; /* factor of master area size [0.05..0.95] */
static const int nmaster = 1; /* number of clients in master area */ static const int nmaster = 1; /* number of clients in master area */
static const int resizehints = 1; /* 1 means respect size hints in tiled resizals */ static const int resizehints = 0; /* 1 means respect size hints in tiled resizals */
static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen window */ static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen window */
static const Layout layouts[] = { static const Layout layouts[] = {
@@ -75,7 +76,7 @@ static const Key keys[] = {
{ MODKEY, XK_d, incnmaster, {.i = -1 } }, { MODKEY, XK_d, incnmaster, {.i = -1 } },
{ MODKEY, XK_h, setmfact, {.f = -0.05} }, { MODKEY, XK_h, setmfact, {.f = -0.05} },
{ MODKEY, XK_l, setmfact, {.f = +0.05} }, { MODKEY, XK_l, setmfact, {.f = +0.05} },
{ MODKEY, XK_Return, zoom, {0} }, { MODKEY, XK_z, zoom, {0} },
{ MODKEY, XK_Tab, view, {0} }, { MODKEY, XK_Tab, view, {0} },
{ MODKEY|ShiftMask, XK_c, killclient, {0} }, { MODKEY|ShiftMask, XK_c, killclient, {0} },
{ MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, { MODKEY, XK_t, setlayout, {.v = &layouts[0]} },
@@ -90,6 +91,8 @@ static const Key keys[] = {
{ MODKEY, XK_period, focusmon, {.i = +1 } }, { MODKEY, XK_period, focusmon, {.i = +1 } },
{ MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } }, { MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } },
{ MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } }, { MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } },
{ MODKEY|ShiftMask, XK_Print, spawn, {.v = scrncmd } },
{ 0, XF86XK_AudioPlay, spawn, {.v = playcmd } },
TAGKEYS( XK_1, 0) TAGKEYS( XK_1, 0)
TAGKEYS( XK_2, 1) TAGKEYS( XK_2, 1)
TAGKEYS( XK_3, 2) TAGKEYS( XK_3, 2)

12
machines/universedesktop/desktop/dwm/st-config.def.h
View File

@@ -193,12 +193,12 @@ static Shortcut shortcuts[] = {
{ ControlMask, XK_Print, toggleprinter, {.i = 0} }, { ControlMask, XK_Print, toggleprinter, {.i = 0} },
{ ShiftMask, XK_Print, printscreen, {.i = 0} }, { ShiftMask, XK_Print, printscreen, {.i = 0} },
{ XK_ANY_MOD, XK_Print, printsel, {.i = 0} }, { XK_ANY_MOD, XK_Print, printsel, {.i = 0} },
{ TERMMOD|ShiftMask, XK_KP_Subtract, zoom, {.f = -1} }, { ControlMask|ShiftMask, XK_KP_Subtract, zoom, {.f = -1} },
{ TERMMOD|ShiftMask, XK_KP_Equal, zoom, {.f = +1} }, { ControlMask|ShiftMask, XK_KP_Equal, zoom, {.f = +1} },
{ TERMMOD, XK_Home, zoomreset, {.f = 0} }, { ControlMask, XK_Home, zoomreset, {.f = 0} },
{ TERMMOD, XK_C, clipcopy, {.i = 0} }, { ControlMask|ShiftMask, XK_C, clipcopy, {.i = 0} },
{ TERMMOD, XK_V, clippaste, {.i = 0} }, { ControlMask|ShiftMask, XK_V, clippaste, {.i = 0} },
{ TERMMOD, XK_Y, selpaste, {.i = 0} }, { ControlMask, XK_Y, selpaste, {.i = 0} },
{ ShiftMask, XK_Insert, selpaste, {.i = 0} }, { ShiftMask, XK_Insert, selpaste, {.i = 0} },
{ TERMMOD, XK_Num_Lock, numlock, {.i = 0} }, { TERMMOD, XK_Num_Lock, numlock, {.i = 0} },
}; };