several improvements to desktop

configs/thilo-pc/hardware-configuration.nix

@@ -15,21 +15,24 @@
 
   boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-amd" ];
+  boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
 
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/caa83e18-f2f2-46f9-8c27-0842c3051dc1";
+    { device = "/dev/disk/by-uuid/ecc9110a-4510-4a67-9227-021e146b59ca";
-      fsType = "btrfs";
+      fsType = "ext4";
-      options = [ "subvol=@" ];
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/DADB-44A9";
+    { device = "/dev/disk/by-uuid/230E-6756";
       fsType = "vfat";
       options = [ "fmask=0077" "dmask=0077" ];
     };
 
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/9ad760a9-34e4-4858-96e6-98c7a8e497a4"; }
+    ];
+
   fileSystems = {
     "/data" = {
       device = "/dev/disk/by-uuid/a13a2cfa-12af-463d-ae5c-d46c881fcdd6";

configs/thilo-pc/home.nix

@@ -46,10 +46,10 @@
       ];
 
       programs.distrobox = {
-        enable = lib.mkForce true;
+        enable = true;
         containers = {
           arch = {
-            image = "arch-toolbox";
+            image = "quay.io/toolbx/arch-toolbox";
             additional_packages = "python python-pip nodejs";
             volume = "/etc/static/profiles/per-user:/etc/profiles/per-user:ro";
             replace = true;

configs/thilo-pc/nixos.nix

@@ -23,6 +23,7 @@
       grub = {
         efiSupport = true;
         device = "nodev";
+        useOSProber = true;
       };
       efi.canTouchEfiVariables = true;
     };
@@ -174,6 +175,7 @@
           autoStart = true;
           enable = true;
           user = "thilo";
+          desktopSession = "plasma";
         };
       };
     };

flake.nix

@@ -12,8 +12,6 @@
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    dagger.url = "github:dagger/nix";
-    dagger.inputs.nixpkgs.follows = "nixpkgs";
     nixgl = {
       url = "github:guibou/nixGL";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -57,7 +55,7 @@
       };
     in
     {
-      nixosConfigurations.thilo-pc = nixpkgs.lib.nixosSystem {
+      nixosConfigurations."thilo-pc" = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         modules = [
           home-manager.nixosModules.home-manager

home-manager/modules/machine.nix

@@ -31,6 +31,7 @@ with lib;
     ./../programs/hstr.nix
     ./../programs/thefuck.nix
     ./../programs/ssh.nix
+    ./../programs/vscode.nix
     ./../programs/zed.nix
     ./../../nix.nix
     ./packages.nix

home-manager/modules/packages.nix

@@ -14,14 +14,6 @@ let
 in
 {
   config = {
-    nixpkgs.overlays = [
-      (_: prev: {
-        quickemu = prev.quickemu.overrideAttrs (old: {
-          patches = (old.patches or [ ]) ++ [ ./../patches/quickemu.patch ];
-        });
-      })
-    ];
-
     home.packages =
       with pkgs;
       [
@@ -70,12 +62,11 @@ in
         ncdu
         devenv
         inputs.nixpkgs-update.packages.x86_64-linux.nixpkgs-update
-        inputs.dagger.packages.x86_64-linux.dagger
+        nixpkgs-review
         unzip
         nil
         nixd
         unrar
-        # inputs.w17.packages.x86_64-linux.default
         nix-output-monitor
         nodePackages.pnpm
         npm-check-updates
@@ -136,10 +127,8 @@ in
             bottles
             protontricks
             heroic
-            (vscode.override { commandLineArgs = electronFlags; })
             quickemu
             quickgui
-            trilium-desktop
             anki
             muse-sounds-manager
             jetbrains-toolbox
@@ -160,6 +149,7 @@ in
             telegram-desktop
             thunderbird
             gearlever
+            kdePackages.merkuro
           ]
         else
           [ ]

home-manager/programs/firefox.nix

@@ -1,7 +1,7 @@
 { config, ... }:
 
 {
-  programs.firefox = {
+  programs.floorp = {
     enable = if (config.machine.isGraphical && !config.machine.isGeneric) then true else false;
   };
 }

home-manager/programs/topgrade.nix

@@ -25,6 +25,7 @@ in
           "nix"
           "uv"
         ];
+        nix_arguments = "--builders \"\"";
       };
       git.repos = [ configPath ];
       firmware = {

home-manager/programs/vscode.nix

@@ -0,0 +1,5 @@
+{
+  programs.vscode = {
+    enable = true;
+  };
+}