From 32e446e829159931bfe254899b2871e0afcf6a8d Mon Sep 17 00:00:00 2001
From: Julian T <julian@jtle.dk>
Date: Wed, 31 Mar 2021 10:20:16 +0200
Subject: Switch to stable release and disable the pulseaudio cork module

---
 core.nix    |  2 +-
 desktop.nix | 16 +++++++++++-----
 pc_t14.nix  | 10 +++++-----
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/core.nix b/core.nix
index 801a940..ce8705c 100644
--- a/core.nix
+++ b/core.nix
@@ -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
         ];
     }
diff --git a/pc_t14.nix b/pc_t14.nix
index 489b67d..5ae9b07 100644
--- a/pc_t14.nix
+++ b/pc_t14.nix
@@ -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
+            # ];
         };
     };
 
-- 
cgit v1.2.3