From e6312b33e44b959b98a5f42dfc683f0ba926781b Mon Sep 17 00:00:00 2001 From: Gabriel Fontes Date: Mon, 17 Jun 2024 15:51:41 -0300 Subject: [PATCH] treewide: misterio -> gabriel --- flake.nix | 2 +- home/{misterio => gabriel}/alcyone.nix | 0 home/{misterio => gabriel}/atlas.nix | 0 home/{misterio => gabriel}/celaeno.nix | 0 home/{misterio => gabriel}/electra.nix | 4 ++-- home/{misterio => gabriel}/features/cli/bash.nix | 0 home/{misterio => gabriel}/features/cli/bat.nix | 0 home/{misterio => gabriel}/features/cli/default.nix | 0 home/{misterio => gabriel}/features/cli/direnv.nix | 0 home/{misterio => gabriel}/features/cli/fish.nix | 0 home/{misterio => gabriel}/features/cli/fzf.nix | 0 home/{misterio => gabriel}/features/cli/gh.nix | 4 ++-- home/{misterio => gabriel}/features/cli/git.nix | 0 .../features/cli/gpg-commands.nix | 0 home/{misterio => gabriel}/features/cli/gpg.nix | 0 home/gabriel/features/cli/jira.nix | 7 +++++++ home/{misterio => gabriel}/features/cli/jujutsu.nix | 0 home/{misterio => gabriel}/features/cli/lyrics.nix | 0 .../{misterio => gabriel}/features/cli/nix-index.nix | 0 home/{misterio => gabriel}/features/cli/pfetch.nix | 0 .../features/cli/shellcolor.nix | 0 home/{misterio => gabriel}/features/cli/ssh.nix | 3 ++- home/{misterio => gabriel}/features/cli/starship.nix | 0 home/{misterio => gabriel}/features/cli/xpo.nix | 0 .../features/desktop/common/default.nix | 0 .../features/desktop/common/deluge.nix | 0 .../features/desktop/common/discord.nix | 2 +- .../features/desktop/common/dragon.nix | 0 .../features/desktop/common/firefox.nix | 4 ++-- .../features/desktop/common/font.nix | 0 .../features/desktop/common/gtk.nix | 0 .../features/desktop/common/kdeconnect.nix | 3 ++- .../features/desktop/common/pavucontrol.nix | 0 .../features/desktop/common/playerctl.nix | 0 .../features/desktop/common/qt.nix | 0 .../features/desktop/common/qtbase-gtk3-xdp.patch | 0 .../features/desktop/common/sublime-music.nix | 6 ++++++ .../features/desktop/common/wayland-wm/cliphist.nix | 0 .../features/desktop/common/wayland-wm/default.nix | 0 .../features/desktop/common/wayland-wm/gammastep.nix | 0 .../features/desktop/common/wayland-wm/imv.nix | 0 .../features/desktop/common/wayland-wm/kitty.nix | 0 .../features/desktop/common/wayland-wm/mako.nix | 0 .../desktop/common/wayland-wm/qutebrowser.nix | 2 +- .../features/desktop/common/wayland-wm/swayidle.nix | 0 .../features/desktop/common/wayland-wm/swaylock.nix | 0 .../features/desktop/common/wayland-wm/waybar.nix | 0 .../desktop/common/wayland-wm/wofi-run-shell.patch | 0 .../features/desktop/common/wayland-wm/wofi.nix | 0 .../features/desktop/common/wayland-wm/zathura.nix | 0 .../features/desktop/gnome/default.nix | 0 .../features/desktop/hyprland/basic-binds.nix | 0 .../features/desktop/hyprland/default.nix | 0 .../features/desktop/hyprland/hyprbars.nix | 0 .../features/desktop/wireless/default.nix | 0 .../{misterio => gabriel}/features/games/default.nix | 4 ++-- .../features/games/factorio.nix | 3 ++- home/{misterio => gabriel}/features/games/lutris.nix | 3 ++- home/{misterio => gabriel}/features/games/osu.nix | 3 ++- home/gabriel/features/games/prism-launcher.nix | 12 ++++++++++++ .../features/games/runescape.nix | 3 ++- .../features/games/star-citizen.nix | 0 home/{misterio => gabriel}/features/games/steam.nix | 4 ++-- home/{misterio => gabriel}/features/games/yuzu.nix | 3 ++- home/{misterio => gabriel}/features/nvim/default.nix | 0 home/{misterio => gabriel}/features/nvim/lsp.nix | 0 .../{misterio => gabriel}/features/nvim/syntaxes.nix | 0 home/{misterio => gabriel}/features/nvim/theme.nix | 0 home/{misterio => gabriel}/features/nvim/ui.nix | 0 home/{misterio => gabriel}/features/pass/default.nix | 2 +- .../features/productivity/default.nix | 0 .../features/productivity/khal.nix | 0 .../features/productivity/khard.nix | 0 .../features/productivity/mail.nix | 2 +- .../features/productivity/neomutt.nix | 0 .../features/productivity/todoman.nix | 0 .../features/productivity/vdirsyncer.nix | 2 +- home/{misterio => gabriel}/features/rgb/default.nix | 0 home/{misterio => gabriel}/generic.nix | 0 home/{misterio => gabriel}/global/default.nix | 4 ++-- home/{misterio => gabriel}/maia.nix | 0 home/{misterio => gabriel}/merope.nix | 0 home/{misterio => gabriel}/nixpkgs.nix | 0 home/{misterio => gabriel}/pgp.asc | 0 home/{misterio => gabriel}/pleione.nix | 0 home/{misterio => gabriel}/ssh.pub | 0 home/misterio/features/cli/jira.nix | 7 ------- .../features/desktop/common/sublime-music.nix | 6 ------ home/misterio/features/games/prism-launcher.nix | 11 ----------- hosts/alcyone/default.nix | 2 +- hosts/alcyone/secrets.yaml | 2 +- hosts/alcyone/services/git-remote.nix | 2 +- hosts/alcyone/services/grafana/default.nix | 6 +++--- hosts/alcyone/services/website/default.nix | 4 ++-- hosts/atlas/default.nix | 2 +- hosts/celaeno/default.nix | 2 +- hosts/common/optional/greetd.nix | 8 ++++---- hosts/common/secrets.yaml | 2 +- hosts/common/users/{misterio => gabriel}/default.nix | 11 ++++++----- hosts/maia/default.nix | 2 +- hosts/merope/default.nix | 2 +- hosts/pleione/default.nix | 2 +- 102 files changed, 81 insertions(+), 72 deletions(-) rename home/{misterio => gabriel}/alcyone.nix (100%) rename home/{misterio => gabriel}/atlas.nix (100%) rename home/{misterio => gabriel}/celaeno.nix (100%) rename home/{misterio => gabriel}/electra.nix (86%) rename home/{misterio => gabriel}/features/cli/bash.nix (100%) rename home/{misterio => gabriel}/features/cli/bat.nix (100%) rename home/{misterio => gabriel}/features/cli/default.nix (100%) rename home/{misterio => gabriel}/features/cli/direnv.nix (100%) rename home/{misterio => gabriel}/features/cli/fish.nix (100%) rename home/{misterio => gabriel}/features/cli/fzf.nix (100%) rename home/{misterio => gabriel}/features/cli/gh.nix (68%) rename home/{misterio => gabriel}/features/cli/git.nix (100%) rename home/{misterio => gabriel}/features/cli/gpg-commands.nix (100%) rename home/{misterio => gabriel}/features/cli/gpg.nix (100%) create mode 100644 home/gabriel/features/cli/jira.nix rename home/{misterio => gabriel}/features/cli/jujutsu.nix (100%) rename home/{misterio => gabriel}/features/cli/lyrics.nix (100%) rename home/{misterio => gabriel}/features/cli/nix-index.nix (100%) rename home/{misterio => gabriel}/features/cli/pfetch.nix (100%) rename home/{misterio => gabriel}/features/cli/shellcolor.nix (100%) rename home/{misterio => gabriel}/features/cli/ssh.nix (91%) rename home/{misterio => gabriel}/features/cli/starship.nix (100%) rename home/{misterio => gabriel}/features/cli/xpo.nix (100%) rename home/{misterio => gabriel}/features/desktop/common/default.nix (100%) rename home/{misterio => gabriel}/features/desktop/common/deluge.nix (100%) rename home/{misterio => gabriel}/features/desktop/common/discord.nix (96%) rename home/{misterio => gabriel}/features/desktop/common/dragon.nix (100%) rename home/{misterio => gabriel}/features/desktop/common/firefox.nix (94%) rename home/{misterio => gabriel}/features/desktop/common/font.nix (100%) rename home/{misterio => gabriel}/features/desktop/common/gtk.nix (100%) rename home/{misterio => gabriel}/features/desktop/common/kdeconnect.nix (91%) rename home/{misterio => gabriel}/features/desktop/common/pavucontrol.nix (100%) rename home/{misterio => gabriel}/features/desktop/common/playerctl.nix (100%) rename home/{misterio => gabriel}/features/desktop/common/qt.nix (100%) rename home/{misterio => gabriel}/features/desktop/common/qtbase-gtk3-xdp.patch (100%) create mode 100644 home/gabriel/features/desktop/common/sublime-music.nix rename home/{misterio => gabriel}/features/desktop/common/wayland-wm/cliphist.nix (100%) rename home/{misterio => gabriel}/features/desktop/common/wayland-wm/default.nix (100%) rename home/{misterio => gabriel}/features/desktop/common/wayland-wm/gammastep.nix (100%) rename home/{misterio => gabriel}/features/desktop/common/wayland-wm/imv.nix (100%) rename home/{misterio => gabriel}/features/desktop/common/wayland-wm/kitty.nix (100%) rename home/{misterio => gabriel}/features/desktop/common/wayland-wm/mako.nix (100%) rename home/{misterio => gabriel}/features/desktop/common/wayland-wm/qutebrowser.nix (99%) rename home/{misterio => gabriel}/features/desktop/common/wayland-wm/swayidle.nix (100%) rename home/{misterio => gabriel}/features/desktop/common/wayland-wm/swaylock.nix (100%) rename home/{misterio => gabriel}/features/desktop/common/wayland-wm/waybar.nix (100%) rename home/{misterio => gabriel}/features/desktop/common/wayland-wm/wofi-run-shell.patch (100%) rename home/{misterio => gabriel}/features/desktop/common/wayland-wm/wofi.nix (100%) rename home/{misterio => gabriel}/features/desktop/common/wayland-wm/zathura.nix (100%) rename home/{misterio => gabriel}/features/desktop/gnome/default.nix (100%) rename home/{misterio => gabriel}/features/desktop/hyprland/basic-binds.nix (100%) rename home/{misterio => gabriel}/features/desktop/hyprland/default.nix (100%) rename home/{misterio => gabriel}/features/desktop/hyprland/hyprbars.nix (100%) rename home/{misterio => gabriel}/features/desktop/wireless/default.nix (100%) rename home/{misterio => gabriel}/features/games/default.nix (77%) rename home/{misterio => gabriel}/features/games/factorio.nix (74%) rename home/{misterio => gabriel}/features/games/lutris.nix (86%) rename home/{misterio => gabriel}/features/games/osu.nix (51%) create mode 100644 home/gabriel/features/games/prism-launcher.nix rename home/{misterio => gabriel}/features/games/runescape.nix (91%) rename home/{misterio => gabriel}/features/games/star-citizen.nix (100%) rename home/{misterio => gabriel}/features/games/steam.nix (97%) rename home/{misterio => gabriel}/features/games/yuzu.nix (83%) rename home/{misterio => gabriel}/features/nvim/default.nix (100%) rename home/{misterio => gabriel}/features/nvim/lsp.nix (100%) rename home/{misterio => gabriel}/features/nvim/syntaxes.nix (100%) rename home/{misterio => gabriel}/features/nvim/theme.nix (100%) rename home/{misterio => gabriel}/features/nvim/ui.nix (100%) rename home/{misterio => gabriel}/features/pass/default.nix (85%) rename home/{misterio => gabriel}/features/productivity/default.nix (100%) rename home/{misterio => gabriel}/features/productivity/khal.nix (100%) rename home/{misterio => gabriel}/features/productivity/khard.nix (100%) rename home/{misterio => gabriel}/features/productivity/mail.nix (97%) rename home/{misterio => gabriel}/features/productivity/neomutt.nix (100%) rename home/{misterio => gabriel}/features/productivity/todoman.nix (100%) rename home/{misterio => gabriel}/features/productivity/vdirsyncer.nix (97%) rename home/{misterio => gabriel}/features/rgb/default.nix (100%) rename home/{misterio => gabriel}/generic.nix (100%) rename home/{misterio => gabriel}/global/default.nix (97%) rename home/{misterio => gabriel}/maia.nix (100%) rename home/{misterio => gabriel}/merope.nix (100%) rename home/{misterio => gabriel}/nixpkgs.nix (100%) rename home/{misterio => gabriel}/pgp.asc (100%) rename home/{misterio => gabriel}/pleione.nix (100%) rename home/{misterio => gabriel}/ssh.pub (100%) delete mode 100644 home/misterio/features/cli/jira.nix delete mode 100644 home/misterio/features/desktop/common/sublime-music.nix delete mode 100644 home/misterio/features/games/prism-launcher.nix rename hosts/common/users/{misterio => gabriel}/default.nix (70%) diff --git a/flake.nix b/flake.nix index 9da07f35..5ea9605e 100644 --- a/flake.nix +++ b/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; diff --git a/home/misterio/alcyone.nix b/home/gabriel/alcyone.nix similarity index 100% rename from home/misterio/alcyone.nix rename to home/gabriel/alcyone.nix diff --git a/home/misterio/atlas.nix b/home/gabriel/atlas.nix similarity index 100% rename from home/misterio/atlas.nix rename to home/gabriel/atlas.nix diff --git a/home/misterio/celaeno.nix b/home/gabriel/celaeno.nix similarity index 100% rename from home/misterio/celaeno.nix rename to home/gabriel/celaeno.nix diff --git a/home/misterio/electra.nix b/home/gabriel/electra.nix similarity index 86% rename from home/misterio/electra.nix rename to home/gabriel/electra.nix index fe082dff..2a7c2c90 100644 --- a/home/misterio/electra.nix +++ b/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]; diff --git a/home/misterio/features/cli/bash.nix b/home/gabriel/features/cli/bash.nix similarity index 100% rename from home/misterio/features/cli/bash.nix rename to home/gabriel/features/cli/bash.nix diff --git a/home/misterio/features/cli/bat.nix b/home/gabriel/features/cli/bat.nix similarity index 100% rename from home/misterio/features/cli/bat.nix rename to home/gabriel/features/cli/bat.nix diff --git a/home/misterio/features/cli/default.nix b/home/gabriel/features/cli/default.nix similarity index 100% rename from home/misterio/features/cli/default.nix rename to home/gabriel/features/cli/default.nix diff --git a/home/misterio/features/cli/direnv.nix b/home/gabriel/features/cli/direnv.nix similarity index 100% rename from home/misterio/features/cli/direnv.nix rename to home/gabriel/features/cli/direnv.nix diff --git a/home/misterio/features/cli/fish.nix b/home/gabriel/features/cli/fish.nix similarity index 100% rename from home/misterio/features/cli/fish.nix rename to home/gabriel/features/cli/fish.nix diff --git a/home/misterio/features/cli/fzf.nix b/home/gabriel/features/cli/fzf.nix similarity index 100% rename from home/misterio/features/cli/fzf.nix rename to home/gabriel/features/cli/fzf.nix diff --git a/home/misterio/features/cli/gh.nix b/home/gabriel/features/cli/gh.nix similarity index 68% rename from home/misterio/features/cli/gh.nix rename to home/gabriel/features/cli/gh.nix index 40089524..920b646f 100644 --- a/home/misterio/features/cli/gh.nix +++ b/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"]; }; } diff --git a/home/misterio/features/cli/git.nix b/home/gabriel/features/cli/git.nix similarity index 100% rename from home/misterio/features/cli/git.nix rename to home/gabriel/features/cli/git.nix diff --git a/home/misterio/features/cli/gpg-commands.nix b/home/gabriel/features/cli/gpg-commands.nix similarity index 100% rename from home/misterio/features/cli/gpg-commands.nix rename to home/gabriel/features/cli/gpg-commands.nix diff --git a/home/misterio/features/cli/gpg.nix b/home/gabriel/features/cli/gpg.nix similarity index 100% rename from home/misterio/features/cli/gpg.nix rename to home/gabriel/features/cli/gpg.nix diff --git a/home/gabriel/features/cli/jira.nix b/home/gabriel/features/cli/jira.nix new file mode 100644 index 00000000..88168f1e --- /dev/null +++ b/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"]; + }; +} diff --git a/home/misterio/features/cli/jujutsu.nix b/home/gabriel/features/cli/jujutsu.nix similarity index 100% rename from home/misterio/features/cli/jujutsu.nix rename to home/gabriel/features/cli/jujutsu.nix diff --git a/home/misterio/features/cli/lyrics.nix b/home/gabriel/features/cli/lyrics.nix similarity index 100% rename from home/misterio/features/cli/lyrics.nix rename to home/gabriel/features/cli/lyrics.nix diff --git a/home/misterio/features/cli/nix-index.nix b/home/gabriel/features/cli/nix-index.nix similarity index 100% rename from home/misterio/features/cli/nix-index.nix rename to home/gabriel/features/cli/nix-index.nix diff --git a/home/misterio/features/cli/pfetch.nix b/home/gabriel/features/cli/pfetch.nix similarity index 100% rename from home/misterio/features/cli/pfetch.nix rename to home/gabriel/features/cli/pfetch.nix diff --git a/home/misterio/features/cli/shellcolor.nix b/home/gabriel/features/cli/shellcolor.nix similarity index 100% rename from home/misterio/features/cli/shellcolor.nix rename to home/gabriel/features/cli/shellcolor.nix diff --git a/home/misterio/features/cli/ssh.nix b/home/gabriel/features/cli/ssh.nix similarity index 91% rename from home/misterio/features/cli/ssh.nix rename to home/gabriel/features/cli/ssh.nix index b225f61c..743e40c0 100644 --- a/home/misterio/features/cli/ssh.nix +++ b/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" ]; }; diff --git a/home/misterio/features/cli/starship.nix b/home/gabriel/features/cli/starship.nix similarity index 100% rename from home/misterio/features/cli/starship.nix rename to home/gabriel/features/cli/starship.nix diff --git a/home/misterio/features/cli/xpo.nix b/home/gabriel/features/cli/xpo.nix similarity index 100% rename from home/misterio/features/cli/xpo.nix rename to home/gabriel/features/cli/xpo.nix diff --git a/home/misterio/features/desktop/common/default.nix b/home/gabriel/features/desktop/common/default.nix similarity index 100% rename from home/misterio/features/desktop/common/default.nix rename to home/gabriel/features/desktop/common/default.nix diff --git a/home/misterio/features/desktop/common/deluge.nix b/home/gabriel/features/desktop/common/deluge.nix similarity index 100% rename from home/misterio/features/desktop/common/deluge.nix rename to home/gabriel/features/desktop/common/deluge.nix diff --git a/home/misterio/features/desktop/common/discord.nix b/home/gabriel/features/desktop/common/discord.nix similarity index 96% rename from home/misterio/features/desktop/common/discord.nix rename to home/gabriel/features/desktop/common/discord.nix index cd8b62a0..e7d7f2c2 100644 --- a/home/misterio/features/desktop/common/discord.nix +++ b/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" diff --git a/home/misterio/features/desktop/common/dragon.nix b/home/gabriel/features/desktop/common/dragon.nix similarity index 100% rename from home/misterio/features/desktop/common/dragon.nix rename to home/gabriel/features/desktop/common/dragon.nix diff --git a/home/misterio/features/desktop/common/firefox.nix b/home/gabriel/features/desktop/common/firefox.nix similarity index 94% rename from home/misterio/features/desktop/common/firefox.nix rename to home/gabriel/features/desktop/common/firefox.nix index 37f3b8e4..51bb3b2a 100644 --- a/home/misterio/features/desktop/common/firefox.nix +++ b/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" ]; }; }; diff --git a/home/misterio/features/desktop/common/font.nix b/home/gabriel/features/desktop/common/font.nix similarity index 100% rename from home/misterio/features/desktop/common/font.nix rename to home/gabriel/features/desktop/common/font.nix diff --git a/home/misterio/features/desktop/common/gtk.nix b/home/gabriel/features/desktop/common/gtk.nix similarity index 100% rename from home/misterio/features/desktop/common/gtk.nix rename to home/gabriel/features/desktop/common/gtk.nix diff --git a/home/misterio/features/desktop/common/kdeconnect.nix b/home/gabriel/features/desktop/common/kdeconnect.nix similarity index 91% rename from home/misterio/features/desktop/common/kdeconnect.nix rename to home/gabriel/features/desktop/common/kdeconnect.nix index 0e3486e4..04378960 100644 --- a/home/misterio/features/desktop/common/kdeconnect.nix +++ b/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"]; }; } diff --git a/home/misterio/features/desktop/common/pavucontrol.nix b/home/gabriel/features/desktop/common/pavucontrol.nix similarity index 100% rename from home/misterio/features/desktop/common/pavucontrol.nix rename to home/gabriel/features/desktop/common/pavucontrol.nix diff --git a/home/misterio/features/desktop/common/playerctl.nix b/home/gabriel/features/desktop/common/playerctl.nix similarity index 100% rename from home/misterio/features/desktop/common/playerctl.nix rename to home/gabriel/features/desktop/common/playerctl.nix diff --git a/home/misterio/features/desktop/common/qt.nix b/home/gabriel/features/desktop/common/qt.nix similarity index 100% rename from home/misterio/features/desktop/common/qt.nix rename to home/gabriel/features/desktop/common/qt.nix diff --git a/home/misterio/features/desktop/common/qtbase-gtk3-xdp.patch b/home/gabriel/features/desktop/common/qtbase-gtk3-xdp.patch similarity index 100% rename from home/misterio/features/desktop/common/qtbase-gtk3-xdp.patch rename to home/gabriel/features/desktop/common/qtbase-gtk3-xdp.patch diff --git a/home/gabriel/features/desktop/common/sublime-music.nix b/home/gabriel/features/desktop/common/sublime-music.nix new file mode 100644 index 00000000..ed7d6171 --- /dev/null +++ b/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"]; + }; +} diff --git a/home/misterio/features/desktop/common/wayland-wm/cliphist.nix b/home/gabriel/features/desktop/common/wayland-wm/cliphist.nix similarity index 100% rename from home/misterio/features/desktop/common/wayland-wm/cliphist.nix rename to home/gabriel/features/desktop/common/wayland-wm/cliphist.nix diff --git a/home/misterio/features/desktop/common/wayland-wm/default.nix b/home/gabriel/features/desktop/common/wayland-wm/default.nix similarity index 100% rename from home/misterio/features/desktop/common/wayland-wm/default.nix rename to home/gabriel/features/desktop/common/wayland-wm/default.nix diff --git a/home/misterio/features/desktop/common/wayland-wm/gammastep.nix b/home/gabriel/features/desktop/common/wayland-wm/gammastep.nix similarity index 100% rename from home/misterio/features/desktop/common/wayland-wm/gammastep.nix rename to home/gabriel/features/desktop/common/wayland-wm/gammastep.nix diff --git a/home/misterio/features/desktop/common/wayland-wm/imv.nix b/home/gabriel/features/desktop/common/wayland-wm/imv.nix similarity index 100% rename from home/misterio/features/desktop/common/wayland-wm/imv.nix rename to home/gabriel/features/desktop/common/wayland-wm/imv.nix diff --git a/home/misterio/features/desktop/common/wayland-wm/kitty.nix b/home/gabriel/features/desktop/common/wayland-wm/kitty.nix similarity index 100% rename from home/misterio/features/desktop/common/wayland-wm/kitty.nix rename to home/gabriel/features/desktop/common/wayland-wm/kitty.nix diff --git a/home/misterio/features/desktop/common/wayland-wm/mako.nix b/home/gabriel/features/desktop/common/wayland-wm/mako.nix similarity index 100% rename from home/misterio/features/desktop/common/wayland-wm/mako.nix rename to home/gabriel/features/desktop/common/wayland-wm/mako.nix diff --git a/home/misterio/features/desktop/common/wayland-wm/qutebrowser.nix b/home/gabriel/features/desktop/common/wayland-wm/qutebrowser.nix similarity index 99% rename from home/misterio/features/desktop/common/wayland-wm/qutebrowser.nix rename to home/gabriel/features/desktop/common/wayland-wm/qutebrowser.nix index 549018af..dfc4bf54 100644 --- a/home/misterio/features/desktop/common/wayland-wm/qutebrowser.nix +++ b/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" diff --git a/home/misterio/features/desktop/common/wayland-wm/swayidle.nix b/home/gabriel/features/desktop/common/wayland-wm/swayidle.nix similarity index 100% rename from home/misterio/features/desktop/common/wayland-wm/swayidle.nix rename to home/gabriel/features/desktop/common/wayland-wm/swayidle.nix diff --git a/home/misterio/features/desktop/common/wayland-wm/swaylock.nix b/home/gabriel/features/desktop/common/wayland-wm/swaylock.nix similarity index 100% rename from home/misterio/features/desktop/common/wayland-wm/swaylock.nix rename to home/gabriel/features/desktop/common/wayland-wm/swaylock.nix diff --git a/home/misterio/features/desktop/common/wayland-wm/waybar.nix b/home/gabriel/features/desktop/common/wayland-wm/waybar.nix similarity index 100% rename from home/misterio/features/desktop/common/wayland-wm/waybar.nix rename to home/gabriel/features/desktop/common/wayland-wm/waybar.nix diff --git a/home/misterio/features/desktop/common/wayland-wm/wofi-run-shell.patch b/home/gabriel/features/desktop/common/wayland-wm/wofi-run-shell.patch similarity index 100% rename from home/misterio/features/desktop/common/wayland-wm/wofi-run-shell.patch rename to home/gabriel/features/desktop/common/wayland-wm/wofi-run-shell.patch diff --git a/home/misterio/features/desktop/common/wayland-wm/wofi.nix b/home/gabriel/features/desktop/common/wayland-wm/wofi.nix similarity index 100% rename from home/misterio/features/desktop/common/wayland-wm/wofi.nix rename to home/gabriel/features/desktop/common/wayland-wm/wofi.nix diff --git a/home/misterio/features/desktop/common/wayland-wm/zathura.nix b/home/gabriel/features/desktop/common/wayland-wm/zathura.nix similarity index 100% rename from home/misterio/features/desktop/common/wayland-wm/zathura.nix rename to home/gabriel/features/desktop/common/wayland-wm/zathura.nix diff --git a/home/misterio/features/desktop/gnome/default.nix b/home/gabriel/features/desktop/gnome/default.nix similarity index 100% rename from home/misterio/features/desktop/gnome/default.nix rename to home/gabriel/features/desktop/gnome/default.nix diff --git a/home/misterio/features/desktop/hyprland/basic-binds.nix b/home/gabriel/features/desktop/hyprland/basic-binds.nix similarity index 100% rename from home/misterio/features/desktop/hyprland/basic-binds.nix rename to home/gabriel/features/desktop/hyprland/basic-binds.nix diff --git a/home/misterio/features/desktop/hyprland/default.nix b/home/gabriel/features/desktop/hyprland/default.nix similarity index 100% rename from home/misterio/features/desktop/hyprland/default.nix rename to home/gabriel/features/desktop/hyprland/default.nix diff --git a/home/misterio/features/desktop/hyprland/hyprbars.nix b/home/gabriel/features/desktop/hyprland/hyprbars.nix similarity index 100% rename from home/misterio/features/desktop/hyprland/hyprbars.nix rename to home/gabriel/features/desktop/hyprland/hyprbars.nix diff --git a/home/misterio/features/desktop/wireless/default.nix b/home/gabriel/features/desktop/wireless/default.nix similarity index 100% rename from home/misterio/features/desktop/wireless/default.nix rename to home/gabriel/features/desktop/wireless/default.nix diff --git a/home/misterio/features/games/default.nix b/home/gabriel/features/games/default.nix similarity index 77% rename from home/misterio/features/games/default.nix rename to home/gabriel/features/games/default.nix index 3ff3f5a4..4b2afa5e 100644 --- a/home/misterio/features/games/default.nix +++ b/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" diff --git a/home/misterio/features/games/factorio.nix b/home/gabriel/features/games/factorio.nix similarity index 74% rename from home/misterio/features/games/factorio.nix rename to home/gabriel/features/games/factorio.nix index 45bc772e..30774df5 100644 --- a/home/misterio/features/games/factorio.nix +++ b/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"]; }; diff --git a/home/misterio/features/games/lutris.nix b/home/gabriel/features/games/lutris.nix similarity index 86% rename from home/misterio/features/games/lutris.nix rename to home/gabriel/features/games/lutris.nix index ebeb1b16..3060f39b 100644 --- a/home/misterio/features/games/lutris.nix +++ b/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" diff --git a/home/misterio/features/games/osu.nix b/home/gabriel/features/games/osu.nix similarity index 51% rename from home/misterio/features/games/osu.nix rename to home/gabriel/features/games/osu.nix index 712f6f0c..c0b1a8b4 100644 --- a/home/misterio/features/games/osu.nix +++ b/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"]; }; } diff --git a/home/gabriel/features/games/prism-launcher.nix b/home/gabriel/features/games/prism-launcher.nix new file mode 100644 index 00000000..9632a17c --- /dev/null +++ b/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"]; + }; +} diff --git a/home/misterio/features/games/runescape.nix b/home/gabriel/features/games/runescape.nix similarity index 91% rename from home/misterio/features/games/runescape.nix rename to home/gabriel/features/games/runescape.nix index c29ef60b..9f999797 100644 --- a/home/misterio/features/games/runescape.nix +++ b/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"]; }; diff --git a/home/misterio/features/games/star-citizen.nix b/home/gabriel/features/games/star-citizen.nix similarity index 100% rename from home/misterio/features/games/star-citizen.nix rename to home/gabriel/features/games/star-citizen.nix diff --git a/home/misterio/features/games/steam.nix b/home/gabriel/features/games/steam.nix similarity index 97% rename from home/misterio/features/games/steam.nix rename to home/gabriel/features/games/steam.nix index c0a6f816..9ff08469 100644 --- a/home/misterio/features/games/steam.nix +++ b/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" diff --git a/home/misterio/features/games/yuzu.nix b/home/gabriel/features/games/yuzu.nix similarity index 83% rename from home/misterio/features/games/yuzu.nix rename to home/gabriel/features/games/yuzu.nix index d506b822..bcbea4e7 100644 --- a/home/misterio/features/games/yuzu.nix +++ b/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" diff --git a/home/misterio/features/nvim/default.nix b/home/gabriel/features/nvim/default.nix similarity index 100% rename from home/misterio/features/nvim/default.nix rename to home/gabriel/features/nvim/default.nix diff --git a/home/misterio/features/nvim/lsp.nix b/home/gabriel/features/nvim/lsp.nix similarity index 100% rename from home/misterio/features/nvim/lsp.nix rename to home/gabriel/features/nvim/lsp.nix diff --git a/home/misterio/features/nvim/syntaxes.nix b/home/gabriel/features/nvim/syntaxes.nix similarity index 100% rename from home/misterio/features/nvim/syntaxes.nix rename to home/gabriel/features/nvim/syntaxes.nix diff --git a/home/misterio/features/nvim/theme.nix b/home/gabriel/features/nvim/theme.nix similarity index 100% rename from home/misterio/features/nvim/theme.nix rename to home/gabriel/features/nvim/theme.nix diff --git a/home/misterio/features/nvim/ui.nix b/home/gabriel/features/nvim/ui.nix similarity index 100% rename from home/misterio/features/nvim/ui.nix rename to home/gabriel/features/nvim/ui.nix diff --git a/home/misterio/features/pass/default.nix b/home/gabriel/features/pass/default.nix similarity index 85% rename from home/misterio/features/pass/default.nix rename to home/gabriel/features/pass/default.nix index ad9d18ba..a342c738 100644 --- a/home/misterio/features/pass/default.nix +++ b/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"]; }; } diff --git a/home/misterio/features/productivity/default.nix b/home/gabriel/features/productivity/default.nix similarity index 100% rename from home/misterio/features/productivity/default.nix rename to home/gabriel/features/productivity/default.nix diff --git a/home/misterio/features/productivity/khal.nix b/home/gabriel/features/productivity/khal.nix similarity index 100% rename from home/misterio/features/productivity/khal.nix rename to home/gabriel/features/productivity/khal.nix diff --git a/home/misterio/features/productivity/khard.nix b/home/gabriel/features/productivity/khard.nix similarity index 100% rename from home/misterio/features/productivity/khard.nix rename to home/gabriel/features/productivity/khard.nix diff --git a/home/misterio/features/productivity/mail.nix b/home/gabriel/features/productivity/mail.nix similarity index 97% rename from home/misterio/features/productivity/mail.nix rename to home/gabriel/features/productivity/mail.nix index a31aa48c..67505a3c 100644 --- a/home/misterio/features/productivity/mail.nix +++ b/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 = { diff --git a/home/misterio/features/productivity/neomutt.nix b/home/gabriel/features/productivity/neomutt.nix similarity index 100% rename from home/misterio/features/productivity/neomutt.nix rename to home/gabriel/features/productivity/neomutt.nix diff --git a/home/misterio/features/productivity/todoman.nix b/home/gabriel/features/productivity/todoman.nix similarity index 100% rename from home/misterio/features/productivity/todoman.nix rename to home/gabriel/features/productivity/todoman.nix diff --git a/home/misterio/features/productivity/vdirsyncer.nix b/home/gabriel/features/productivity/vdirsyncer.nix similarity index 97% rename from home/misterio/features/productivity/vdirsyncer.nix rename to home/gabriel/features/productivity/vdirsyncer.nix index 84537f5b..002218b0 100644 --- a/home/misterio/features/productivity/vdirsyncer.nix +++ b/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" diff --git a/home/misterio/features/rgb/default.nix b/home/gabriel/features/rgb/default.nix similarity index 100% rename from home/misterio/features/rgb/default.nix rename to home/gabriel/features/rgb/default.nix diff --git a/home/misterio/generic.nix b/home/gabriel/generic.nix similarity index 100% rename from home/misterio/generic.nix rename to home/gabriel/generic.nix diff --git a/home/misterio/global/default.nix b/home/gabriel/global/default.nix similarity index 97% rename from home/misterio/global/default.nix rename to home/gabriel/global/default.nix index e0220387..23e03c3b 100644 --- a/home/misterio/global/default.nix +++ b/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" diff --git a/home/misterio/maia.nix b/home/gabriel/maia.nix similarity index 100% rename from home/misterio/maia.nix rename to home/gabriel/maia.nix diff --git a/home/misterio/merope.nix b/home/gabriel/merope.nix similarity index 100% rename from home/misterio/merope.nix rename to home/gabriel/merope.nix diff --git a/home/misterio/nixpkgs.nix b/home/gabriel/nixpkgs.nix similarity index 100% rename from home/misterio/nixpkgs.nix rename to home/gabriel/nixpkgs.nix diff --git a/home/misterio/pgp.asc b/home/gabriel/pgp.asc similarity index 100% rename from home/misterio/pgp.asc rename to home/gabriel/pgp.asc diff --git a/home/misterio/pleione.nix b/home/gabriel/pleione.nix similarity index 100% rename from home/misterio/pleione.nix rename to home/gabriel/pleione.nix diff --git a/home/misterio/ssh.pub b/home/gabriel/ssh.pub similarity index 100% rename from home/misterio/ssh.pub rename to home/gabriel/ssh.pub diff --git a/home/misterio/features/cli/jira.nix b/home/misterio/features/cli/jira.nix deleted file mode 100644 index a3b160db..00000000 --- a/home/misterio/features/cli/jira.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ pkgs, ... }: -{ - home.packages = [pkgs.jira-cli-go]; - home.persistence = { - "/persist/home/misterio".directories = [".config/.jira"]; - }; -} diff --git a/home/misterio/features/desktop/common/sublime-music.nix b/home/misterio/features/desktop/common/sublime-music.nix deleted file mode 100644 index 71c029f2..00000000 --- a/home/misterio/features/desktop/common/sublime-music.nix +++ /dev/null @@ -1,6 +0,0 @@ -{pkgs, ...}: { - home.packages = [pkgs.stable.sublime-music]; - home.persistence = { - "/persist/home/misterio".directories = [".config/sublime-music"]; - }; -} diff --git a/home/misterio/features/games/prism-launcher.nix b/home/misterio/features/games/prism-launcher.nix deleted file mode 100644 index b04fd307..00000000 --- a/home/misterio/features/games/prism-launcher.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ - pkgs, - lib, - ... -}: { - home.packages = [pkgs.prismlauncher]; - - home.persistence = { - "/persist/home/misterio".directories = [".local/share/PrismLauncher"]; - }; -} diff --git a/hosts/alcyone/default.nix b/hosts/alcyone/default.nix index 1c81791e..8b0f23d3 100644 --- a/hosts/alcyone/default.nix +++ b/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 ]; diff --git a/hosts/alcyone/secrets.yaml b/hosts/alcyone/secrets.yaml index 117b32ea..c90753bc 100644 --- a/hosts/alcyone/secrets.yaml +++ b/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: [] diff --git a/hosts/alcyone/services/git-remote.nix b/hosts/alcyone/services/git-remote.nix index 31eb033b..8c2a898e 100644 --- a/hosts/alcyone/services/git-remote.nix +++ b/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 diff --git a/hosts/alcyone/services/grafana/default.nix b/hosts/alcyone/services/grafana/default.nix index 89eed925..8e240f5f 100644 --- a/hosts/alcyone/services/grafana/default.nix +++ b/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" = { diff --git a/hosts/alcyone/services/website/default.nix b/hosts/alcyone/services/website/default.nix index e5665d23..13f76886 100644 --- a/hosts/alcyone/services/website/default.nix +++ b/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; diff --git a/hosts/atlas/default.nix b/hosts/atlas/default.nix index 3a5bfcc7..67d05647 100644 --- a/hosts/atlas/default.nix +++ b/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 diff --git a/hosts/celaeno/default.nix b/hosts/celaeno/default.nix index 68561ec2..ecbbfa17 100644 --- a/hosts/celaeno/default.nix +++ b/hosts/celaeno/default.nix @@ -4,7 +4,7 @@ ./services ../common/global - ../common/users/misterio + ../common/users/gabriel ../common/optional/docker.nix ]; diff --git a/hosts/common/optional/greetd.nix b/hosts/common/optional/greetd.nix index e35b0ef8..07d70cc7 100644 --- a/hosts/common/optional/greetd.nix +++ b/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 diff --git a/hosts/common/secrets.yaml b/hosts/common/secrets.yaml index 831b8d1d..12695a7d 100644 --- a/hosts/common/secrets.yaml +++ b/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: diff --git a/hosts/common/users/misterio/default.nix b/hosts/common/users/gabriel/default.nix similarity index 70% rename from hosts/common/users/misterio/default.nix rename to hosts/common/users/gabriel/default.nix index dc33cc00..d2a9ae46 100644 --- a/hosts/common/users/misterio/default.nix +++ b/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 = {}; diff --git a/hosts/maia/default.nix b/hosts/maia/default.nix index ae1e64da..13e687c9 100644 --- a/hosts/maia/default.nix +++ b/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 diff --git a/hosts/merope/default.nix b/hosts/merope/default.nix index 0111e05d..92abb183 100644 --- a/hosts/merope/default.nix +++ b/hosts/merope/default.nix @@ -7,7 +7,7 @@ ../common/global ../common/optional/wireless.nix - ../common/users/misterio + ../common/users/gabriel ]; # Static IP address diff --git a/hosts/pleione/default.nix b/hosts/pleione/default.nix index 5aa7ae0e..c8fb4436 100644 --- a/hosts/pleione/default.nix +++ b/hosts/pleione/default.nix @@ -11,7 +11,7 @@ ./hardware-configuration.nix ../common/global - ../common/users/misterio + ../common/users/gabriel ../common/optional/tlp.nix ../common/optional/wireless.nix