merge test

2025-04-30 13:41:48 +02:00
parent e257ff991d 7fb65ea258
commit 4364cc2d16
25 changed files with 1381 additions and 167 deletions
--- a/flake.nix
+++ b/flake.nix
@@ -40,7 +40,10 @@
          home-manager.nixosModules.home-manager
          {
            home-manager = {
+<<<<<<< HEAD
              #useGlobalPkgs = true;
+=======
+>>>>>>> test
              useUserPackages = true;
              extraSpecialArgs = { inherit inputs; };
              users.elias = import ./home/default-laptop.nix;
@@ -68,7 +71,10 @@
          home-manager.nixosModules.home-manager
          {
            home-manager = {
+<<<<<<< HEAD
              #useGlobalPkgs = true;
+=======
+>>>>>>> test
              useUserPackages = true;
              extraSpecialArgs = { inherit inputs; };
              users.elias = import ./home/default-desktop.nix;