plasma6

flake.lock

@@ -7,11 +7,19 @@
         ]
       },
       "locked": {
+<<<<<<< HEAD
         "lastModified": 1711133180,
         "narHash": "sha256-WJOahf+6115+GMl3wUfURu8fszuNeJLv9qAWFQl3Vmo=",
         "owner": "nix-community",
         "repo": "home-manager",
         "rev": "1c2c5e4cabba4c43504ef0f8cc3f3dfa284e2dbb",
+=======
+        "lastModified": 1712462372,
+        "narHash": "sha256-WA3bbBWhd3o1wAgyHZNypjb/LG4oq+IWxFq8ey8yNPU=",
+        "owner": "nix-community",
+        "repo": "home-manager",
+        "rev": "a561ad6ab38578c812cc9af3b04f2cc60ebf48c9",
+>>>>>>> b91a29b (plasma6)
         "type": "github"
       },
       "original": {
@@ -22,11 +30,19 @@
     },
     "nixpkgs": {
       "locked": {
+<<<<<<< HEAD
         "lastModified": 1711163522,
         "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=",
         "owner": "NixOS",
         "repo": "nixpkgs",
         "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4",
+=======
+        "lastModified": 1712439257,
+        "narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599",
+>>>>>>> b91a29b (plasma6)
         "type": "github"
       },
       "original": {

flake.nix

@@ -36,7 +36,7 @@
         ./modules/virtualization.nix
         ./modules/office.nix
         ./modules/gaming.nix
-        ./modules/3dprinting.nix
+#        ./modules/3dprinting.nix
         ];
       };
       labby = nixpkgs.lib.nixosSystem {
@@ -44,11 +44,11 @@
         modules = [
         ./systems/common.nix
         ./systems/labby.nix
-        ./users/jsutter.nix
-        ./users/isutter.nix
-        ./users/aksutter.nix
+#        ./users/jsutter.nix
+#        ./users/isutter.nix
+#        ./users/aksutter.nix
         ./modules/plasma.nix
-        ./modules/3dprinting.nix
+#        ./modules/3dprinting.nix
         ];
       };
     };

modules/plasma.nix

@@ -2,9 +2,9 @@
 
 {
   services.xserver.enable = true;
-  services.xserver.displayManager.sddm.enable = true;
-  services.xserver.desktopManager.plasma5.enable = true;
-  environment.plasma5.excludePackages = with pkgs.libsForQt5; [
+#  services.xserver.displayManager.sddm.enable = true;
+  services.desktopManager.plasma6.enable = true;
+  environment.plasma6.excludePackages = with pkgs.kdePackages; [
     khelpcenter
   ];
 

systems/common.nix

@@ -55,6 +55,10 @@
   nixpkgs.config.allowUnfree = true;
 #  nixpkgs.config.nvidia.acceptLicense = true;
 #  nixpkgs.config.nvidia.libsOnly = false;
+<<<<<<< HEAD
+=======
+#  nixpkgs.config.allowBroken = true;
+>>>>>>> b91a29b (plasma6)
 
   # Location & internationalisation
   time.timeZone = "America/Los_Angeles";
@@ -106,9 +110,9 @@
     gnupg
     p7zip
     rsync
-    bumblebee
-    glxinfo
-    libgdiplus
+ #   bumblebee
+ #   glxinfo
+ #   libgdiplus
     unzip
     clinfo
     python3
@@ -124,7 +128,7 @@
     kopia
   ];
 
-  services.flatpak.enable = true;
+ # services.flatpak.enable = true;
 
   fonts.packages = with pkgs; [
     nerdfonts

users/jsutter.nix

@@ -40,6 +40,8 @@ in
       signal-desktop
       putty
       rpi-imager
+      discord
+      stremio
     ];
   };