diff options
| -rw-r--r-- | config/dwl.nix | 3 | ||||
| -rw-r--r-- | machines/x/home.nix | 2 | ||||
| -rw-r--r-- | modules/login.nix | 2 | ||||
| -rw-r--r-- | packages/dwl.nix | 2 | ||||
| -rw-r--r-- | packages/dwlb.nix | 58 |
5 files changed, 63 insertions, 4 deletions
diff --git a/config/dwl.nix b/config/dwl.nix index e5a77d5..982bde3 100644 --- a/config/dwl.nix +++ b/config/dwl.nix @@ -2,10 +2,11 @@ let dwl = (pkgs.callPackage ../packages/dwl.nix {}); + dwlb = (pkgs.callPackage ../packages/dwlb.nix {}); in { xdg.portal.enable = true; xdg.portal.configPackages = [ pkgs.xdg-desktop-portal-gtk pkgs.xdg-desktop-portal-hyprland ]; xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk pkgs.xdg-desktop-portal-hyprland ]; - home.packages = [ dwl ]; + home.packages = [ dwl dwlb ]; } diff --git a/machines/x/home.nix b/machines/x/home.nix index fced07e..9d0a4ab 100644 --- a/machines/x/home.nix +++ b/machines/x/home.nix @@ -24,7 +24,7 @@ in { cinnamon.nemo mate.eom - # spotify + spotify firefox google-chrome diff --git a/modules/login.nix b/modules/login.nix index e174744..79ac35f 100644 --- a/modules/login.nix +++ b/modules/login.nix @@ -10,7 +10,7 @@ enable = true; settings = { default_session = { - command = "tuigreet --time --remember --cmd \"dwl\""; + command = "tuigreet --time --remember --cmd \"dwl -s dwlb\""; user = "greeter"; }; }; diff --git a/packages/dwl.nix b/packages/dwl.nix index d38156b..a3c46ca 100644 --- a/packages/dwl.nix +++ b/packages/dwl.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "compromyse"; repo = "dwl"; rev = "master"; - hash = "sha256-/iNoEbueymoLBEtTZBSmcrH0fy2YxHACpXvqCgK2bxA="; + hash = "sha256-C2wB/vCWr3LPvY0JpG6bzlw9fr0yPHccD4HTD+lH0Ac="; }; nativeBuildInputs = [ diff --git a/packages/dwlb.nix b/packages/dwlb.nix new file mode 100644 index 0000000..08dc7c6 --- /dev/null +++ b/packages/dwlb.nix @@ -0,0 +1,58 @@ +{ lib +, stdenv +, fetchFromGitHub +, installShellFiles +, wayland-scanner +, wayland +, wayland-protocols +, pixman +, fcft +, pkg-config +, writeText +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "dwlb"; + version = "git"; + + src = fetchFromGitHub { + owner = "compromyse"; + repo = "dwlb"; + rev = "master"; + hash = "sha256-cz3yqughpLdFZY3vIXvkKGVoC4ZrTzZQhaJWQ8XB3kQ="; + }; + + nativeBuildInputs = [ + installShellFiles + pkg-config + wayland-scanner + ]; + + buildInputs = [ + pixman + wayland + wayland-protocols + fcft + ]; + + outputs = [ "out" "man" ]; + + makeFlags = [ + "PKG_CONFIG=${stdenv.cc.targetPrefix}pkg-config" + "WAYLAND_SCANNER=wayland-scanner" + "PREFIX=$(out)" + "MANDIR=$(man)/share/man" + ]; + + meta = { + homepage = "https://github.com/compromyse/dwlb/"; + description = "Dynamic window manager for Wayland"; + longDescription = '' + Feature-Complete Bar for DWL + ''; + changelog = "https://github.com/compromyse/dwlb/"; + license = lib.licenses.gpl3Only; + inherit (wayland.meta) platforms; + mainProgram = "dwlb"; + }; +}) |