diff --git a/flake.nix b/flake.nix index 5894172..e864fc6 100644 --- a/flake.nix +++ b/flake.nix @@ -105,16 +105,16 @@ }: let devices = { - vinzenz-lpt2 = { + muede-lpt2 = { system = "x86_64-linux"; home-manager-users = { - inherit (self.homeConfigurations) vinzenz; + inherit (self.homeConfigurations) muede; }; }; - vinzenz-pc2 = { + muede-pc2 = { system = "x86_64-linux"; home-manager-users = { - inherit (self.homeConfigurations) vinzenz; + inherit (self.homeConfigurations) muede; }; }; ronja-pc = { @@ -197,7 +197,7 @@ homeModules = importModuleDir ./homeModules; homeConfigurations = { - vinzenz = ./homeConfigurations/vinzenz; + muede = ./homeConfigurations/muede; ronja = ./homeConfigurations/ronja; }; diff --git a/homeConfigurations/vinzenz/.config/containers/policy.json b/homeConfigurations/muede/.config/containers/policy.json similarity index 100% rename from homeConfigurations/vinzenz/.config/containers/policy.json rename to homeConfigurations/muede/.config/containers/policy.json diff --git a/homeConfigurations/vinzenz/default.nix b/homeConfigurations/muede/default.nix similarity index 100% rename from homeConfigurations/vinzenz/default.nix rename to homeConfigurations/muede/default.nix diff --git a/homeConfigurations/vinzenz/editorconfig.nix b/homeConfigurations/muede/editorconfig.nix similarity index 100% rename from homeConfigurations/vinzenz/editorconfig.nix rename to homeConfigurations/muede/editorconfig.nix diff --git a/homeConfigurations/vinzenz/element.nix b/homeConfigurations/muede/element.nix similarity index 100% rename from homeConfigurations/vinzenz/element.nix rename to homeConfigurations/muede/element.nix diff --git a/homeConfigurations/vinzenz/fonts.nix b/homeConfigurations/muede/fonts.nix similarity index 100% rename from homeConfigurations/vinzenz/fonts.nix rename to homeConfigurations/muede/fonts.nix diff --git a/homeConfigurations/vinzenz/fuzzel.nix b/homeConfigurations/muede/fuzzel.nix similarity index 100% rename from homeConfigurations/vinzenz/fuzzel.nix rename to homeConfigurations/muede/fuzzel.nix diff --git a/homeConfigurations/vinzenz/git.nix b/homeConfigurations/muede/git.nix similarity index 100% rename from homeConfigurations/vinzenz/git.nix rename to homeConfigurations/muede/git.nix diff --git a/homeConfigurations/vinzenz/gnome.nix b/homeConfigurations/muede/gnome.nix similarity index 100% rename from homeConfigurations/vinzenz/gnome.nix rename to homeConfigurations/muede/gnome.nix diff --git a/homeConfigurations/vinzenz/niri.nix b/homeConfigurations/muede/niri.nix similarity index 100% rename from homeConfigurations/vinzenz/niri.nix rename to homeConfigurations/muede/niri.nix diff --git a/homeConfigurations/vinzenz/ssh.nix b/homeConfigurations/muede/ssh.nix similarity index 100% rename from homeConfigurations/vinzenz/ssh.nix rename to homeConfigurations/muede/ssh.nix diff --git a/homeConfigurations/vinzenz/starship.nix b/homeConfigurations/muede/starship.nix similarity index 97% rename from homeConfigurations/vinzenz/starship.nix rename to homeConfigurations/muede/starship.nix index 458058d..1550aac 100644 --- a/homeConfigurations/vinzenz/starship.nix +++ b/homeConfigurations/muede/starship.nix @@ -33,9 +33,6 @@ style_user = "bg:color_r fg:text_r"; style_root = "bold bg:color_r fg:text_r"; show_always = true; - aliases = { - "vinzenz" = "müde"; - }; }; os = { disabled = false; @@ -47,8 +44,8 @@ format = "$hostname"; ssh_symbol = ""; aliases = { - "vinzenz-lpt2" = "lpt"; - "vinzenz-pc2" = "pc"; + "muede-lpt2" = "lpt"; + "muede-pc2" = "pc"; }; }; container = { diff --git a/homeConfigurations/vinzenz/swaylock.nix b/homeConfigurations/muede/swaylock.nix similarity index 100% rename from homeConfigurations/vinzenz/swaylock.nix rename to homeConfigurations/muede/swaylock.nix diff --git a/homeConfigurations/vinzenz/swaync.nix b/homeConfigurations/muede/swaync.nix similarity index 100% rename from homeConfigurations/vinzenz/swaync.nix rename to homeConfigurations/muede/swaync.nix diff --git a/homeConfigurations/vinzenz/vscode.nix b/homeConfigurations/muede/vscode.nix similarity index 100% rename from homeConfigurations/vinzenz/vscode.nix rename to homeConfigurations/muede/vscode.nix diff --git a/homeConfigurations/vinzenz/waybar.css b/homeConfigurations/muede/waybar.css similarity index 100% rename from homeConfigurations/vinzenz/waybar.css rename to homeConfigurations/muede/waybar.css diff --git a/homeConfigurations/vinzenz/waybar.nix b/homeConfigurations/muede/waybar.nix similarity index 100% rename from homeConfigurations/vinzenz/waybar.nix rename to homeConfigurations/muede/waybar.nix diff --git a/homeConfigurations/vinzenz/wlogout.nix b/homeConfigurations/muede/wlogout.nix similarity index 100% rename from homeConfigurations/vinzenz/wlogout.nix rename to homeConfigurations/muede/wlogout.nix diff --git a/homeConfigurations/vinzenz/zsh.nix b/homeConfigurations/muede/zsh.nix similarity index 94% rename from homeConfigurations/vinzenz/zsh.nix rename to homeConfigurations/muede/zsh.nix index f2fc674..16f00e1 100644 --- a/homeConfigurations/vinzenz/zsh.nix +++ b/homeConfigurations/muede/zsh.nix @@ -2,7 +2,7 @@ { config.programs.zsh = { initContent = '' - export PATH=$PATH:/home/vinzenz/.cargo/bin + export PATH=$PATH:$HOME/.cargo/bin bindkey "^[[1;5C" forward-word bindkey "^[[1;5D" backward-word diff --git a/homeModules/gnome-extensions.nix b/homeModules/gnome-extensions.nix index 9c30c40..0e6ca16 100644 --- a/homeModules/gnome-extensions.nix +++ b/homeModules/gnome-extensions.nix @@ -6,7 +6,7 @@ ... }: { - options.vinzenz.gnome-extensions = + options.muede.gnome-extensions = let mkDefaultEnabledOption = name: @@ -40,7 +40,7 @@ config = let - cfg = config.vinzenz.gnome-extensions; + cfg = config.muede.gnome-extensions; in lib.mkIf cfg.enable ( lib.mkMerge [ diff --git a/nixosConfigurations/forgejo-runner-1/default.nix b/nixosConfigurations/forgejo-runner-1/default.nix index c64882b..4196430 100644 --- a/nixosConfigurations/forgejo-runner-1/default.nix +++ b/nixosConfigurations/forgejo-runner-1/default.nix @@ -14,9 +14,9 @@ users.users = { root.openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFCJUpbpB3KEKVoKWsKoar9J4RNah8gmQoSH6jQEw5dY vinzenz-pixel-JuiceSSH" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO1CRn4yYTL4XUdCebE8Z4ZeuMujBjorTdWifg911EOv vinzenz-pc2 home roaming" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPDNpLDmctyqGpow/ElQvdhY4BLBPS/sigDJ1QEcC7wC vinzenz-lpt2-roaming" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFCJUpbpB3KEKVoKWsKoar9J4RNah8gmQoSH6jQEw5dY pixel-JuiceSSH" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO1CRn4yYTL4XUdCebE8Z4ZeuMujBjorTdWifg911EOv pc2 home roaming" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPDNpLDmctyqGpow/ElQvdhY4BLBPS/sigDJ1QEcC7wC lpt2-roaming" ]; }; }; diff --git a/nixosConfigurations/hetzner-vpn2/default.nix b/nixosConfigurations/hetzner-vpn2/default.nix index 5aeb629..5974763 100644 --- a/nixosConfigurations/hetzner-vpn2/default.nix +++ b/nixosConfigurations/hetzner-vpn2/default.nix @@ -12,9 +12,9 @@ users.users.root.openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICdYqY3Y1/f1bsAi5Qfyr/UWuX9ixu96IeAlhoQaJkbf" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFCJUpbpB3KEKVoKWsKoar9J4RNah8gmQoSH6jQEw5dY vinzenz-pixel-JuiceSSH" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO1CRn4yYTL4XUdCebE8Z4ZeuMujBjorTdWifg911EOv vinzenz-pc2 home roaming" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPDNpLDmctyqGpow/ElQvdhY4BLBPS/sigDJ1QEcC7wC vinzenz-lpt2-roaming" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFCJUpbpB3KEKVoKWsKoar9J4RNah8gmQoSH6jQEw5dY pixel-JuiceSSH" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO1CRn4yYTL4XUdCebE8Z4ZeuMujBjorTdWifg911EOv pc2 home roaming" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPDNpLDmctyqGpow/ElQvdhY4BLBPS/sigDJ1QEcC7wC lpt2-roaming" ]; system.autoUpgrade.allowReboot = true; diff --git a/nixosConfigurations/vinzenz-lpt2/default.nix b/nixosConfigurations/muede-lpt2/default.nix similarity index 82% rename from nixosConfigurations/vinzenz-lpt2/default.nix rename to nixosConfigurations/muede-lpt2/default.nix index 8b2c909..61ef827 100644 --- a/nixosConfigurations/vinzenz-lpt2/default.nix +++ b/nixosConfigurations/muede-lpt2/default.nix @@ -2,12 +2,12 @@ { imports = [ ./hardware.nix - self.nixosModules.user-vinzenz + self.nixosModules.user-muede self.nixosModules.gnome self.nixosModules.wine-gaming self.nixosModules.steam self.nixosModules.podman - self.nixosModules.vinzenz-desktop-settings + self.nixosModules.muede-desktop-settings self.nixosModules.intel-graphics self.nixosModules.secure-boot ]; @@ -27,9 +27,9 @@ # Configure console keymap console.keyMap = "de"; - users.users.vinzenz.openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFCJUpbpB3KEKVoKWsKoar9J4RNah8gmQoSH6jQEw5dY vinzenz-pixel-JuiceSSH" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO1CRn4yYTL4XUdCebE8Z4ZeuMujBjorTdWifg911EOv vinzenz-pc2 home roaming" + users.users.muede.openssh.authorizedKeys.keys = [ + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFCJUpbpB3KEKVoKWsKoar9J4RNah8gmQoSH6jQEw5dY pixel-JuiceSSH" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO1CRn4yYTL4XUdCebE8Z4ZeuMujBjorTdWifg911EOv pc2 home roaming" ]; programs = { @@ -60,5 +60,7 @@ ]; boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; + + users.users.muede.home = "/home/vinzenz"; }; } diff --git a/nixosConfigurations/vinzenz-lpt2/hardware.nix b/nixosConfigurations/muede-lpt2/hardware.nix similarity index 100% rename from nixosConfigurations/vinzenz-lpt2/hardware.nix rename to nixosConfigurations/muede-lpt2/hardware.nix diff --git a/nixosConfigurations/vinzenz-pc2/default.nix b/nixosConfigurations/muede-pc2/default.nix similarity index 78% rename from nixosConfigurations/vinzenz-pc2/default.nix rename to nixosConfigurations/muede-pc2/default.nix index 2c1fb29..886757f 100644 --- a/nixosConfigurations/vinzenz-pc2/default.nix +++ b/nixosConfigurations/muede-pc2/default.nix @@ -5,12 +5,12 @@ ./vscode-server.nix ./hass.nix - self.nixosModules.user-vinzenz + self.nixosModules.user-muede self.nixosModules.gnome self.nixosModules.wine-gaming self.nixosModules.steam self.nixosModules.podman - self.nixosModules.vinzenz-desktop-settings + self.nixosModules.muede-desktop-settings self.nixosModules.amd-graphics self.nixosModules.secure-boot ]; @@ -30,10 +30,10 @@ # Configure console keymap console.keyMap = "de"; - users.users.vinzenz.openssh.authorizedKeys.keys = [ + users.users.muede.openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINrY6tcgnoC/xbgL7vxSjddEY9MBxRXe9n2cAHt88/TT home roaming" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFCJUpbpB3KEKVoKWsKoar9J4RNah8gmQoSH6jQEw5dY vinzenz-pixel-JuiceSSH" - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPDNpLDmctyqGpow/ElQvdhY4BLBPS/sigDJ1QEcC7wC vinzenz-lpt2-roaming" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFCJUpbpB3KEKVoKWsKoar9J4RNah8gmQoSH6jQEw5dY pixel-JuiceSSH" + "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPDNpLDmctyqGpow/ElQvdhY4BLBPS/sigDJ1QEcC7wC lpt2-roaming" ]; environment.systemPackages = with pkgs; [ lact ]; @@ -42,5 +42,7 @@ # Factorio 34197 ]; + + users.users.muede.home = "/home/vinzenz"; }; } diff --git a/nixosConfigurations/vinzenz-pc2/fstab.nix b/nixosConfigurations/muede-pc2/fstab.nix similarity index 100% rename from nixosConfigurations/vinzenz-pc2/fstab.nix rename to nixosConfigurations/muede-pc2/fstab.nix diff --git a/nixosConfigurations/vinzenz-pc2/hardware.nix b/nixosConfigurations/muede-pc2/hardware.nix similarity index 100% rename from nixosConfigurations/vinzenz-pc2/hardware.nix rename to nixosConfigurations/muede-pc2/hardware.nix diff --git a/nixosConfigurations/vinzenz-pc2/hass.nix b/nixosConfigurations/muede-pc2/hass.nix similarity index 100% rename from nixosConfigurations/vinzenz-pc2/hass.nix rename to nixosConfigurations/muede-pc2/hass.nix diff --git a/nixosConfigurations/vinzenz-pc2/vscode-server.nix b/nixosConfigurations/muede-pc2/vscode-server.nix similarity index 100% rename from nixosConfigurations/vinzenz-pc2/vscode-server.nix rename to nixosConfigurations/muede-pc2/vscode-server.nix diff --git a/nixosConfigurations/ronja-pc/default.nix b/nixosConfigurations/ronja-pc/default.nix index 7630611..8e1eb52 100644 --- a/nixosConfigurations/ronja-pc/default.nix +++ b/nixosConfigurations/ronja-pc/default.nix @@ -11,7 +11,7 @@ self.nixosModules.gnome self.nixosModules.steam self.nixosModules.wine-gaming - self.nixosModules.vinzenz-desktop-settings + self.nixosModules.muede-desktop-settings ]; config = { diff --git a/nixosModules/gnome.nix b/nixosModules/gnome.nix index ead61d0..260fbbd 100644 --- a/nixosModules/gnome.nix +++ b/nixosModules/gnome.nix @@ -5,7 +5,7 @@ ... }: { - options.vinzenz = { + options.muede = { keep-gnome-default-apps = lib.mkEnableOption "keep gnome default apps"; }; @@ -37,7 +37,7 @@ gpaste.enable = true; }; } - (lib.mkIf (!config.vinzenz.keep-gnome-default-apps) { + (lib.mkIf (!config.muede.keep-gnome-default-apps) { environment.gnome.excludePackages = with pkgs; [ cheese # photo booth epiphany # web browser diff --git a/nixosModules/vinzenz-desktop-settings.nix b/nixosModules/muede-desktop-settings.nix similarity index 100% rename from nixosModules/vinzenz-desktop-settings.nix rename to nixosModules/muede-desktop-settings.nix diff --git a/nixosModules/user-vinzenz.nix b/nixosModules/user-muede.nix similarity index 79% rename from nixosModules/user-vinzenz.nix rename to nixosModules/user-muede.nix index 13ccf11..959be07 100644 --- a/nixosModules/user-vinzenz.nix +++ b/nixosModules/user-muede.nix @@ -1,10 +1,9 @@ { pkgs, ... }: { - users.users.vinzenz = { + users.users.muede = { isNormalUser = true; - name = "vinzenz"; + name = "muede"; description = "müde"; - home = "/home/vinzenz"; extraGroups = [ "networkmanager" "wheel" @@ -21,7 +20,7 @@ autoSubUidGidRange = true; }; - nix.settings.trusted-users = [ "vinzenz" ]; + nix.settings.trusted-users = [ "muede" ]; allowedUnfreePackages = [ "rider"