Merge branch 'main' of https://github.com/thilobillerbeck/dotfiles

home-manager/modules/machine.nix

@@ -32,6 +32,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;
       [
@@ -66,19 +58,15 @@ in
         ddev
         act
         mkcert
-        # pulumi
         kubectl
-        pulumiPackages.pulumi-language-nodejs
         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
-        aichat
         nix-output-monitor
         nodePackages.pnpm
         npm-check-updates
@@ -94,8 +82,6 @@ in
 
         php
         (lib.hiPrio phpPackages.composer)
-
-        nixfmt-rfc-style
       ]
       ++ (
         if (!config.machine.isGeneric) then
@@ -141,10 +127,8 @@ in
             bottles
             protontricks
             heroic
-            (vscode.override { commandLineArgs = electronFlags; })
             quickemu
             quickgui
-            trilium-desktop
             anki
             muse-sounds-manager
             jetbrains-toolbox
@@ -155,7 +139,6 @@ in
             inkscape
             musescore
             obsidian
-            syncthingtray
             reaper
             yabridge
             torzu
@@ -166,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/syncthing.nix

@@ -1,5 +1,5 @@
 {
   services.syncthing = {
-    enable = true;
+    enable = 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;
+  };
+}