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

universedesktop: DWL Patches

Browse Source
This commit is contained in:
David Crompton
2024-05-11 11:12:01 -04:00
parent 0dd747dcf6
commit 5064b95a3c
3 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
machines/universedesktop/desktop/displaymanager.nix
View File

@@ -2,7 +2,7 @@
empttyConf = pkgs.writeText "emptty-config" '' empttyConf = pkgs.writeText "emptty-config" ''
TTY_NUMBER=7 TTY_NUMBER=7
WAYLAND_SESSIONS_PATH="${config.services.xserver.displayManager.sessionData.desktops}/share/wayland-sessions" WAYLAND_SESSIONS_PATH="${config.services.displayManager.sessionData.desktops}/share/wayland-sessions"
''; '';
in { in {
imports = [ imports = [

20
machines/universedesktop/desktop/dwl.nix
View File

@@ -15,7 +15,22 @@ in {
nixpkgs.overlays = [ nixpkgs.overlays = [
(final: prev: { (final: prev: {
dwl = prev.dwl.overrideAttrs (old: { dwl = prev.dwl.overrideAttrs (old: let
dwl-patches = pkgs.fetchgit {
url = "https://codeberg.org/dwl/dwl-patches.git";
rev = "7f93815e9c9d50add8493e680b3057ed0cc6e8a0";
hash = "sha256-LK1+WjAlguBvITPyS4oHXW5bNP19WUEfo87GFmyv8Js=";
};
patches = let
dwl-patch = p: "${dwl-patches}/patches/${p}/${p}.patch";
in [
(dwl-patch "ipc")
(dwl-patch "restore-monitor")
(dwl-patch "regexrules")
(dwl-patch "regions")
];
in {
patches = (old.patches or []) ++ patches;
postPatch = '' postPatch = ''
export termcmd=${pkgs.foot}/bin/foot export termcmd=${pkgs.foot}/bin/foot
export editcmd=${launch_emacs} export editcmd=${launch_emacs}
@@ -25,7 +40,7 @@ in {
postInstall = '' postInstall = ''
sed -i "s#Exec=dwl#Exec=dwl -s ${dwl-startup}#" $out/share/wayland-sessions/dwl.desktop sed -i "s#Exec=dwl#Exec=dwl -s ${dwl-startup}#" $out/share/wayland-sessions/dwl.desktop
chmod ugo+x $out/share/wayland-sessions/dwl.desktop chmod ugo+x $out/share/wayland-sessions/dwl.desktop
''; '';
passthru.providedSessions = ["dwl"]; passthru.providedSessions = ["dwl"];
}); });
}) })
@@ -46,7 +61,6 @@ in {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
dwl dwl
yambar
foot foot
]; ];
} }

4
machines/universedesktop/desktop/dwl/config.def.h
View File

@@ -6,9 +6,9 @@
/* appearance */ /* appearance */
static const int sloppyfocus = 1; /* focus follows mouse */ static const int sloppyfocus = 1; /* focus follows mouse */
static const int bypass_surface_visibility = 0; /* 1 means idle inhibitors will disable idle tracking even if it's surface isn't visible */ static const int bypass_surface_visibility = 0; /* 1 means idle inhibitors will disable idle tracking even if it's surface isn't visible */
static const unsigned int borderpx = 1; /* border pixel of windows */ static const unsigned int borderpx = 3; /* border pixel of windows */
static const float rootcolor[] = COLOR(0x222222ff); static const float rootcolor[] = COLOR(0x222222ff);
static const float bordercolor[] = COLOR(0x444444ff); static const float bordercolor[] = COLOR(0x233e5dff);
static const float focuscolor[] = COLOR(0x005577ff); static const float focuscolor[] = COLOR(0x005577ff);
static const float urgentcolor[] = COLOR(0xff0000ff); static const float urgentcolor[] = COLOR(0xff0000ff);
/* This conforms to the xdg-protocol. Set the alpha to zero to restore the old behavior */ /* This conforms to the xdg-protocol. Set the alpha to zero to restore the old behavior */