From 6799ee3baa1bb40278ea14d22c5bb43609b78d86 Mon Sep 17 00:00:00 2001
From: Artemis Tosini <me@artem.ist>
Date: Wed, 2 Dec 2020 04:17:30 +0000
Subject: [PATCH] Change subuid, add brlaser workaround

---
 configuration.nix       | 16 ++++++++++++++--
 packages.nix            |  5 -----
 sets/virtualization.nix |  4 ++--
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/configuration.nix b/configuration.nix
index 0375de9..1054b8e 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -57,7 +57,17 @@
     ];
     printing = {
       enable = true;
-      drivers = [ pkgs.brlaser ];
+      drivers = [
+        (pkgs.brlaser.overrideAttrs (old: {
+          patches = [
+            (pkgs.fetchpatch {
+              name = "l2300d-fix.patch";
+              url = "https://patch-diff.githubusercontent.com/raw/pdewacht/brlaser/pull/68.patch";
+              sha256 = "07iqv048q0iplghn0aamjslyixw1p5jbk004i20xnl1vs95nyqzy";
+            })
+          ];
+        }))
+      ];
     };
   };
 
@@ -87,9 +97,11 @@
       isNormalUser = true;
       description = "Artemis Tosini";
       uid = 1000;
-      extraGroups = [ "wheel" "docker" "lxd" ];
+      extraGroups = [ "wheel" ];
+      group = "artemis";
       # hashedPassword set in private
     };
+    groups.artemis.gid = config.users.artemis.uid;
     mutableUsers = false;
   };
   systemd.extraConfig = "DefaultLimitCORE=infinity";
diff --git a/packages.nix b/packages.nix
index 7f89a3e..4b306f2 100644
--- a/packages.nix
+++ b/packages.nix
@@ -160,9 +160,7 @@ in
     firefox-wayland
 
     # Communication
-    discord
     signal-desktop
-    slack
     tdesktop
 
     # Gnome configuration
@@ -175,9 +173,6 @@ in
     numix-icon-theme
     numix-icon-theme-circle
 
-    # Games
-    steam-run
-
     # Dictionaries
   ]) ++ (with pkgs.hunspellDicts; [
     en-us-large
diff --git a/sets/virtualization.nix b/sets/virtualization.nix
index 7f4cbc7..eab3fe6 100644
--- a/sets/virtualization.nix
+++ b/sets/virtualization.nix
@@ -11,9 +11,9 @@
 
   users.users = {
     artemis.extraGroups = [ "docker" "lxd" ];
-    root = {
+    lxd = {
       subUidRanges = [{ startUid = 16777216; count = 16777216; } { startUid = config.users.users.artemis.uid; count = 1; }];
-      subGidRanges = [{ startGid = 16777216; count = 16777216; } { startGid = 100; count = 1; }];
+      subGidRanges = [{ startGid = 16777216; count = 16777216; } { startGid = 100; count = 1; } { startGid = config.users.groups.artemis.gid; count = 1; }];
     };
   };
 }