Merge branch 'overhaul' of ssh://solis:34916/Koen/nix-config into overhaul

modules/apps/visual/default.nix

@@ -29,14 +29,11 @@ in {
     environment.systemPackages = with pkgs; [
       bitwarden-desktop
       blender
-      gnome-calculator
       inkscape
       kitty
       krita
       libreoffice
       mullvad-vpn
-      zathura
-      parsec-bin
       qbittorrent
       reaper
       signal-desktop
@@ -44,6 +41,7 @@ in {
       spotify
       vesktop
       vlc
+      zathura
     ];
 
     fonts.packages = with pkgs; [

modules/base/secrets.nix

@@ -20,7 +20,6 @@ in {
 
     age.secrets = {
       wifi.file = secretFile "wifi.age";
-      tailscale.file = secretFile "tailscale.age";
 
       personalSSHpub = {
         file = secretFile "ssh/id_personal.pub.age";

modules/default.nix

@@ -9,14 +9,14 @@
 in {
   imports = [
     ./apps
+    ./base
+    ./boot
+    ./catppuccin
     ./hardware
     ./network
-    ./wm
-    ./users
-    ./boot
-    ./base
     ./timers
-    ./catppuccin
+    ./users
+    ./wm
   ];
 
   options = {

modules/network/tailscale.nix

@@ -15,7 +15,6 @@ in {
   config = mkIf cfg.enable {
     services.tailscale = {
       enable = true;
-      authKeyFile = toString config.age.secrets.tailscale.path;
     };
   };
 }

secrets.nix

@@ -12,7 +12,6 @@ let
 
   secrets = [
     "wifi"
-    "tailscale"
     "ssh/id_personal"
     "ssh/id_personal.pub"
     "ssh/id_github"

secrets/tailscale.age

@@ -1,18 +0,0 @@
------BEGIN AGE ENCRYPTED FILE-----
-YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IC9tczZkdyBSYVo1
-NnEzRDE2ZmYra1RtQXY4Y0gvZzI4eUh1aHNDYmhWVWppQSt6SUNjCko0N3FMbTB6
-c1JLVDlpTzIzMm4vUzVnYy9nVG4rM2tmWVBnTFUyekVUcGcKLT4gc3NoLWVkMjU1
-MTkgZ1BJZFpBIC9yU0I5V25KK2xOVXFwdzFKcGpDQnlxWE85MG5GWlNoWVByc3Js
-dWVkVE0KN3hjSk5hdThwRnFTSmpjaHFBcC9sS3pKcFZUVXc4SlRiRmZla25ZRGgx
-WQotPiBzc2gtZWQyNTUxOSBXeUlGekEgU3o5ZVZmRk1qU3RQWU5lcGZmOEQwaTFV
-THBILzdaTHJrdGk4dHBOcW1WcworaXdaQ2hudzN4QWpreVI5ODI0Wm5KaG9MdHZ1
-NTRkSWNOcm8vbm5mVnNNCi0+IHNzaC1lZDI1NTE5IGRiT2VoQSA5ZDd4WnVRWkZs
-ZkhSSENDN2dWTlIxU1AwYk91TlZXdzRXMWdvQnVlaDJJClNPVUllb2VvaXlrc3BZ
-WDNQRjJjZ245V0NoU0M3TWNoNGFaQlE0ZmhnaEUKLT4gc3NoLWVkMjU1MTkgdHYv
-Q3pnIGJRZGhYT0lFd2JpaVZBZ3RNU0tqeCtBNmFrL0ZxcllmY2l2NTJ1a0NTZ28K
-SGxUMFArdTVpZlZaczl1VXdwekhoaWJCL1ozWEdtbzVkRTd2VzJYSTBSVQotPiBf
-UHxxLWdyZWFzZSBkbl9HTzphJCBNMUJSPDYKZEFnM1dndldYZUdXQWcKLS0tIFBi
-dlh6NVJDQmxYRHp2dkFVZ2hZZWg2YzF0bkFCMVpYQ1BwZkV4MDdJNGsKpoI5F0s7
-Um6NEB1i9vneoxu6TXmHgoj043vzFTlu8Hs2B0jYm2BcLNd7DBCtLOcmsV6QY4p4
-C9Vl53srH+s6yrp4jv85aP26sdjTg24CuXje/N0GYjiAJJUpWsEUWw==
------END AGE ENCRYPTED FILE-----