General cleanup and flake update

instances/thor/configuration.nix

@@ -1,5 +1,5 @@
 { lib, config, pkgs, ... }:
-with lib; {
+{
 
   age.secrets = {
     thor_wg_priv = { file = ../../secrets/thor_wg_priv.age; };
@@ -183,7 +183,7 @@ with lib; {
           };
         in
         {
-          bertof_home = recursiveUpdate common { SUBVOLUME = "/home/bertof"; };
+          bertof_home = lib.recursiveUpdate common { SUBVOLUME = "/home/bertof"; };
         };
     };
     thermald.enable = true;

instances/thor/hm.nix

@@ -8,62 +8,59 @@
     };
     packages = builtins.attrValues {
       inherit (pkgs)
+        authenticator
+        droidcam
         # electrum
         # element-desktop # matrix client
+        evince
         # evolution
         # freecad
-        # minecraft
-        # mycrypto
-        # pcmanfm
-        # pulseaudio
-        # shotwell       
-        # signal-desktop
-        # slack
-        # wineFull
-        arandr
-        authenticator
-        authy
-        discord
-        dmenu
-        docker-compose
-        docker-machine
-        droidcam
-        easyeffects
-        evince
-        filelight
         gallery-dl
-        geeqie
         google-chrome
         gucharmap
-        handbrake
-        httpie
         inkscape
         krita
+        # minecraft
+        # mycrypto
         openvpn
         p7zip
         pavucontrol
-        pcsx2
-        pentablet-driver
+        # pcmanfm
         procps
+        # pulseaudio
         pulseaudio
         # retroarchFull
+        # shotwell       
+        # signal-desktop
+        skypeforlinux
+        # slack
         spotify
         tdesktop
         thunderbird
         transmission-gtk
         virt-manager
         virt-viewer
+        # wineFull
         wireguard-tools
         xournalpp
-        zoom-us;
+        zoom-us
+        ;
       inherit (pkgs.gnome)
+        eog
+        file-roller
         # geary
         # gnome-boxes
         # gnome-calendar
+        gnome-font-viewer
+        gnome-screenshot
         # gnome-sound-recorder
+        gnome-system-monitor
         # seahorse
-        eog file-roller gnome-font-viewer gnome-screenshot gnome-system-monitor totem;
-      inherit (pkgs.unstable_pkgs) heroic skypeforlinux;
+        totem
+        ;
+      inherit (pkgs.unstable_pkgs)
+        heroic
+        ;
     };
   };
 
@@ -117,7 +114,7 @@
     ../../modules/hm/ncspot.nix
     ../../modules/hm/nix-index.nix
     ../../modules/hm/noti.nix
-    ../../modules/hm/nushell.nix
+    # ../../modules/hm/nushell.nix
     ../../modules/hm/obs-studio.nix
     ../../modules/hm/office.nix
     ../../modules/hm/pass.nix