diff options
| -rw-r--r-- | flake.lock | 20 | ||||
| -rw-r--r-- | flake.nix | 2 | ||||
| -rw-r--r-- | modules/amdgpu.nix | 4 | ||||
| -rw-r--r-- | modules/core/audio.nix | 4 | ||||
| -rw-r--r-- | modules/core/fonts.nix | 4 | ||||
| -rw-r--r-- | modules/wm_utils.nix | 7 | ||||
| -rw-r--r-- | packages/dwlb.nix | 2 | ||||
| -rw-r--r-- | packages/wayland-protocols.nix | 4 | ||||
| -rw-r--r-- | packages/wbg.nix | 74 | ||||
| -rw-r--r-- | packages/wlroots.nix | 4 |
10 files changed, 100 insertions, 25 deletions
@@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1735381016, - "narHash": "sha256-CyCZFhMUkuYbSD6bxB/r43EdmDE7hYeZZPTCv0GudO4=", + "lastModified": 1735900408, + "narHash": "sha256-U+oZBQ3f5fF2hHsupKQH4ihgTKLHgcJh6jEmKDg+W10=", "owner": "nix-community", "repo": "home-manager", - "rev": "10e99c43cdf4a0713b4e81d90691d22c6a58bdf2", + "rev": "1c8d4c8d592e8fab4cff4397db5529ec6f078cf9", "type": "github" }, "original": { @@ -75,11 +75,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1735530358, - "narHash": "sha256-4ZbiXBWFK0gHsl5VT9dih7RVaEV3rRh0XUV0jW0ibOM=", + "lastModified": 1735919885, + "narHash": "sha256-02KY9wlsdRrm2UnfYt2uYuDVz9NVEo8E3GP2VL6FPXo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5000219208d860bafd1ee26eadb403449f3d9ab9", + "rev": "eb75114d5d71fe6a6fd49871a23b8d03de7843c5", "type": "github" }, "original": { @@ -91,16 +91,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1735412871, - "narHash": "sha256-Qoz0ow6jDGUIBHxduc7Y1cjYFS71tvEGJV5Src/mj98=", + "lastModified": 1735919885, + "narHash": "sha256-02KY9wlsdRrm2UnfYt2uYuDVz9NVEo8E3GP2VL6FPXo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9f94733f93e4fe6e82f516efae007096e4ab5a21", + "rev": "eb75114d5d71fe6a6fd49871a23b8d03de7843c5", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.11", + "ref": "master", "repo": "nixpkgs", "type": "github" } @@ -3,7 +3,7 @@ inputs = { # Nixpkgs - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; + nixpkgs.url = "github:nixos/nixpkgs/master"; # Home manager home-manager = { diff --git a/modules/amdgpu.nix b/modules/amdgpu.nix index 430faf3..df74147 100644 --- a/modules/amdgpu.nix +++ b/modules/amdgpu.nix @@ -3,7 +3,7 @@ { hardware.graphics.enable = true; hardware.graphics.extraPackages = with pkgs; [ - rocmPackages.clr.icd + # rocmPackages.clr.icd amdvlk vaapiVdpau libvdpau-va-gl @@ -16,6 +16,6 @@ services.xserver.videoDrivers = [ "modesetting" ]; systemd.tmpfiles.rules = [ - "L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}" + # "L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}" ]; } diff --git a/modules/core/audio.nix b/modules/core/audio.nix index c0af081..9a277c0 100644 --- a/modules/core/audio.nix +++ b/modules/core/audio.nix @@ -1,13 +1,13 @@ { config, ... }: { - hardware.pulseaudio.enable = false; + services.pulseaudio.enable = false; services.pipewire = { enable = true; alsa.enable = true; alsa.support32Bit = true; pulse.enable = true; jack.enable = true; - # wireplumber.enable = true; + wireplumber.enable = true; }; } diff --git a/modules/core/fonts.nix b/modules/core/fonts.nix index 7f1d51d..30c83b0 100644 --- a/modules/core/fonts.nix +++ b/modules/core/fonts.nix @@ -2,8 +2,8 @@ { fonts.packages = with pkgs; [ - # nerd-fonts.ubuntu-mono - (nerdfonts.override { fonts = [ "UbuntuMono" ]; }) + nerd-fonts.ubuntu-mono + # (nerdfonts.override { fonts = [ "UbuntuMono" ]; }) noto-fonts noto-fonts-cjk-sans noto-fonts-emoji diff --git a/modules/wm_utils.nix b/modules/wm_utils.nix index da5c672..1f1f417 100644 --- a/modules/wm_utils.nix +++ b/modules/wm_utils.nix @@ -1,6 +1,8 @@ { pkgs, ... }: -{ +let + wbg = (pkgs.callPackage ../packages/wbg.nix {}); +in { environment.systemPackages = with pkgs; [ polkit_gnome @@ -12,11 +14,10 @@ wirelesstools pamixer brightnessctl - wbg networkmanagerapplet sway-launcher-desktop - ]; + ] ++ [ wbg ]; xdg.portal.enable = true; xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-wlr pkgs.xdg-desktop-portal ]; diff --git a/packages/dwlb.nix b/packages/dwlb.nix index c6e21b4..cc03292 100644 --- a/packages/dwlb.nix +++ b/packages/dwlb.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "compromyse"; repo = "dwlb"; rev = "compromyse"; - hash = "sha256-3K0MUdnsI2fFcsIQhTI5Vhw1ODgN/ii0imhLdxJNUqU="; + hash = "sha256-9IRGC6q4v67ybRjh6guLFa8W4kHfAbRFY4Mit/mx+jE="; }; nativeBuildInputs = [ diff --git a/packages/wayland-protocols.nix b/packages/wayland-protocols.nix index 76976be..0db8d45 100644 --- a/packages/wayland-protocols.nix +++ b/packages/wayland-protocols.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "wayland-protocols"; - version = "1.38"; + version = "1.39"; doCheck = stdenv.hostPlatform == stdenv.buildPlatform && # https://gitlab.freedesktop.org/wayland/wayland-protocols/-/issues/48 @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://gitlab.freedesktop.org/wayland/${finalAttrs.pname}/-/releases/${finalAttrs.version}/downloads/${finalAttrs.pname}-${finalAttrs.version}.tar.xz"; - hash = "sha256-/xcpLAUVnSsgzmys/kLX4xooGY+hQpp2mwOvfDhYHb4="; + hash = "sha256-4dzcu/COLgqKAu5dmgvjpqr8OaS1H6fg0vGhZBHLcvo="; }; postPatch = lib.optionalString finalAttrs.doCheck '' diff --git a/packages/wbg.nix b/packages/wbg.nix new file mode 100644 index 0000000..b9ef787 --- /dev/null +++ b/packages/wbg.nix @@ -0,0 +1,74 @@ +{ + stdenv, + lib, + fetchFromGitea, + pkg-config, + meson, + ninja, + pixman, + tllist, + wayland, + wayland-scanner, + wayland-protocols, + nanosvg, + libjxl, + enablePNG ? true, + enableJPEG ? true, + enableWebp ? true, + # Optional dependencies + libpng, + libjpeg, + libwebp, +}: + +stdenv.mkDerivation rec { + pname = "wbg"; + version = "1.2.0"; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "dnkl"; + repo = "wbg"; + rev = "master"; + hash = "sha256-ikwOVtR5cXZGd2GE/O4ej6cOQZomyEKkPcKe08EtPw0="; + }; + + nativeBuildInputs = [ + pkg-config + meson + ninja + wayland-scanner + ]; + + buildInputs = + [ + pixman + tllist + wayland + wayland-protocols + nanosvg + libjxl + ] + ++ lib.optional enablePNG libpng + ++ lib.optional enableJPEG libjpeg + ++ lib.optional enableWebp libwebp; + + mesonBuildType = "release"; + + mesonFlags = [ + (lib.mesonEnable "system-nanosvg" true) + (lib.mesonEnable "png" enablePNG) + (lib.mesonEnable "jpeg" enableJPEG) + (lib.mesonEnable "webp" enableWebp) + ]; + + meta = with lib; { + description = "Wallpaper application for Wayland compositors"; + homepage = "https://codeberg.org/dnkl/wbg"; + changelog = "https://codeberg.org/dnkl/wbg/releases/tag/${version}"; + license = licenses.isc; + maintainers = with maintainers; [ ]; + platforms = with platforms; linux; + mainProgram = "wbg"; + }; +} diff --git a/packages/wlroots.nix b/packages/wlroots.nix index c632018..4978a93 100644 --- a/packages/wlroots.nix +++ b/packages/wlroots.nix @@ -15,8 +15,8 @@ let repo = "wlroots"; repo_git = "https://${domain}/${owner}/${repo}"; branch = "master"; - rev = "d835fa813f82501eb668708af33afc42010707cf"; - sha256 = "sha256-YXLa0fjqND7Gys4KK/CZmRqGU70gMVqU3T+j+e6S9qw="; + rev = "38923826c3bd2c8d5752b63570063282e658e2b0"; + sha256 = "sha256-G4P26O08N7zDj3ehhPwqYQm82ij4oI4SI4eehvSagc8="; }; ignore = [ "wlroots" |