diff --git a/flake.nix b/flake.nix index 1617c55..62177df 100644 --- a/flake.nix +++ b/flake.nix @@ -16,7 +16,8 @@ # my stuff dhist.url = "github:lelgenio/dhist"; }; - outputs = { nixpkgs, nixpkgs-unstable, home-manager, alacritty-sixel, ranger-sixel, nur, dhist, ... }: + outputs = { nixpkgs, nixpkgs-unstable, home-manager, alacritty-sixel + , ranger-sixel, nur, dhist, ... }: let system = "x86_64-linux"; pkgs = import nixpkgs { @@ -45,19 +46,21 @@ _diffr = import ./diffr.nix { inherit config pkgs lib; }; kak-pager = import ./kak-pager.nix { inherit config pkgs lib; }; terminal = import ./terminal.nix { inherit config pkgs lib; }; - alacritty = (old-pkgs.alacritty.overrideAttrs (old-alacritty: rec { - src = alacritty-sixel; - cargoDeps = old-alacritty.cargoDeps.overrideAttrs (old-pkgs.lib.const { - inherit src; - outputHash = "sha256-aNatd4LC4lv0bDpVfUONdtEn9OPahVBZ9ch14pWWCnM="; - }); - })); + alacritty = (old-pkgs.alacritty.overrideAttrs + (old-alacritty: rec { + src = alacritty-sixel; + cargoDeps = old-alacritty.cargoDeps.overrideAttrs + (old-pkgs.lib.const { + inherit src; + outputHash = + "sha256-aNatd4LC4lv0bDpVfUONdtEn9OPahVBZ9ch14pWWCnM="; + }); + })); ranger = (old-pkgs.ranger.overridePythonAttrs (old-ranger: rec { src = ranger-sixel; - checkInputs = []; + checkInputs = [ ]; propagatedBuildInputs = with pkgs.python3Packages; - old-ranger.propagatedBuildInputs ++ - [ astroid pylint pytest ]; + old-ranger.propagatedBuildInputs ++ [ astroid pylint pytest ]; })); }) ]; diff --git a/system/configuration.nix b/system/configuration.nix index 5ae381b..f7fffc2 100644 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -118,13 +118,19 @@ in { }; services.flatpak.enable = true; virtualisation.docker.enable = true; - # Enable sound with pipewire. + security.rtkit.enable = true; + + ## Enable sound with pipewire. sound.enable = true; # hardware.pulseaudio.enable = true; - security.rtkit.enable = true; - services.pipewire.enable = true; - # services.pipewire.media-session.enable = true; - services.pipewire.pulse.enable = true; + services.pipewire = { + enable = true; + wireplumber.enable = true; + pulse.enable = true; + alsa.enable = true; + jack.enable = true; + }; + # Enable touchpad support (enabled default in most desktopManager). services.xserver.libinput.enable = true; # Define a user account. Don't forget to set a password with ‘passwd’. diff --git a/system/monolith-hardware-configuration.nix b/system/monolith-hardware-configuration.nix index a11d2e6..e47cbab 100644 --- a/system/monolith-hardware-configuration.nix +++ b/system/monolith-hardware-configuration.nix @@ -75,7 +75,9 @@ fileSystems."/swap" = { device = "/dev/disk/by-label/BTRFS_ROOT"; fsType = "btrfs"; - options = [ "subvol=swap" ]; # Note these options effect the entire BTRFS filesystem and not just this volume, with the exception of `"subvol=swap"`, the other options are repeated in my other `fileSystem` mounts + options = [ + "subvol=swap" + ]; # Note these options effect the entire BTRFS filesystem and not just this volume, with the exception of `"subvol=swap"`, the other options are repeated in my other `fileSystem` mounts }; swapDevices = [{ device = "/swap/swapfile";