Merge branch 'nixos' into nixos-work

hosts/nixos-desktop/default.nix

@@ -22,6 +22,7 @@
       impermanence.enable = true;
       webis.enable = true;
     };
+    programs.prismlauncher.enable = true;
     services.wallpaper.enable = true;
   };
 
@@ -30,6 +31,19 @@
     stable.calibre # NOTE: breaks often in unstable
   ];
 
+  home-manager.users.moritz.services.kanshi.settings = [
+    {
+      profile.name = "default";
+      profile.outputs = [
+        {
+          adaptiveSync = true;
+          criteria = "*";
+          scale = 1.2;
+        }
+      ];
+    }
+  ];
+
   hardware = {
     keyboard.qmk.enable = true;
     nvidia = {

hosts/nixos-laptop/default.nix

@@ -22,6 +22,7 @@
     };
     terminal.package = pkgs.kitty;
     programs.exercism.enable = true;
+    services.mullvad.enable = true;
   };
 
   users.users.moritz.packages = [ pkgs.poetry ];