diff --git a/.sops.yaml b/.sops.yaml index 28a9fda..75b2b08 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -6,11 +6,13 @@ keys: # Generate AGE keys from SSH keys with: # ssh-keygen -A # nix-shell -p ssh-to-age --run 'cat /etc/ssh/ssh_host_ed25519_key.pub | ssh-to-age' + # cspell:disable - &artemision age1jd2dcpykagz20kpk2kkchte3augqncwfn6nywursx0dkfyze6feqdzxkq2 - &palatine-hill age1z8q02wdp0a2ep5uuffgfeqlfam4ztl95frhw5qhnn6knn0rrmcnqk5evej - &jeeves age128ehc0ssgwnuv4r8ayfyu7r80e82xrkmv63g7h9y9q4mhk4w9dyqfymc2w - &jeeves-jr age1lffr5f5nz0nrenv3ekgy27e8sztsx4gfp3hfymkz77mqaa5a4gts0ncrrh - &rhapsody-in-green age1c7adjulcrma0m7l5ur8efxdjzyskrqcwssfkt77a9rmma7gzss5q02pgmy + # cspell:enable admins: &admins - *admin_alice diff --git a/.vscode/settings.json b/.vscode/settings.json index 15cd292..53f38ac 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,3 +1,87 @@ { - "cSpell.words": ["artemision", "autofetch", "esbenp"] + "cSpell.enableFiletypes": ["nix"], + "cSpell.words": [ + "aarch", + "adbusers", + "ahci", + "alicehuston", + "alsa", + "artemision", + "autofetch", + "autopull", + "azuretools", + "BANN", + "btop", + "builtins", + "cachix", + "charliermarsh", + "codezombiech", + "concatLists", + "dialout", + "dotfiles", + "eamodio", + "errorlens", + "esbenp", + "fenix", + "foxundermoon", + "hexeditor", + "HRDN", + "hwloc", + "hyprland", + "hyprwm", + "iperf", + "jmgilman", + "jnoortheen", + "keygen", + "KRNL", + "libvirtd", + "LOGG", + "lsnew", + "lynis", + "mechatroner", + "ncdu", + "neofetch", + "networkd", + "networkmanager", + "nixos", + "nixpkgs", + "nmap", + "numtide", + "nvme", + "oderwat", + "pciutils", + "pipewire", + "pkgs", + "plugdev", + "pulseaudio", + "pylance", + "Redistributable", + "ripgrep", + "rtkit", + "Sandro", + "shellcheck", + "smartd", + "smartmontools", + "sshconfig", + "substituters", + "sysstat", + "tamasfe", + "timonwong", + "topgrade", + "Toqozz", + "uaccess", + "updatekeys", + "usbguard", + "usbhid", + "usbutils", + "usernamehw", + "vfat", + "virtualisation", + "wireshark", + "xhci", + "yzhang", + "zerotierone", + "zhaofengli", + "zoxide" + ] } diff --git a/systems/jeeves/configuration.nix b/systems/jeeves/configuration.nix index 71293a9..497d760 100644 --- a/systems/jeeves/configuration.nix +++ b/systems/jeeves/configuration.nix @@ -56,7 +56,7 @@ syncthing.guiAddress = "192.168.90.40:8384"; syncthing.folders = { "notes" = { - id = "l62ul-lpweo"; + id = "l62ul-lpweo"; # cspell:disable-line path = "/ZFS/Media/Notes"; devices = [ "phone" @@ -65,7 +65,7 @@ fsWatcherEnabled = true; }; "books" = { - id = "6uppx-vadmy"; + id = "6uppx-vadmy"; # cspell:disable-line path = "/ZFS/Storage/Syncthing/books"; devices = [ "phone" @@ -74,7 +74,7 @@ fsWatcherEnabled = true; }; "important" = { - id = "4ckma-gtshs"; + id = "4ckma-gtshs"; # cspell:disable-line path = "/ZFS/Storage/Syncthing/important"; devices = [ "phone" @@ -83,7 +83,7 @@ fsWatcherEnabled = true; }; "music" = { - id = "vprc5-3azqc"; + id = "vprc5-3azqc"; # cspell:disable-line path = "/ZFS/Storage/Syncthing/music"; devices = [ "phone" @@ -92,7 +92,7 @@ fsWatcherEnabled = true; }; "projects" = { - id = "vyma6-lqqrz"; + id = "vyma6-lqqrz"; # cspell:disable-line path = "/ZFS/Storage/Syncthing/projects"; devices = [ "rhapsody-in-green" ]; fsWatcherEnabled = true; diff --git a/systems/rhapsody-in-green/configuration.nix b/systems/rhapsody-in-green/configuration.nix index f1abefa..7c69a5a 100644 --- a/systems/rhapsody-in-green/configuration.nix +++ b/systems/rhapsody-in-green/configuration.nix @@ -43,7 +43,7 @@ syncthing.settings.folders = { "notes" = { - id = "l62ul-lpweo"; + id = "l62ul-lpweo"; # cspell:disable-line path = "/home/richie/notes"; devices = [ "phone" @@ -52,7 +52,7 @@ fsWatcherEnabled = true; }; "books" = { - id = "6uppx-vadmy"; + id = "6uppx-vadmy"; # cspell:disable-line path = "/home/richie/books"; devices = [ "phone" @@ -61,7 +61,7 @@ fsWatcherEnabled = true; }; "important" = { - id = "4ckma-gtshs"; + id = "4ckma-gtshs"; # cspell:disable-line path = "/home/richie/important"; devices = [ "phone" @@ -70,14 +70,14 @@ fsWatcherEnabled = true; }; "music" = { - id = "vprc5-3azqc"; + id = "vprc5-3azqc"; # cspell:disable-line path = "/home/richie/music"; devices = [ "phone" "jeeves" ]; "projects" = { - id = "vyma6-lqqrz"; + id = "vyma6-lqqrz"; # cspell:disable-line path = "/home/richie/projects"; devices = [ "jeeves" ]; fsWatcherEnabled = true; diff --git a/systems/rhapsody-in-green/syncthing_base.nix b/systems/rhapsody-in-green/syncthing_base.nix index b620118..28d7cea 100644 --- a/systems/rhapsody-in-green/syncthing_base.nix +++ b/systems/rhapsody-in-green/syncthing_base.nix @@ -8,9 +8,9 @@ configDir = "/home/richie/.config/syncthing"; settings = { devices = { - phone.id = "LTGPLAE-M4ZDJTM-TZ3DJGY-SLLAVWF-CQDVEVS-RGCS75T-GAPZYK3-KUM6LA5"; - jeeves.id = "7YQ4UEW-OPQEBH4-6YKJH4B-ZCE3SAX-5EIK5JL-WJDIWUA-WA2N3D5-MNK6GAV"; - rhapsody-in-green.id = "INKUNKN-KILXGL5-2TQ5JTH-ORJOLOM-WYD2PYO-YRDLQIX-3AKZFWT-ZN7OJAE"; + phone.id = "LTGPLAE-M4ZDJTM-TZ3DJGY-SLLAVWF-CQDVEVS-RGCS75T-GAPZYK3-KUM6LA5"; # cspell:disable-line + jeeves.id = "7YQ4UEW-OPQEBH4-6YKJH4B-ZCE3SAX-5EIK5JL-WJDIWUA-WA2N3D5-MNK6GAV"; # cspell:disable-line + rhapsody-in-green.id = "INKUNKN-KILXGL5-2TQ5JTH-ORJOLOM-WYD2PYO-YRDLQIX-3AKZFWT-ZN7OJAE"; # cspell:disable-line }; }; }; diff --git a/users/richie/default.nix b/users/richie/default.nix index 3f37546..24a1ab9 100644 --- a/users/richie/default.nix +++ b/users/richie/default.nix @@ -13,7 +13,7 @@ import ../default.nix { name ; publicKeys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMtRuAqeERMet9sFh1NEkG+pHLq/JRAAGDtv29flXF59 Richie@tmmworkshop.com Desktop" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHJSlv8ujrMpr8qjpX2V+UBXSP5FGhM1l+/5aGnfb2MV Richie@tmmworkshop.com Laptop" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMtRuAqeERMet9sFh1NEkG+pHLq/JRAAGDtv29flXF59 Richie@tmmworkshop.com Desktop" # cspell:disable-line + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHJSlv8ujrMpr8qjpX2V+UBXSP5FGhM1l+/5aGnfb2MV Richie@tmmworkshop.com Laptop" # cspell:disable-line ]; } diff --git a/users/richie/home/programs.nix b/users/richie/home/programs.nix index e141acf..94ecc51 100644 --- a/users/richie/home/programs.nix +++ b/users/richie/home/programs.nix @@ -21,7 +21,7 @@ pciutils smartmontools usbutils - # netowking + # networking iperf3 nmap wget