From 8c30ba9fea5d171044bfa0282ba121af66e7d322 Mon Sep 17 00:00:00 2001
From: Jimbo <jimbo@nixfox.ca>
Date: Fri, 28 Feb 2025 13:52:18 -0500
Subject: [PATCH] Add proper password to Jules, other stuff ig

---
 flake.nix                                      |   2 +-
 system/accounts/users/custom/jimbo/default.nix |   9 +++++----
 system/accounts/users/custom/jules/default.nix |   7 ++++---
 system/devices/networking/default.nix          |   2 +-
 system/programs/doas/default.nix               |   2 +-
 system/secrets/default.nix                     | Bin 735 -> 865 bytes
 system/settings/default.nix                    |   1 -
 7 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/flake.nix b/flake.nix
index 3b2d960..e9a8e6b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -28,7 +28,7 @@
   }@inputs:
   {
     nixosConfigurations.rubble = nixpkgs.lib.nixosSystem {
-      modules = [ ./host ];
+      modules = [ ./system ];
       specialArgs = inputs;
     };
   };
diff --git a/system/accounts/users/custom/jimbo/default.nix b/system/accounts/users/custom/jimbo/default.nix
index 508f84c..dafbea9 100644
--- a/system/accounts/users/custom/jimbo/default.nix
+++ b/system/accounts/users/custom/jimbo/default.nix
@@ -1,11 +1,12 @@
-{ config, lib, pkgs, ... }:
+{ config, pkgs, ... }:
 {
   users.users.jimbo = {
-    hashedPassword = config.secrets.mainAccPass;
+    hashedPassword = config.secrets.jimboAccPass;
     isNormalUser = true;
+    createHome = true;
     openssh.authorizedKeys.keys = [
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC2lMkUd+BbXITE5LTg94hEzmA6UKsIIbaf5YOjGoLzl"
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIFGHaxdTeC1xnTx2BY5LLR5LxhdSkmYoWuOeEuRIz0k"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC2lMkUd+BbXITE5LTg94hEzmA6UKsIIbaf5YOjGoLzl Desktop"
+      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIFGHaxdTeC1xnTx2BY5LLR5LxhdSkmYoWuOeEuRIz0k Server"
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJahAoF74BY6GCTsFkt1ADKaraFgJJozW1Y1aBTLK0j9 Pixel9"
     ];
     extraGroups = [
diff --git a/system/accounts/users/custom/jules/default.nix b/system/accounts/users/custom/jules/default.nix
index 220cec0..f428f05 100644
--- a/system/accounts/users/custom/jules/default.nix
+++ b/system/accounts/users/custom/jules/default.nix
@@ -1,8 +1,9 @@
-{ config, lib, pkgs, ... }:
+{ config, pkgs, ... }:
 {
   users.users.jules = {
-    hashedPassword = config.secrets.mainAccPass;
+    hashedPassword = config.secrets.julesAccPass;
     isNormalUser = true;
+    createHome = true;
     openssh.authorizedKeys.keys = [
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHwxJcAWuHkKy/Ar37aIoqg34CDcZu7/bh978nYkOgzj jules@jules-pc"
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEOszCNP+6rkIS75GyFVhn9o6QpUuGdx/J4rjzROrpSl jules@xeta"
@@ -22,5 +23,5 @@
     shell = pkgs.fish;
   };
 
-  #home-manager.users.jimbo = import ../../../../../home/jimbo;
+  #home-manager.users.jules = import ../../../../../home/jules;
 }
diff --git a/system/devices/networking/default.nix b/system/devices/networking/default.nix
index 06f8613..34dfe97 100644
--- a/system/devices/networking/default.nix
+++ b/system/devices/networking/default.nix
@@ -1,4 +1,4 @@
-{ config, ... }:
+{ config, pkgs, ... }:
 {
   networking = {
     wireless = {
diff --git a/system/programs/doas/default.nix b/system/programs/doas/default.nix
index b92d09c..cd2e2dd 100644
--- a/system/programs/doas/default.nix
+++ b/system/programs/doas/default.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ pkgs, ... }:
 {
   security = {
     sudo.enable = false;
diff --git a/system/secrets/default.nix b/system/secrets/default.nix
index e3a32ce01539d47c012412d8e4f4247866374c28..d18b6b7286e58357c389ae3da294220ce4fed0cb 100644
GIT binary patch
literal 865
zcmV-n1D^Z<M@dveQdv+`0CtVtO$bJR=mU)4+XJUDw@qB^7<hP1t5;_@8=@Y<(~IiU
z)qlgZMzJY@Gr@w5X_B0ma7L=s^u&LSt>_^nAeSQj&USb}lLO;8ZNDGiMno|0WTa^|
zz^+RtCRSw9^Iyf=)MRPxeKgb*;Z2w3ghy?!f*W3o@Xi-)Sw;&|5<j%`ui*ml8P#%j
zFJ|BmwT737M@zH2KEc9fN-Po9L?%h5X#vk-kO#c1cU7Z{U<a_|q3TG-ztOcqyh4kD
z+lR!IVL6tS9LF|6Y4V~|X-K3veoE0;)VJfosGU5p9)o%<xp|B$L#tDwR`D!FnbnsI
z!eXjFzMFB2F=k*A!ehONsUBp$%lME^g>DOX4#8-lEKhcr9Ub3?xJff~liWVVhb_-k
zjYTDNs=?1z2EO~FfH{zQYrGs#K=7Q-pV$3ijV09AKQaBF-++RvZF&I@E#%0rYF<E-
z!lST#<}u_G@8YSrI|nsRUI?Xbq+Nl%T=G90Y)jaLJELMQQr!-Bi+NY=!_}ui8$xIE
zhyRQ&yI&l$=nDwTpYYTkpSfW$_wC^?9u=><i;3JuJp9#vntBtU=694EO%~7OZyDaz
zYcyeH@%f!O7FYg;^RydMO!4A&1J|IjOoiy;FZE_wT>sBWQjFm*vx?U-4=^mGmCex=
zOvXuWf6X_yt6+in|7$M89L2^0lt5lN`4!4GME07rz$0;B5501n?bS~lG(%u@*plPM
z|3OEY<yn|tBcP7C0hc^m)xn5?FH`BZ4tIv>W_gJU@CR@IRe)Slx(Pp%tpqJ3uMM8N
z>F~b>f|j`a3s@Wd@jSWmUF6O2PF@J=V$4Q{nf6DH`vp-bl9r}Wp+&#sF)~bl821%J
zHsre8cx0UEVOS$X<E{LL4X?Srr98SuaBQn!1C1v?ZPB-EWVZw@x`U?!*HSZxJeFxr
z$HhF^zY5Nj)D#0|Tuv^NLw1&@B7EG=s+bh~;_9Bay9eq0)N-yck(fnEAI@+rPXM`%
zXt#Z!Q-CNu?LWg^rgZoMGKsFq7aknw;@KUzFXhZdR_r77`SM$E(zQYw6xnDgdj3qv
r+TN}Xb#Qq7)T2}lGnJ+pA;qNO+YC=mjAcx(J3rO_&5)6(T}^D>U_`R5

literal 735
zcmV<50wDbWM@dveQdv+`0NN2OPmPGNrG<`7e?+UQi@n#<x1azPZ$x>e>hG_Cqdp&b
zp%}54BI<S1|9y|(!gI_jezoTD6-ID9)}7)dC)$<+oo>BEJVjysq)W}W?z>Yr*N&y6
zJ(P6W_oygol82tw{}E|}RGOR-Q+%GKZ5|G7ktlv1|4^0ht$8a_9i&FxAvq~BzES>x
z=P6dP(=m)85Y{PKKDk{9P`*@kVy=x|)`1@w+OFqz`|zI$Z{GP~14KZAR$EzbUX?JV
zSWD2;A2rxVvMd}|4o;lNJZ2>(uUDf9tr8j@VsGYi1H!)*;u&XywLas}{GmGac%o{?
zLxtf3W_rHdUG-<L)xM^wUFCXrNaDXu$e3@<Sm^H@0LJk*9UssS*Y-)e%>-IgC|Gxv
z*|njml;b#PiVWT8*1Z0Fe9MC$NRgA!BI3CFT!B?h_UkOUv*bb8F7#@jz1x}ozvaY!
z@~#!E#&CvvBHs+bdIaJ(gWpYmisZ4Maz&wGRVP;Ca}T(CoAHXWj|^Y@c0?CB3((n#
z+?E854p%c;lFFH$w(BUg)8gx)xvg2JlBQ35GFMM<!lC@9qRY>9{VTI-#K}I=n+AXs
zW{G-LM0S=E6ltTKQ2Pwsd3qah&QRvJAOy9YF{@H4a)bcxl>KWZvC_M+!Iq|hwYB1q
zy$Ojn?cm^{);0?0=r}N6EK^k#RZ)A*j6{=HSY$V>2F8|LZIq%T67RlTae%*r4I>Jh
zq4NLOoa;F>NwU&brt(J=s~1V!#pLl!RV$L6!Yd7tsp!(wjLgiy-%{=7X9FMAb27a@
z+99nUb2`hP?ZzC1=?&eWli@n{b+QQB8m{{XXP|HyFU^sGX^kg@6kaVpy4<CrkC_YN
zseA_D0~GTlg!8NwRgrP1u|JWCHXC`p`7yTHHqai~=X}L82?R9O7*+6upv>>U>1T?d
Rr~YGu<7lV2=-)_lw$1OJdLaM+

diff --git a/system/settings/default.nix b/system/settings/default.nix
index 666a961..929060e 100644
--- a/system/settings/default.nix
+++ b/system/settings/default.nix
@@ -3,7 +3,6 @@
   imports = [
     ./minimal
     ./nix
-    ./security
     ./timezone
   ];
 }