diff options
Diffstat (limited to 'modules')
| -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 |
4 files changed, 10 insertions, 9 deletions
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 ]; |