From f3b4eb3ca320f29a90cb6237505fa33ed7972d87 Mon Sep 17 00:00:00 2001
From: Julian Sutter <jsutter@symbiotip.com>
Date: Sun, 7 Apr 2024 23:06:52 -0700
Subject: [PATCH] working i think

---
 flake.lock         | 16 ----------------
 flake.nix          |  6 +++---
 systems/common.nix |  7 ++-----
 3 files changed, 5 insertions(+), 24 deletions(-)
 mode change 100755 => 100644 flake.lock

diff --git a/flake.lock b/flake.lock
old mode 100755
new mode 100644
index a723578..7220113
--- a/flake.lock
+++ b/flake.lock
@@ -7,19 +7,11 @@
         ]
       },
       "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": {
@@ -30,19 +22,11 @@
     },
     "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": {
diff --git a/flake.nix b/flake.nix
index 7f978c9..ee1cea3 100755
--- a/flake.nix
+++ b/flake.nix
@@ -44,9 +44,9 @@
         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
         ];
diff --git a/systems/common.nix b/systems/common.nix
index 4440a78..a48ec2a 100755
--- a/systems/common.nix
+++ b/systems/common.nix
@@ -55,10 +55,7 @@
   nixpkgs.config.allowUnfree = true;
 #  nixpkgs.config.nvidia.acceptLicense = true;
 #  nixpkgs.config.nvidia.libsOnly = false;
-<<<<<<< HEAD
-=======
-#  nixpkgs.config.allowBroken = true;
->>>>>>> b91a29b (plasma6)
+  nixpkgs.config.allowBroken = true;
 
   # Location & internationalisation
   time.timeZone = "America/Los_Angeles";
@@ -128,7 +125,7 @@
     kopia
   ];
 
- # services.flatpak.enable = true;
+  services.flatpak.enable = true;
 
   fonts.packages = with pkgs; [
     nerdfonts