diff options
author | Julian T <julian@jtle.dk> | 2021-03-31 10:20:16 +0200 |
---|---|---|
committer | Julian T <julian@jtle.dk> | 2021-03-31 10:20:16 +0200 |
commit | 32e446e829159931bfe254899b2871e0afcf6a8d (patch) | |
tree | a43aa036090b31429582b68d8d0b213b2ad1d2f3 | |
parent | dedff3809b3d0bca1ad309cfb6e7648b029485f4 (diff) |
Switch to stable release and disable the pulseaudio cork module
-rw-r--r-- | core.nix | 2 | ||||
-rw-r--r-- | desktop.nix | 16 | ||||
-rw-r--r-- | pc_t14.nix | 10 |
3 files changed, 17 insertions, 11 deletions
@@ -58,7 +58,7 @@ # General stuff wget vim neovim git htop zsh tree dnsutils zip unzip tig file whois nmap usbutils lshw gnumake - aspell pv jq killall netcat-gnu perl + pv jq killall netcat-gnu perl pciutils cowsay man-pages gcc binutils python3 python ]; }; diff --git a/desktop.nix b/desktop.nix index 4882cf7..5a5d358 100644 --- a/desktop.nix +++ b/desktop.nix @@ -9,6 +9,11 @@ # Enable bluetooth audio package = pkgs.pulseaudioFull; + + # Disable cork module + configFile = pkgs.runCommand "default.pa" {} '' + grep -v module-role-cork ${config.hardware.pulseaudio.package}/etc/pulse/default.pa > $out + ''; }; bluetooth.enable = true; @@ -100,32 +105,33 @@ gopass stow pass gnupg imagemagick acpi gdb sox # Nixos stuff - nox + nox nix-index # Network stuff networkmanagerapplet networkmanager-openconnect iw wirelesstools # Developing - rustup gcc go clang-tools + rustup gcc go clang-tools python38Packages.ipython # X stuff feh rofi xorg.xmodmap xss-lock xclip xorg.xkill acpilight xdotool dunst xcompmgr scrot libnotify i3lock + xbindkeys # Gui applications firefox pavucontrol evince leafpad inkscape gimp meld pinentry gnome3.gnome-system-monitor termite quasselClient wireshark spotify gnome3.file-roller gnome3.gnome-calculator - gnome3.simple-scan vlc mpv xorg.xev tor-browser-bundle-bin - evolution evolution-data-server vimHugeX + gnome3.simple-scan vlc mpv xorg.xev + gnome3.evolution evolution-data-server vimHugeX (mumble.override { pulseSupport = true; }) libreoffice-fresh liferea qutebrowser mate.caja # Other stuff texlive.combined.scheme-medium biber youtube-dl sshpass python38Packages.pynvim - aspellDicts.da aspellDicts.en + aspell aspellDicts.da aspellDicts.en ]; } @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ config, lib, pkgs, ... }: { networking = { @@ -9,7 +9,7 @@ }; boot = { - kernelPackages = pkgs.linuxPackages_latest; + kernelPackages = lib.mkIf (lib.versionOlder pkgs.linux.version "5.8") pkgs.linuxPackages_5_10; loader = { systemd-boot.enable = true; @@ -37,9 +37,9 @@ amdvlk ]; - extraPackages32 = with pkgs; [ - driversi686Linux.amdvlk - ]; + # extraPackages32 = with pkgs; [ + # driversi686Linux.amdvlk + # ]; }; }; |