treewide: misterio -> gabriel

flake.nix

@@ -150,7 +150,7 @@
     homeConfigurations = {
       # Work laptop
       "gabriel@electra" = lib.homeManagerConfiguration {
-        modules = [ ./home/misterio/electra.nix ./home/misterio/nixpkgs.nix ];
+        modules = [ ./home/gabriel/electra.nix ./home/gabriel/nixpkgs.nix ];
         pkgs = pkgsFor.x86_64-linux;
         extraSpecialArgs = {
           inherit inputs outputs;

home/gabriel/electra.nix

@@ -1,11 +1,11 @@
-{pkgs, lib, ...}: let
+{pkgs, lib, config, ...}: let
   nixGL = pkgs.inputs.nix-gl.nixGLIntel;
 in {
   imports = [
     ./global
     ./features/desktop/hyprland
   ];
-  home.persistence."/persist/home/misterio" = lib.mkForce {};
+  home.persistence."/persist/${config.home.homeDirectory}" = lib.mkForce {};
   home.username = "gabriel";
   home.packages = [nixGL];
 

home/gabriel/features/cli/gh.nix

@@ -1,4 +1,4 @@
-{pkgs, ...}: {
+{pkgs, config, ...}: {
   programs.gh = {
     enable = true;
     extensions = with pkgs; [gh-markdown-preview];
@@ -9,6 +9,6 @@
     };
   };
   home.persistence = {
-    "/persist/home/misterio".files = [".config/gh/hosts.yml"];
+    "/persist/${config.home.homeDirectory}".files = [".config/gh/hosts.yml"];
   };
 }

home/gabriel/features/cli/jira.nix

@@ -0,0 +1,7 @@
+{ pkgs, config, ... }:
+{
+  home.packages = [pkgs.jira-cli-go];
+  home.persistence = {
+    "/persist/${config.home.homeDirectory}".directories = [".config/.jira"];
+  };
+}

home/gabriel/features/cli/ssh.nix

@@ -1,6 +1,7 @@
 {
   outputs,
   lib,
+  config,
   ...
 }: let
   hostnames = builtins.attrNames outputs.nixosConfigurations;
@@ -26,7 +27,7 @@ in {
   };
 
   home.persistence = {
-    "/persist/home/misterio".files = [
+    "/persist/${config.home.homeDirectory}".files = [
       ".ssh/known_hosts"
     ];
   };

home/gabriel/features/desktop/common/discord.nix

@@ -8,7 +8,7 @@ in {
   home.packages = with pkgs; [vesktop];
 
   home.persistence = {
-    "/persist/home/misterio" = {
+    "/persist/${config.home.homeDirectory}" = {
       directories = [
         ".config/vesktop/sessionData"
         ".config/vesktop/settings"

home/gabriel/features/desktop/common/firefox.nix

@@ -2,7 +2,7 @@
   programs.browserpass.enable = true;
   programs.firefox = {
     enable = true;
-    profiles.misterio = {
+    profiles.gabriel = {
       bookmarks = {};
       extensions = with pkgs.inputs.firefox-addons; [
         ublock-origin
@@ -29,7 +29,7 @@
   home = {
     persistence = {
       # Not persisting is safer
-      # "/persist/home/misterio".directories = [ ".mozilla/firefox" ];
+      # "/persist/${config.home.homeDirectory}".directories = [ ".mozilla/firefox" ];
     };
   };
 

home/gabriel/features/desktop/common/kdeconnect.nix

@@ -1,5 +1,6 @@
 {
   pkgs,
+  config,
   ...
 }: let
   kdeconnect-cli = "${pkgs.plasma5Packages.kdeconnect-kde}/bin/kdeconnect-cli";
@@ -38,6 +39,6 @@ in {
   };
 
   home.persistence = {
-    "/persist/home/misterio".directories = [".config/kdeconnect"];
+    "/persist/${config.home.homeDirectory}".directories = [".config/kdeconnect"];
   };
 }

home/gabriel/features/desktop/common/sublime-music.nix

@@ -0,0 +1,6 @@
+{pkgs, config, ...}: {
+  home.packages = [pkgs.stable.sublime-music];
+  home.persistence = {
+    "/persist/${config.home.homeDirectory}".directories = [".config/sublime-music"];
+  };
+}

home/gabriel/features/desktop/common/wayland-wm/qutebrowser.nix

@@ -7,7 +7,7 @@
   inherit (config.colorscheme) colors;
 in {
   home.persistence = {
-    "/persist/home/misterio".directories = [
+    "/persist/${config.home.homeDirectory}".directories = [
       ".config/qutebrowser/bookmarks"
       ".config/qutebrowser/greasemonkey"
       ".local/share/qutebrowser"

home/gabriel/features/games/default.nix

@@ -1,4 +1,4 @@
-{pkgs, ...}: {
+{pkgs, config, ...}: {
   imports = [
     ./lutris.nix
     ./steam.nix
@@ -7,7 +7,7 @@
   home = {
     packages = with pkgs; [gamescope];
     persistence = {
-      "/persist/home/misterio" = {
+      "/persist/${config.home.homeDirectory}" = {
         allowOther = true;
         directories = [
           "Games"

home/gabriel/features/games/factorio.nix

@@ -1,12 +1,13 @@
 {
   lib,
   pkgs,
+  config,
   ...
 }: {
   home = {
     packages = [pkgs.factorio];
     persistence = {
-      "/persist/home/misterio" = {
+      "/persist/${config.home.homeDirectory}" = {
         allowOther = true;
         directories = [".factorio"];
       };

home/gabriel/features/games/lutris.nix

@@ -1,6 +1,7 @@
 {
   pkgs,
   lib,
+  config,
   ...
 }: {
   home.packages = [
@@ -15,7 +16,7 @@
   ];
 
   home.persistence = {
-    "/persist/home/misterio" = {
+    "/persist/${config.home.homeDirectory}" = {
       allowOther = true;
       directories = [
         ".config/lutris"

home/gabriel/features/games/osu.nix

@@ -1,11 +1,12 @@
 {
   pkgs,
   lib,
+  config,
   ...
 }: {
   home.packages = [pkgs.osu-lazer];
 
   home.persistence = {
-    "/persist/home/misterio".directories = [".local/share/osu"];
+    "/persist/${config.home.homeDirectory}".directories = [".local/share/osu"];
   };
 }

home/gabriel/features/games/prism-launcher.nix

@@ -0,0 +1,12 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}: {
+  home.packages = [pkgs.prismlauncher];
+
+  home.persistence = {
+    "/persist/${config.home.homeDirectory}".directories = [".local/share/PrismLauncher"];
+  };
+}

home/gabriel/features/games/runescape.nix

@@ -1,5 +1,6 @@
 {
   pkgs,
+  config,
   ...
 }: let
   # Add PULSE_LATENCY_MSEC to .desktop file
@@ -26,7 +27,7 @@ in {
   ];
 
   home.persistence = {
-    "/persist/home/misterio" = {
+    "/persist/${config.home.homeDirectory}" = {
       allowOther = true;
       directories = ["Jagex"];
     };

home/gabriel/features/games/steam.nix

@@ -41,7 +41,7 @@
     ];
   in
     pkgs.writeTextDir "share/wayland-sessions/steam-sesson.desktop" # ini
-    
+
     ''
       [Desktop Entry]
       Name=Steam Session
@@ -57,7 +57,7 @@ in {
     pkgs.protontricks
   ];
   home.persistence = {
-    "/persist/home/misterio" = {
+    "/persist/${config.home.homeDirectory}" = {
       allowOther = true;
       directories = [
         ".factorio"

home/gabriel/features/games/yuzu.nix

@@ -1,13 +1,14 @@
 {
   pkgs,
   lib,
+  config,
   ...
 }: {
   # Temporarily disabled while I wait for nixpkgs to package a fork (e.g. suyu)
   # home.packages = [ pkgs.yuzu-mainline ];
 
   home.persistence = {
-    "/persist/home/misterio" = {
+    "/persist/${config.home.homeDirectory}" = {
       allowOther = true;
       directories = [
         ".config/yuzu"

home/gabriel/features/pass/default.nix

@@ -18,6 +18,6 @@
   };
 
   home.persistence = {
-    "/persist/home/misterio".directories = [".password-store"];
+    "/persist/${config.home.homeDirectory}".directories = [".password-store"];
   };
 }

home/gabriel/features/productivity/mail.nix

@@ -25,7 +25,7 @@
   };
 in {
   home.persistence = {
-    "/persist/home/misterio".directories = ["Mail"];
+    "/persist/${config.home.homeDirectory}".directories = ["Mail"];
   };
 
   accounts.email = {

home/gabriel/features/productivity/vdirsyncer.nix

@@ -9,7 +9,7 @@ in {
   home.packages = with pkgs; [vdirsyncer];
 
   home.persistence = {
-    "/persist/home/misterio".directories = [
+    "/persist/${config.home.homeDirectory}".directories = [
       "Calendars"
       "Contacts"
       ".local/share/vdirsyncer"

home/gabriel/global/default.nix

@@ -34,7 +34,7 @@
   };
 
   home = {
-    username = lib.mkDefault "misterio";
+    username = lib.mkDefault "gabriel";
     homeDirectory = lib.mkDefault "/home/${config.home.username}";
     stateVersion = lib.mkDefault "22.05";
     sessionPath = ["$HOME/.local/bin"];
@@ -43,7 +43,7 @@
     };
 
     persistence = {
-      "/persist/home/misterio" = {
+      "/persist/${config.home.homeDirectory}" = {
         defaultDirectoryMethod = "symlink";
         directories = [
           "Documents"

home/misterio/features/cli/jira.nix

@@ -1,7 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = [pkgs.jira-cli-go];
-  home.persistence = {
-    "/persist/home/misterio".directories = [".config/.jira"];
-  };
-}

home/misterio/features/desktop/common/sublime-music.nix

@@ -1,6 +0,0 @@
-{pkgs, ...}: {
-  home.packages = [pkgs.stable.sublime-music];
-  home.persistence = {
-    "/persist/home/misterio".directories = [".config/sublime-music"];
-  };
-}

home/misterio/features/games/prism-launcher.nix

@@ -1,11 +0,0 @@
-{
-  pkgs,
-  lib,
-  ...
-}: {
-  home.packages = [pkgs.prismlauncher];
-
-  home.persistence = {
-    "/persist/home/misterio".directories = [".local/share/PrismLauncher"];
-  };
-}

hosts/alcyone/default.nix

@@ -4,7 +4,7 @@
     ./hardware-configuration.nix
 
     ../common/global
-    ../common/users/misterio
+    ../common/users/gabriel
     ../common/optional/fail2ban.nix
     ../common/optional/tailscale-exit-node.nix
   ];

hosts/alcyone/secrets.yaml

@@ -3,7 +3,7 @@ radicale-htpasswd: ENC[AES256_GCM,data:lqzziq/k+RcRrsgRzTNIXntYjTUxd8iqih5sbhLxC
 firefly-key: ENC[AES256_GCM,data:p9aY1k3SRMgq8mO/czphAoC9p4g+QlkcEq3odU5AP9o=,iv:YRRUsUDYriFXT69OufCw+7H2eIOVIwFKmDjl8yL+aE8=,tag:mooC5yu3xHyeE3C0XQmWdg==,type:str]
 grafana-mail-password: ENC[AES256_GCM,data:zymg7cyZkdoTZoNV0sy7/YiEoPA5S+tyOhCs8MBP,iv:BifI9Hc5238ImZsNHWTKmMQZc5a0RR4Xl3SKSgXedVE=,tag:Yc1K9Bdj3nq8RKHKllqNvg==,type:str]
 grafana-mail-password-hashed: ENC[AES256_GCM,data:sGGzxKHiZqF3WUdCZP4WYvH9U2l4GOmwQ7EyhMM65RdaDEzyNmpuuYPxQzQU4ozZ1wvgaL41BgMvXfFn,iv:eGnd+B6p/XL9f/lskYYw0oD6unHKL38rN3wDOPliE18=,tag:Bpj4Fkw96cDP4fr012W7JA==,type:str]
-grafana-misterio-password: ENC[AES256_GCM,data:KOuzmfzhMEDI,iv:Qwon59GX/NVsVJWmtYzWKwld38sTlIQDGTAHQfZ0ZlM=,tag:YnKHAA4rOU6IILFELukDOA==,type:str]
+grafana-gabriel-password: ENC[AES256_GCM,data:KOuzmfzhMEDI,iv:Qwon59GX/NVsVJWmtYzWKwld38sTlIQDGTAHQfZ0ZlM=,tag:YnKHAA4rOU6IILFELukDOA==,type:str]
 sops:
     kms: []
     gcp_kms: []

hosts/alcyone/services/git-remote.nix

@@ -26,7 +26,7 @@
       packages = [pkgs.git];
       openssh.authorizedKeys.keys =
         # My key
-        config.users.users.misterio.openssh.authorizedKeys.keys
+        config.users.users.gabriel.openssh.authorizedKeys.keys
         ++
         # The key hydra uses to access other hosts
         # This is used to push CI-gated branches to my nix-config

hosts/alcyone/services/grafana/default.nix

@@ -1,6 +1,6 @@
 {config, ...}: {
   sops.secrets = {
-    grafana-misterio-password = {
+    grafana-gabriel-password = {
       sopsFile = ../../secrets.yaml;
       owner = "grafana";
     };
@@ -18,9 +18,9 @@
         users.default_theme = "system";
         dashboards.default_home_dashboard_path = "${./dashboards}/hosts.json";
         security = {
-          admin_user = "misterio";
+          admin_user = "gabriel";
           admin_email = "hi@m7.rs";
-          admin_password = "$__file{${config.sops.secrets.grafana-misterio-password.path}}";
+          admin_password = "$__file{${config.sops.secrets.grafana-gabriel-password.path}}";
           cookie_secure = true;
         };
         "auth.anonymous" = {

hosts/alcyone/services/website/default.nix

@@ -1,7 +1,7 @@
 {pkgs, ...}: let
   website = pkgs.inputs.website.default;
-  pgpKey = ../../../../home/misterio/pgp.asc;
-  sshKey = ../../../../home/misterio/ssh.pub;
+  pgpKey = ../../../../home/gabriel/pgp.asc;
+  sshKey = ../../../../home/gabriel/ssh.pub;
   redir = {
     forceSSL = true;
     enableACME = true;

hosts/atlas/default.nix

@@ -11,7 +11,7 @@
     ./hardware-configuration.nix
 
     ../common/global
-    ../common/users/misterio
+    ../common/users/gabriel
 
     ../common/optional/ckb-next.nix
     ../common/optional/greetd.nix

hosts/celaeno/default.nix

@@ -4,7 +4,7 @@
     ./services
 
     ../common/global
-    ../common/users/misterio
+    ../common/users/gabriel
     ../common/optional/docker.nix
   ];
 

hosts/common/optional/greetd.nix

@@ -8,10 +8,10 @@
   homeSharePaths = lib.mapAttrsToList (_: v: "${v.home.path}/share") homeCfgs;
   vars = ''XDG_DATA_DIRS="$XDG_DATA_DIRS:${lib.concatStringsSep ":" homeSharePaths}" GTK_USE_PORTAL=0'';
 
-  misterioCfg = homeCfgs.misterio;
-  gtkTheme = misterioCfg.gtk.theme;
-  iconTheme = misterioCfg.gtk.iconTheme;
-  wallpaper = misterioCfg.wallpaper;
+  gabrielCfg = homeCfgs.gabriel;
+  gtkTheme = gabrielCfg.gtk.theme;
+  iconTheme = gabrielCfg.gtk.iconTheme;
+  wallpaper = gabrielCfg.wallpaper;
 
   sway-kiosk = command: "${lib.getExe pkgs.sway} --unsupported-gpu --config ${pkgs.writeText "kiosk.config" ''
     output * bg #000000 solid_color

hosts/common/secrets.yaml

@@ -1,4 +1,4 @@
-misterio-password: ENC[AES256_GCM,data:Y5Q0yE/B4p45gDVKl8boMW59AJZ5mPBg5OUrAyEosVWHMo1RxAqjE76Er9l/B65x8My+wSiFirBe15EGPdK2pcNivh8KhYStOtfCH4E/9zpuwy4pzKHXmCfrw2qTcdQS3Po04Ne2lIuBfg==,iv:SYGY0leQkFniuxiG/V4EsBPF4saSctoQ9Yke9cg5QzA=,tag:7lYdz4SyFUuhKVcPyxji2w==,type:str]
+gabriel-password: ENC[AES256_GCM,data:Y5Q0yE/B4p45gDVKl8boMW59AJZ5mPBg5OUrAyEosVWHMo1RxAqjE76Er9l/B65x8My+wSiFirBe15EGPdK2pcNivh8KhYStOtfCH4E/9zpuwy4pzKHXmCfrw2qTcdQS3Po04Ne2lIuBfg==,iv:SYGY0leQkFniuxiG/V4EsBPF4saSctoQ9Yke9cg5QzA=,tag:7lYdz4SyFUuhKVcPyxji2w==,type:str]
 layla-password: ENC[AES256_GCM,data:GSfztXWS5+oVRH0WMFsbuCcuU16OF/aWNTlba8+mL5zGGIBfBBqUnYbmprUIn345L+zH7620BaywhYvYkT7PRr1ZOizOItZACE2sDDcaJuTo14lPuxh9WgbLHgpaEG15utNtrVglb/nCrA==,iv:F2gOedMcFce/JFEY2RPAWEqQxSFsSGU4cmcTRU1+5R4=,tag:CV1InGjSwAdirjvKMZl+dA==,type:str]
 wireless: ENC[AES256_GCM,data:XL2RhWwb3XWy/0h0gudcp7xBb/gmb+693+Mr8RozEh2utNBCjBOuSjSWQzHWdwMbGToliTlo8kUE8MU0ZXFWU7xq7FA7r00QTtZVigN2Tk0aF/Xwtk1Zvh0XQQKkdanH7oW6NIkRYTAkIIweWLJj+AFqekgekT6LbEpbwWXTAaeBj1AmG6eY3iXwjYWxuIuuMfAc9/aDD6hrA+W/tgy7iimAHxfEfK5k9OvQC+bp9GHlu0Xnal9e4zjDTavh1ed+aEkWAX5o88pOzmt8DfvXNK8eDhm3U/43YDmfDMTxtgNMUpJxTRDK4RH18Ksw4c2IhrsuinJUyIoibgT7ilRew+kCoTh75194qeO3JrWLpHhi5OKHrlleQ+KpcTNTPSiEo7mOp7yLvPXWLm2ceqgk+NdDWV81wpQD+tV+SS2G3S/7MDJGqP6yOFB5VC0BIw5o+lvIm+RoeNoOqgLysFNqgudolhQbmSEQuMvmgKa9XetYMNDQQG1ZKDX99k6lYm/KRZ+03fo4BsLKd58h/yF6,iv:RLSzWWMYVL8KbpuLza00dDkyn5HLs70kAFrloYFVZ18=,tag:fLfT6Y/YV+qtY2XnGCD5LA==,type:str]
 sops:

hosts/common/users/gabriel/default.nix

@@ -7,7 +7,8 @@
   ifTheyExist = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups;
 in {
   users.mutableUsers = false;
-  users.users.misterio = {
+  users.users.gabriel = {
+    uid = 1000; # TODO: remove me
     isNormalUser = true;
     shell = pkgs.fish;
     extraGroups =
@@ -29,17 +30,17 @@ in {
         "deluge"
       ];
 
-    openssh.authorizedKeys.keys = lib.splitString "\n" (builtins.readFile ../../../../home/misterio/ssh.pub);
-    hashedPasswordFile = config.sops.secrets.misterio-password.path;
+    openssh.authorizedKeys.keys = lib.splitString "\n" (builtins.readFile ../../../../home/gabriel/ssh.pub);
+    hashedPasswordFile = config.sops.secrets.gabriel-password.path;
     packages = [pkgs.home-manager];
   };
 
-  sops.secrets.misterio-password = {
+  sops.secrets.gabriel-password = {
     sopsFile = ../../secrets.yaml;
     neededForUsers = true;
   };
 
-  home-manager.users.misterio = import ../../../../home/misterio/${config.networking.hostName}.nix;
+  home-manager.users.gabriel = import ../../../../home/gabriel/${config.networking.hostName}.nix;
 
   security.pam.services = {
     swaylock = {};

hosts/maia/default.nix

@@ -11,7 +11,7 @@
     ./hardware-configuration.nix
 
     ../common/global
-    ../common/users/misterio
+    ../common/users/gabriel
     ../common/users/layla
 
     ../common/optional/pantheon.nix