integrated betsy with flake

2 files changed, 27 insertions, 2 deletions

diff --git a/flake.nix b/flake.nix
index 2ddb2e6..7f626d6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -271,6 +271,31 @@
         ];
         # specialArgs = { inherit inputs; };
       };
+      betsy = nixpkgs.lib.nixosSystem { # this is my work laptop
+        modules = [
+          ./machines/betsy/configuration.nix
+          # lix-module.nixosModules.default
+
+          ./modules/nixos/hyprland.nix
+
+          ./modules/nixos/bluetooth.nix
+          ./modules/nixos/nix-common.nix
+          ./modules/nixos/environment.nix
+          ./modules/nixos/tailscale.nix
+          ./modules/nixos/system-packages.nix
+          ./modules/nixos/services.nix
+
+          ./modules/users/defin.nix
+          ./modules/users/root.nix
+
+          home-manager.nixosModules.home-manager {
+            home-manager.useGlobalPkgs = true;
+            home-manager.useUserPackages = true;
+            home-manager.users.defin = import ./home-manager/default.nix;
+            home-manager.extraSpecialArgs = { inherit inputs; };
+          }
+        ];
+      };
       doretta = nixpkgs.lib.nixosSystem { # this is my build server
         modules = [
           ./machines/doretta/configuration.nix
diff --git a/modules/nixos/services.nix b/modules/nixos/services.nix
index d0ec1fe..f7c22ba 100644
--- a/modules/nixos/services.nix
+++ b/modules/nixos/services.nix
@@ -15,7 +15,7 @@
 
     displayManager = {
       sddm = {
-        enable = true;
+        # enable = true;
         autoNumlock = true;
       };
       # defaultSession = "plasmawayland";
@@ -24,7 +24,7 @@
     # localtimed.enable = true;
 
     # Enable the Plasma 6 Desktop Environment.
-    desktopManager.plasma6.enable = true;
+    # desktopManager.plasma6.enable = true;
 
     # Enable the X11 windowing system.
     xserver.enable = true;