summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.nix2
-rw-r--r--home-manager/users/thinkpad-laptop/lucia.nix (renamed from home-manager/users/thinkpad-laptop/lucas.nix)8
-rw-r--r--nixos/systems/prodesk-server/system.nix19
-rw-r--r--nixos/systems/thinkpad-laptop/system.nix12
-rwxr-xr-xsecrets/secrets.nix4
-rw-r--r--secrets/user-passwords/thinkpad-laptop/lucas.age7
-rw-r--r--secrets/user-passwords/thinkpad-laptop/lucia.age7
7 files changed, 33 insertions, 26 deletions
diff --git a/flake.nix b/flake.nix
index 0ceee8a..7df5dc4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,7 +15,7 @@
# Home Manager Configurations
homeConfigurations = {
"culsans@nzxt-desktop" = helper.mkHomeManagerUser "culsans" "nzxt-desktop" "x86_64-linux";
- "lucas@thinkpad-laptop" = helper.mkHomeManagerUser "lucas" "thinkpad-laptop" "x86_64-linux";
+ "lucia@thinkpad-laptop" = helper.mkHomeManagerUser "lucia" "thinkpad-laptop" "x86_64-linux";
"server@prodesk-server" = helper.mkHomeManagerUser "server" "prodesk-server" "x86_64-linux";
"culsans@steam-deck" = helper.mkHomeManagerUser "culsans" "steam-deck" "x86_64-linux";
};
diff --git a/home-manager/users/thinkpad-laptop/lucas.nix b/home-manager/users/thinkpad-laptop/lucia.nix
index 13399ad..49eb98a 100644
--- a/home-manager/users/thinkpad-laptop/lucas.nix
+++ b/home-manager/users/thinkpad-laptop/lucia.nix
@@ -1,11 +1,10 @@
{
pkgs,
- lib,
...
}: {
home = {
- username = "lucas";
- homeDirectory = "/home/lucas";
+ username = "lucia";
+ homeDirectory = "/home/lucia";
stateVersion = "24.11";
packages = with pkgs; [
@@ -18,6 +17,9 @@
custom-neovim
neovide
+ # games
+ prismlauncher
+
# Custom Scripts
inbox-review
];
diff --git a/nixos/systems/prodesk-server/system.nix b/nixos/systems/prodesk-server/system.nix
index 9acdef0..8cf10a6 100644
--- a/nixos/systems/prodesk-server/system.nix
+++ b/nixos/systems/prodesk-server/system.nix
@@ -17,22 +17,24 @@
isNormalUser = true;
description = "Server";
openssh.authorizedKeys.keys = [
- "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMcc7hXixElOgv87LlY1LgCQ9oOT6Lj66wjCh1uRqpQt culsans@nzxt-desktop"
- "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM/HLlWDshs3Fn4pbTrUeSdo/2/YWuBEMpQX15ZR0RNv lucas@thinkpad-laptop"
- "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMqAf3T3uOGEyaNkR/BZ31Qj+z7eJQTcKXn26kO3iQYJ iphone"
+ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMcc7hXixElOgv87LlY1LgCQ9oOT6Lj66wjCh1uRqpQt culsans@nzxt-desktop" # My Desktop
+ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM/HLlWDshs3Fn4pbTrUeSdo/2/YWuBEMpQX15ZR0RNv lucia@thinkpad-laptop" # My Laptop
+ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMqAf3T3uOGEyaNkR/BZ31Qj+z7eJQTcKXn26kO3iQYJ iphone-shortcut" # My iPhone Shortcuts
];
extraGroups = [
"networkmanager"
"wheel"
"audio"
"video"
+
+ "minecraft"
];
};
- users.users."alex" = {
+ users.users."guest" = {
isNormalUser = true;
- description = "Alex";
- password = "alexpassword";
+ description = "Guest";
+ # password = "";
packages = with pkgs; [
btop
zellij
@@ -41,7 +43,10 @@
fzf
];
openssh.authorizedKeys.keys = [
- "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILXgxptRpuZw7GAbaCh+tw4eeAd3/GEOnINEDYlhh9UU ragin@LAPTOP-BB0TF8J5"
+ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMcc7hXixElOgv87LlY1LgCQ9oOT6Lj66wjCh1uRqpQt culsans@nzxt-desktop" # My Desktop
+ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM/HLlWDshs3Fn4pbTrUeSdo/2/YWuBEMpQX15ZR0RNv lucia@thinkpad-laptop" # My Laptop
+
+ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILXgxptRpuZw7GAbaCh+tw4eeAd3/GEOnINEDYlhh9UU ragin@LAPTOP-BB0TF8J5" # Alex's Desktop
];
};
diff --git a/nixos/systems/thinkpad-laptop/system.nix b/nixos/systems/thinkpad-laptop/system.nix
index 23e1843..f06d428 100644
--- a/nixos/systems/thinkpad-laptop/system.nix
+++ b/nixos/systems/thinkpad-laptop/system.nix
@@ -8,12 +8,12 @@
stateVersion = "24.11";
};
- age.secrets.user-passwords_thinkpad-laptop_lucas.file = ../../../secrets/user-passwords/thinkpad-laptop/lucas.age;
+ age.secrets.user-passwords_thinkpad-laptop_lucia.file = ../../../secrets/user-passwords/thinkpad-laptop/lucia.age;
- users.users."lucas" = {
- hashedPasswordFile = config.age.secrets.user-passwords_thinkpad-laptop_lucas.path;
+ users.users."lucia" = {
+ hashedPasswordFile = config.age.secrets.user-passwords_thinkpad-laptop_lucia.path;
isNormalUser = true;
- description = "lucas";
+ description = "lucia";
extraGroups = [
"networkmanager"
"wheel"
@@ -37,7 +37,7 @@
utils = {
nh = {
enable = true;
- flake = "/home/lucas/Sync/setup";
+ flake = "/home/lucia/Sync/setup";
};
};
};
@@ -55,7 +55,7 @@
greetd.enable = true;
syncthing-client = {
enable = true;
- username = "lucas";
+ username = "lucia";
};
udisks2.enable = true;
};
diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index cc1da46..73afd92 100755
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -11,10 +11,10 @@ let
thinkpad-laptop = {
system = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINgCZw2RzdgXnW0lpgJQ2hBb+0V1fZoemJQtqDQbhFZk root@thinkpad-laptop";
- lucas = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM/HLlWDshs3Fn4pbTrUeSdo/2/YWuBEMpQX15ZR0RNv lucas@thinkpad-laptop";
+ lucia = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM/HLlWDshs3Fn4pbTrUeSdo/2/YWuBEMpQX15ZR0RNv lucia@thinkpad-laptop";
};
in {
"user-passwords/nzxt-desktop/culsans.age".publicKeys = [ nzxt-desktop.system nzxt-desktop.culsans ];
- "user-passwords/thinkpad-laptop/lucas.age".publicKeys = [ thinkpad-laptop.system thinkpad-laptop.lucas ];
+ "user-passwords/thinkpad-laptop/lucia.age".publicKeys = [ thinkpad-laptop.system thinkpad-laptop.lucia ];
"user-passwords/prodesk-server/server.age".publicKeys = [ prodesk-server.system prodesk-server.server ];
}
diff --git a/secrets/user-passwords/thinkpad-laptop/lucas.age b/secrets/user-passwords/thinkpad-laptop/lucas.age
deleted file mode 100644
index 2b9bdc8..0000000
--- a/secrets/user-passwords/thinkpad-laptop/lucas.age
+++ /dev/null
@@ -1,7 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 Wfy90Q pTGfyan/aglag5BZ96jJahoLU2xLkoKMIFx7PL4F/Fk
-XzNdJzzsyZd2WrnbDA9EBc0DX+o0RKWC4Ashp3WYN8M
--> ssh-ed25519 um9c2w fAH7MrsEH4E23WAaUDj/DyKfozjgq6B79YZ+JuV+w0M
-MQht0n8g1d6e7x/MpKNLD2PdI0OhORvlZAuc0KYiTF0
---- ztxqjvWmp0WB1P3pKeZkRwIEBFCjW1+CReb5p9Fyxok
-˘b> ֑U阮e^;@Ψ]|n1Y5O:JӜ: \ No newline at end of file
diff --git a/secrets/user-passwords/thinkpad-laptop/lucia.age b/secrets/user-passwords/thinkpad-laptop/lucia.age
new file mode 100644
index 0000000..86da6ab
--- /dev/null
+++ b/secrets/user-passwords/thinkpad-laptop/lucia.age
@@ -0,0 +1,7 @@
+age-encryption.org/v1
+-> ssh-ed25519 Wfy90Q pRVikGpgriPFEFFnJw5Pf++LG8tM/e9bT0TyuErhd24
+T+ffg3uVN5LiXED0F9DmoKoqqixqXrDm0LOZ71TfRQg
+-> ssh-ed25519 um9c2w X8uyX5ZqAKOS01WLKpb89Nd6oqE9l+mdksTMfX6uaQw
+WJxer4AmpPG2Bx8lyGc+jI0abpfiM68B0osw4XRVBgU
+--- cstxVvgJNxHxeWzSaweMvQKhxFDpSV9DJADcvrjz16I
+*'&3Sd6# p;+ϣ6fyԝɠ*3 \ No newline at end of file