From 7d0948851328c6f987d7459ba707e9fab24a535c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20B=C3=A4dorf?= <hello@benjaminbaedorf.eu>
Date: Sat, 28 Jan 2023 22:34:24 +0100
Subject: [PATCH] Fix main merge

---
 flake.lock                  | 36 +++++++++++++++++++++++++++++++++++-
 flake.nix                   | 18 +++++++++++++++++-
 profiles/gaming/default.nix |  4 ----
 3 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/flake.lock b/flake.lock
index f62e3e63..591491cb 100644
--- a/flake.lock
+++ b/flake.lock
@@ -308,6 +308,22 @@
         "type": "github"
       }
     },
+    "master": {
+      "locked": {
+        "lastModified": 1674941334,
+        "narHash": "sha256-hLNilB0cO4KTUhqOLRfuJMakmNyitKUfj37u1DtRX6w=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "327dc97d8708c65bde5e41e210c335df4e18c3bb",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "master",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "naersk": {
       "inputs": {
         "nixpkgs": [
@@ -437,6 +453,22 @@
         "type": "indirect"
       }
     },
+    "pub-solar": {
+      "locked": {
+        "lastModified": 1654372286,
+        "narHash": "sha256-z1WrQkL67Sosz1VnuKQLpzEkEl4ianeLpWJX8Q6bVQY=",
+        "owner": "pub-solar",
+        "repo": "nixpkgs",
+        "rev": "4995a873a796c54cc49e5dca9e1d20350eceec7b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "pub-solar",
+        "ref": "fix/use-latest-unstable-yubikey-agent",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "agenix": "agenix",
@@ -446,11 +478,13 @@
         "flake-compat": "flake-compat_3",
         "home": "home",
         "latest": "latest_2",
+        "master": "master",
         "naersk": "naersk",
         "nixos": "nixos",
         "nixos-generators": "nixos-generators",
         "nixos-hardware": "nixos-hardware",
-        "nur": "nur"
+        "nur": "nur",
+        "pub-solar": "pub-solar"
       }
     },
     "utils": {
diff --git a/flake.nix b/flake.nix
index 63158055..35a55e07 100644
--- a/flake.nix
+++ b/flake.nix
@@ -37,6 +37,9 @@
     nixos-hardware.url = "github:nixos/nixos-hardware";
 
     nixos-generators.url = "github:nix-community/nixos-generators";
+
+    master.url = "github:nixos/nixpkgs/master";
+    pub-solar.url = "github:pub-solar/nixpkgs/fix/use-latest-unstable-yubikey-agent";
   };
 
   outputs = {
@@ -131,6 +134,13 @@
             iso = base ++ [base-user graphical pub-solar-iso];
             pubsolaros = [full-install base-user users.root];
             anonymous = [pubsolaros users.pub-solar];
+
+            b12f = pubsolaros ++ [users.ben social gaming mobile];
+            biolimo = b12f ++ [graphical];
+            chocolatebar = b12f ++ [graphical virtualisation];
+
+            yule = pubsolaros ++ [users.yule];
+            droppie = yule ++ [];
           };
         };
       };
@@ -146,6 +156,8 @@
         };
         users = {
           pub-solar = {suites, ...}: {imports = suites.base;};
+          ben = {suites, ...}: {imports = suites.base;};
+          yule = {suites, ...}: {imports = suites.base;};
         }; # digga.lib.importers.rakeLeaves ./users/hm;
       };
 
@@ -153,6 +165,10 @@
 
       homeConfigurations = digga.lib.mkHomeConfigurations self.nixosConfigurations;
 
-      deploy.nodes = digga.lib.mkDeployNodes self.nixosConfigurations {};
+      deploy.nodes = digga.lib.mkDeployNodes self.nixosConfigurations {
+        droppie = {
+          sshUser = "yule";
+        };
+      };
     };
 }
diff --git a/profiles/gaming/default.nix b/profiles/gaming/default.nix
index 53cbe212..48c7f6f7 100644
--- a/profiles/gaming/default.nix
+++ b/profiles/gaming/default.nix
@@ -8,8 +8,4 @@
   inherit (lib) fileContents;
 in {
   pub-solar.gaming.enable = true;
-<<<<<<< HEAD
-=======
-  pub-solar.docker.enable = true;
->>>>>>> main
 }