From 9b520878c49d059ae2ad2957ecb139d420e9970b Mon Sep 17 00:00:00 2001
From: Leyla Becker <git@jan-leila.com>
Date: Tue, 3 Sep 2024 14:24:11 -0500
Subject: [PATCH] restricted more of leylas configs behind full user

---
 hosts/horizon/configuration.nix  |  6 +++---
 hosts/twilight/configuration.nix |  6 +++---
 users/ester/default.nix          |  6 +++---
 users/eve/default.nix            |  6 +++---
 users/leyla/default.nix          |  8 ++++----
 users/leyla/packages.nix         | 14 +++++++-------
 6 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/hosts/horizon/configuration.nix b/hosts/horizon/configuration.nix
index 79fa555..d28ca5b 100644
--- a/hosts/horizon/configuration.nix
+++ b/hosts/horizon/configuration.nix
@@ -16,9 +16,9 @@
 
   sops.age.keyFile = "/home/leyla/.config/sops/age/keys.txt";
 
-  users.leyla.isNormalUser = true;
-  users.ester.isNormalUser = true;
-  users.eve.isNormalUser = true;
+  users.leyla.isFullUser = true;
+  users.ester.isFullUser = true;
+  users.eve.isFullUser = true;
 
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
diff --git a/hosts/twilight/configuration.nix b/hosts/twilight/configuration.nix
index 88cd750..34e6922 100644
--- a/hosts/twilight/configuration.nix
+++ b/hosts/twilight/configuration.nix
@@ -17,14 +17,14 @@
   sops.age.keyFile = "/home/leyla/.config/sops/age/keys.txt";
 
   users.leyla = {
-    isNormalUser = true;
+    isFullUser = true;
     hasPiperMouse = true;
     hasOpenRGBHardware = true;
     hasViaKeyboard = true;
     hasGPU = true;
   };
-  users.ester.isNormalUser = true;
-  users.eve.isNormalUser = true;
+  users.ester.isFullUser = true;
+  users.eve.isFullUser = true;
 
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
diff --git a/users/ester/default.nix b/users/ester/default.nix
index 0f7f3be..4850e0f 100644
--- a/users/ester/default.nix
+++ b/users/ester/default.nix
@@ -4,11 +4,11 @@ let
 in
 {
   options.users.ester = {
-    isNormalUser = lib.mkEnableOption "ester";
+    isFullUser = lib.mkEnableOption "ester";
   };
 
   config = {
-    sops.secrets = lib.mkIf cfg.isNormalUser {
+    sops.secrets = lib.mkIf cfg.isFullUser {
       "passwords/ester" = {
         neededForUsers = true;
         # sopsFile = ../secrets.yaml;
@@ -25,7 +25,7 @@ in
       }
 
       (
-        if cfg.isNormalUser then {
+        if cfg.isFullUser then {
           isNormalUser = true;
           extraGroups = [ "networkmanager" ];
 
diff --git a/users/eve/default.nix b/users/eve/default.nix
index d5b6f29..bf2b51b 100644
--- a/users/eve/default.nix
+++ b/users/eve/default.nix
@@ -4,11 +4,11 @@ let
 in
 {
   options.users.eve = {
-    isNormalUser = lib.mkEnableOption "eve";
+    isFullUser = lib.mkEnableOption "eve";
   };
 
   config = {
-    sops.secrets = lib.mkIf cfg.isNormalUser {
+    sops.secrets = lib.mkIf cfg.isFullUser {
       "passwords/eve" = {
         neededForUsers = true;
         # sopsFile = ../secrets.yaml;
@@ -25,7 +25,7 @@ in
       }
 
       (
-        if cfg.isNormalUser then {
+        if cfg.isFullUser then {
           isNormalUser = true;
           extraGroups = [ "networkmanager" ];
 
diff --git a/users/leyla/default.nix b/users/leyla/default.nix
index 7d679cc..a887dfb 100644
--- a/users/leyla/default.nix
+++ b/users/leyla/default.nix
@@ -8,7 +8,7 @@ in
   ];
 
   options.users.leyla = {
-    isNormalUser = lib.mkEnableOption "create usable leyla user";
+    isFullUser = lib.mkEnableOption "create usable leyla user";
     isThinUser = lib.mkEnableOption "create usable user but witohut user applications";
     hasPiperMouse = lib.mkEnableOption "install programs for managing piper supported mouses";
     hasOpenRGBHardware = lib.mkEnableOption "install programs for managing openRGB supported hardware";
@@ -17,7 +17,7 @@ in
   };
 
   config = {
-    sops.secrets = lib.mkIf cfg.isNormalUser {
+    sops.secrets = lib.mkIf cfg.isFullUser {
       "passwords/leyla" = {
         neededForUsers = true;
         # sopsFile = ../secrets.yaml;
@@ -34,7 +34,7 @@ in
       }
 
       (
-        if (cfg.isNormalUser || cfg.isThinUser) then {
+        if (cfg.isFullUser || cfg.isThinUser) then {
           isNormalUser = true;
           extraGroups = lib.mkMerge [
             ["networkmanager" "wheel" "docker"]
@@ -50,6 +50,6 @@ in
       )
     ];
 
-    home-manager.users.leyla = lib.mkIf (cfg.isNormalUser || cfg.isThinUser) (import ./home.nix);
+    home-manager.users.leyla = lib.mkIf (cfg.isFullUser || cfg.isThinUser) (import ./home.nix);
   };
 }
\ No newline at end of file
diff --git a/users/leyla/packages.nix b/users/leyla/packages.nix
index 7c27a09..a1332cc 100644
--- a/users/leyla/packages.nix
+++ b/users/leyla/packages.nix
@@ -8,21 +8,21 @@ in
     ../../overlays/vscodium.nix
   ];
 
-  programs.bash.shellAliases = {
+  programs.bash.shellAliases = lib.mkIf cfg.isFullUser ({
     code = "codium";
-  };
+  });
 
-  programs.steam = {
+  programs.steam = lib.mkIf cfg.isFullUser ({
     enable = true;
     remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
     dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
-  };
+  });
 
-  programs.noisetorch.enable = true;
+  programs.noisetorch.enable = cfg.isFullUser;
 
-  programs.adb.enable = true;
+  programs.adb.enable = cfg.isFullUser;
 
-  users.users.leyla.packages = lib.mkIf (cfg.isNormalUser || cfg.isThinUser) (
+  users.users.leyla.packages = lib.mkIf (cfg.isFullUser || cfg.isThinUser) (
     lib.mkMerge [
       (
         with pkgs; [