commit 337ecbd82fadee9c3b4b621754c6dde0081c854d
parent c8a68b019e3fd0482049544871642cc8a0bd0d67
Author: Leah (ctucx) <git@ctu.cx>
Date: Tue, 19 Nov 2024 15:20:51 +0100
parent c8a68b019e3fd0482049544871642cc8a0bd0d67
Author: Leah (ctucx) <git@ctu.cx>
Date: Tue, 19 Nov 2024 15:20:51 +0100
rename `leah` to `katja` almost everywhere
68 files changed, 117 insertions(+), 153 deletions(-)
diff --git a/configurations/common/default.nix b/configurations/common/default.nix @@ -24,7 +24,7 @@ in { time.timeZone = "Europe/Berlin"; home-manager.useGlobalPkgs = true; - home-manager.users.leah.home.sessionVariables = { + home-manager.users.katja.home.sessionVariables = { NIXPKGS_PATH = NIXPKGS_PATH; NIX_PATH = "nixpkgs=${NIXPKGS_PATH}"; }; @@ -36,7 +36,7 @@ in { nix = { nixPath = lib.mkForce [ "nixpkgs=${NIXPKGS_PATH}" ]; settings = { - trusted-users = [ "root" "leah" "@wheel" ]; + trusted-users = [ "root" "katja" "@wheel" ]; experimental-features = [ "nix-command" "flakes" ]; extra-substituters = [ "https://cache.lix.systems"
diff --git a/configurations/common/programs/ansible.nix b/configurations/common/programs/ansible.nix @@ -8,7 +8,7 @@ let })); in { - home-manager.users.leah = { + home-manager.users.katja = { home.packages = [ ansible pkgs.ansible-lint ]; }; }
diff --git a/configurations/common/programs/bash.nix b/configurations/common/programs/bash.nix @@ -18,7 +18,7 @@ in { eza.enable = true; }; - home-manager.users.leah = { + home-manager.users.katja = { programs = { bash = { enable = true; @@ -34,9 +34,9 @@ in { rm = "rm -i"; - cat = lib.mkIf (builtins.elem "bat" config.home-manager.users.leah.home.packages) "bat -p"; - grep = lib.mkIf (builtins.elem "rg" config.home-manager.users.leah.home.packages) "rg"; - find = lib.mkIf (builtins.elem "rd" config.home-manager.users.leah.home.packages) "fd"; + cat = lib.mkIf (builtins.elem "bat" config.home-manager.users.katja.home.packages) "bat -p"; + grep = lib.mkIf (builtins.elem "rg" config.home-manager.users.katja.home.packages) "rg"; + find = lib.mkIf (builtins.elem "rd" config.home-manager.users.katja.home.packages) "fd"; diff = "diff --color";
diff --git a/configurations/common/programs/bitwarden-cli.nix b/configurations/common/programs/bitwarden-cli.nix @@ -12,7 +12,7 @@ in { }; config = lib.mkIf cfg.enable { - home-manager.users.leah = { + home-manager.users.katja = { home = { packages = [ pkgs.bitwarden-cli ]; };
diff --git a/configurations/common/programs/eza.nix b/configurations/common/programs/eza.nix @@ -12,11 +12,11 @@ in { }; config = lib.mkIf cfg.enable { - home-manager.users.leah.home.packages = with pkgs; [ + home-manager.users.katja.home.packages = with pkgs; [ eza ]; - home-manager.users.leah.home.shellAliases = { + home-manager.users.katja.home.shellAliases = { ls = "eza"; ll = "eza -l"; la = "eza -a";
diff --git a/configurations/common/programs/git.nix b/configurations/common/programs/git.nix @@ -12,7 +12,7 @@ in { }; config = lib.mkIf cfg.enable { - home-manager.users.leah = { + home-manager.users.katja = { # home.packages = [ pkgs.gitui ]; programs = {
diff --git a/configurations/common/programs/gpg.nix b/configurations/common/programs/gpg.nix @@ -18,8 +18,8 @@ in { dbus.packages = (if pkgs.stdenv.isLinux then (with pkgs; [ gcr ]) else []); }; - home-manager.users.leah = lib.mkIf pkgs.stdenv.isLinux { - xdg = { + home-manager.users.katja = { + xdg = lib.mkIf pkgs.stdenv.isLinux { desktopEntries = { gscriptor = { name = "gscriptor";
diff --git a/configurations/common/programs/htop.nix b/configurations/common/programs/htop.nix @@ -12,7 +12,7 @@ in { }; config = lib.mkIf cfg.enable { - home-manager.users.leah = { + home-manager.users.katja = { programs = { htop = { enable = true;
diff --git a/configurations/common/programs/mcfly.nix b/configurations/common/programs/mcfly.nix @@ -12,7 +12,7 @@ in { }; config = lib.mkIf cfg.enable { - home-manager.users.leah.programs.mcfly = { + home-manager.users.katja.programs.mcfly = { enable = true; enableBashIntegration = true; enableZshIntegration = true;
diff --git a/configurations/common/programs/micro.nix b/configurations/common/programs/micro.nix @@ -12,7 +12,7 @@ in { }; config = lib.mkIf cfg.enable { - home-manager.users.leah = { + home-manager.users.katja = { programs.micro = { enable = true; settings = { @@ -30,6 +30,17 @@ in { }; }; + xdg = lib.mkIf pkgs.stdenv.isLinux { + desktopEntries = { + micro = { + name = "micro"; + settings = { + NoDisplay = "true"; + }; + }; + }; + }; + home = { sessionVariables.EDITOR = "micro"; shellAliases.nano = "micro";
diff --git a/configurations/common/programs/networkUtilities.nix b/configurations/common/programs/networkUtilities.nix @@ -15,7 +15,7 @@ in { programs.mtr.enable = (if pkgs.stdenv.isLinux then true else false); programs.traceroute.enable = (if pkgs.stdenv.isLinux then true else false); - home-manager.users.leah.home = { + home-manager.users.katja.home = { packages = with pkgs; [ dnsutils nmap
diff --git a/configurations/common/programs/ocrmypdf.nix b/configurations/common/programs/ocrmypdf.nix @@ -12,7 +12,7 @@ in { }; config = lib.mkIf cfg.enable { - home-manager.users.leah.home.packages = with pkgs; [ + home-manager.users.katja.home.packages = with pkgs; [ ocrmypdf ]; };
diff --git a/configurations/common/programs/password-store.nix b/configurations/common/programs/password-store.nix @@ -12,7 +12,7 @@ in { }; config = lib.mkIf cfg.enable { - home-manager.users.leah = { + home-manager.users.katja = { home = { packages = [ pkgs.pwgen ]; sessionVariables = {
diff --git a/configurations/common/programs/phockup.nix b/configurations/common/programs/phockup.nix @@ -12,7 +12,7 @@ in { }; config = lib.mkIf cfg.enable { - home-manager.users.leah.home.packages = with pkgs; [ + home-manager.users.katja.home.packages = with pkgs; [ phockup ]; };
diff --git a/configurations/common/programs/scripts.nix b/configurations/common/programs/scripts.nix @@ -148,7 +148,7 @@ let in { - home-manager.users.leah.home.packages = [ nix-cleanup colmena-remote ] ++ lib.optionals ( currentSystem == "x86_64-linux") [ + home-manager.users.katja.home.packages = [ nix-cleanup colmena-remote ] ++ lib.optionals ( currentSystem == "x86_64-linux") [ backupToSSD ];
diff --git a/configurations/common/programs/shellUtilities.nix b/configurations/common/programs/shellUtilities.nix @@ -12,7 +12,7 @@ in { }; config = lib.mkIf cfg.enable { - home-manager.users.leah = { + home-manager.users.katja = { home = { packages = with pkgs; [ coreutils
diff --git a/configurations/common/programs/ssh.nix b/configurations/common/programs/ssh.nix @@ -12,7 +12,7 @@ in { }; config = lib.mkIf cfg.enable { - home-manager.users.leah.programs.ssh = { + home-manager.users.katja.programs.ssh = { enable = true; compression = true;
diff --git a/configurations/common/programs/starship.nix b/configurations/common/programs/starship.nix @@ -12,7 +12,7 @@ in { }; config = lib.mkIf cfg.enable { - home-manager.users.leah.programs.starship = { + home-manager.users.katja.programs.starship = { enable = true; enableBashIntegration = true; enableZshIntegration = true;
diff --git a/configurations/common/programs/texlive.nix b/configurations/common/programs/texlive.nix @@ -12,7 +12,7 @@ in { }; config = lib.mkIf cfg.enable { - home-manager.users.leah.home.packages = with pkgs; [ + home-manager.users.katja.home.packages = with pkgs; [ texlive.combined.scheme-full ]; };
diff --git a/configurations/common/programs/tmux.nix b/configurations/common/programs/tmux.nix @@ -12,7 +12,7 @@ in { }; config = lib.mkIf cfg.enable { - home-manager.users.leah.programs.tmux = { + home-manager.users.katja.programs.tmux = { enable = true; clock24 = true; terminal = "xterm-256color";
diff --git a/configurations/common/programs/yt-dlp.nix b/configurations/common/programs/yt-dlp.nix @@ -12,14 +12,14 @@ in { }; config = lib.mkIf cfg.enable { - home-manager.users.leah.home.packages = with pkgs; [ + home-manager.users.katja.home.packages = with pkgs; [ yt-dlp (pkgs.writeShellScriptBin "youtube-dl" '' exec ${pkgs.yt-dlp}/bin/yt-dlp --compat-options youtube-dl "$@" '') ]; - home-manager.users.leah.home.shellAliases = { + home-manager.users.katja.home.shellAliases = { yt-dlp-audio = "yt-dlp --format bestaudio -x --audio-format opus --add-metadata --embed-thumbnail"; }; };
diff --git a/configurations/darwin/aerospace.nix b/configurations/darwin/aerospace.nix @@ -29,7 +29,7 @@ in { ]; }; - home-manager.users.leah.home.file.".aerospace.toml".text = (builtins.replaceStrings + home-manager.users.katja.home.file.".aerospace.toml".text = (builtins.replaceStrings [ "\"mode.main.binding\"" "\"mode.resize.binding\"" "\"if.app-id\"" "\"if.during-aerospace-startup\"" ] [ "mode.main.binding" "mode.resize.binding" "if.app-id" "if.during-aerospace-startup"] (pkgs.std.serde.toTOML {
diff --git a/configurations/darwin/default.nix b/configurations/darwin/default.nix @@ -34,9 +34,9 @@ home-manager = { useUserPackages = true; -# users.leah.imports = [ inputs.mac-app-util.homeManagerModules.default ]; - users.leah.home.homeDirectory = lib.mkForce "/Users/leah/"; - users.leah.home.packages = with pkgs; [ +# users.katja.imports = [ inputs.mac-app-util.homeManagerModules.default ]; + users.katja.home.homeDirectory = lib.mkForce "/Users/katja/"; + users.katja.home.packages = with pkgs; [ bgiparser asitop
diff --git a/configurations/darwin/finder.nix b/configurations/darwin/finder.nix @@ -42,11 +42,10 @@ # Set $HOME as the default location for new Finder windows NewWindowTarget = "PfLo"; - NewWindowTargetPath = "file://${config.home-manager.users.leah.home.homeDirectory}"; + NewWindowTargetPath = "file://${config.home-manager.users.katja.home.homeDirectory}"; }; }; - system.defaults = { NSGlobalDomain = { AppleShowAllExtensions = true;
diff --git a/configurations/darwin/programs/Bitwarden.nix b/configurations/darwin/programs/Bitwarden.nix @@ -14,6 +14,6 @@ }; }; - home-manager.users.leah.home.packages = with pkgs; [ bitwarden-cli ]; + home-manager.users.katja.home.packages = with pkgs; [ bitwarden-cli ]; }
diff --git a/configurations/darwin/programs/iina.nix b/configurations/darwin/programs/iina.nix @@ -28,11 +28,11 @@ quitWhenNoOpenedWindow = true; # set path to youtube-dl provided via nix - ytdlSearchPath = "/etc/profiles/per-user/leah/bin/youtube-dl"; + ytdlSearchPath = "/etc/profiles/per-user/katja/bin/youtube-dl"; }; }; - home-manager.users.leah.home.packages = with pkgs; [ + home-manager.users.katja.home.packages = with pkgs; [ open-in-mpv ];
diff --git a/configurations/darwin/skhd.nix b/configurations/darwin/skhd.nix @@ -2,7 +2,7 @@ { - home-manager.users.leah.home.packages = [ pkgs.skhd ]; + home-manager.users.katja.home.packages = [ pkgs.skhd ]; services.ctucx.skhd = { enable = true;
diff --git a/configurations/darwin/syncthing.nix b/configurations/darwin/syncthing.nix @@ -4,15 +4,15 @@ let syncthingConfig = import ../common/syncthing-config.nix { inherit inputs pkgs config lib; }; in { - age.identityPaths = [ "/Users/leah/.ssh/id_ed25519" ]; + age.identityPaths = [ "/Users/katja/.ssh/id_ed25519" ]; age.secrets = { syncthing-key = { file = ../../secrets + "/${config.networking.hostName}/syncthing/key.age"; - owner = "leah"; + owner = "katja"; }; syncthing-cert = { file = ../../secrets + "/${config.networking.hostName}/syncthing/cert.age"; - owner = "leah"; + owner = "katja"; }; }; @@ -20,13 +20,13 @@ in { syncthing = { enable = true; - user = "leah"; + user = "katja"; group = "staff"; key = config.age.secrets.syncthing-key.path; cert = config.age.secrets.syncthing-cert.path; - dataDir = "/Users/leah"; + dataDir = "/Users/katja"; devices = syncthingConfig.devices; folders = syncthingConfig.folders; };
diff --git a/configurations/darwin/systemSettings.nix b/configurations/darwin/systemSettings.nix @@ -10,7 +10,7 @@ system.activationScripts.postActivation.text = '' # Set the default shell to bash. MacOS doesn't do this like nixOS does - sudo chsh -s ${pkgs.bashInteractive}/bin/bash leah + sudo chsh -s ${pkgs.bashInteractive}/bin/bash katja ''; system.activationScripts.extraSystemSettings.text = '' @@ -130,7 +130,7 @@ screencapture = { disable-shadow = true; - location = "${config.home-manager.users.leah.home.homeDirectory}/Pictures/Screenshots"; + location = "${config.home-manager.users.katja.home.homeDirectory}/Pictures/Screenshots"; }; smb = {
diff --git a/configurations/linux/bluetooth.nix b/configurations/linux/bluetooth.nix @@ -19,7 +19,7 @@ in { enable = true; }; - home-manager.users.leah = { + home-manager.users.katha = { home.packages = [ pkgs.blueman ]; xdg = {
diff --git a/configurations/linux/default.nix b/configurations/linux/default.nix @@ -86,7 +86,6 @@ acme.defaults.email = "letsencrypt@ctu.cx"; }; - age.secrets.leah-systempassword.file = ../../secrets/passwords/leah.age; age.secrets.katja-systempassword.file = ../../secrets/passwords/katja.age; users.mutableUsers = false; @@ -97,18 +96,6 @@ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDb2eZ2ymt+Zsf0eTlmjW2jPdS013lbde1+EGkgu6bz9lVTR8aawshF2HcoaWp5a5dJr3SKyihDM8hbWSYB3qyTHihNGyCArqSvAtZRw301ailRVHGqiwUITTfcg1533TtmWvlJZgOIFM1VvSAfdueDRRRzbygmn749fS9nhUTDzLtjqX5LvhpqhzsD+eOqPrV6Ne8E1e42JxQb5AJPY1gj9mk6eAarvtEHQYEe+/hp9ERjtCdN5DfuOJnqfaKS0ytPj/NbQskbX/TMgeUVio11iC2NbXsnAtzMmtbLX4mxlDQrR6aZmU/rHQ4aeJqI/Tj2rrF46icri7s0tnnit1OjT5PSxXgifcOtn06qoxYZMT1x+Dyrt40vNkGmxmxCnirm8B+6MKXgd/Ys+7tnOm1ht8TmLm96x6KdOiF3Zq/tMxhPAzp8JriTKSo7k7U9XxStFghTbhhBNc7OX89ZbpalLEnvbQiz87gZxhcx8cLvzIjslOHmZOSWC5Pgr4wwuj3Akq63i4ya6/BzM6v4UoBuDAB6fz3NHKL4R5X20la7Pvt7OBysQkGClWfj6ipMR1bFE2mfYtlMioXNgTjC+NCpEl1+81MH7dv2565Hk8CLV8FMxv6GujbAZGjjcM47lpWM1cBQvpBMUA/lLkyiCPK0YxNWAB7Co+jYDl6CR0Ubew== cardno:6445161" ]; - leah = { - isNormalUser = true; - hashedPasswordFile = config.age.secrets.leah-systempassword.path; - extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. - openssh.authorizedKeys.keys = [ - #yubikey gpg - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDb2eZ2ymt+Zsf0eTlmjW2jPdS013lbde1+EGkgu6bz9lVTR8aawshF2HcoaWp5a5dJr3SKyihDM8hbWSYB3qyTHihNGyCArqSvAtZRw301ailRVHGqiwUITTfcg1533TtmWvlJZgOIFM1VvSAfdueDRRRzbygmn749fS9nhUTDzLtjqX5LvhpqhzsD+eOqPrV6Ne8E1e42JxQb5AJPY1gj9mk6eAarvtEHQYEe+/hp9ERjtCdN5DfuOJnqfaKS0ytPj/NbQskbX/TMgeUVio11iC2NbXsnAtzMmtbLX4mxlDQrR6aZmU/rHQ4aeJqI/Tj2rrF46icri7s0tnnit1OjT5PSxXgifcOtn06qoxYZMT1x+Dyrt40vNkGmxmxCnirm8B+6MKXgd/Ys+7tnOm1ht8TmLm96x6KdOiF3Zq/tMxhPAzp8JriTKSo7k7U9XxStFghTbhhBNc7OX89ZbpalLEnvbQiz87gZxhcx8cLvzIjslOHmZOSWC5Pgr4wwuj3Akq63i4ya6/BzM6v4UoBuDAB6fz3NHKL4R5X20la7Pvt7OBysQkGClWfj6ipMR1bFE2mfYtlMioXNgTjC+NCpEl1+81MH7dv2565Hk8CLV8FMxv6GujbAZGjjcM47lpWM1cBQvpBMUA/lLkyiCPK0YxNWAB7Co+jYDl6CR0Ubew== cardno:6445161" - # iphone - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKuteK6BuIa8mgihSaTcsKFKrmhSb2gR8X38hJnso5Vq Shortcuts on ctucx.iPhone" - ]; - }; - katja = { isNormalUser = true; hashedPasswordFile = config.age.secrets.katja-systempassword.path;
diff --git a/configurations/linux/gnome.nix b/configurations/linux/gnome.nix @@ -2,7 +2,6 @@ { - users.users.leah.extraGroups = [ "dialout" "networkmanager"]; nixpkgs.config.allowUnfree = true; @@ -12,11 +11,13 @@ dconf.enable = true; }; + users.users.katja.extraGroups = [ "dialout" "networkmanager"]; + services = { nscd.enable = true; }; - home-manager.users.leah = { + home-manager.users.katja = { manual.html.enable = true; services.gnome-keyring.enable = true;
diff --git a/configurations/linux/gtk.nix b/configurations/linux/gtk.nix @@ -3,7 +3,7 @@ { services.dbus.packages = with pkgs; [ dconf ]; - home-manager.users.leah = { + home-manager.users.katja = { gtk = { enable = true;
diff --git a/configurations/linux/programs/alacritty.nix b/configurations/linux/programs/alacritty.nix @@ -12,7 +12,7 @@ in { }; config = lib.mkIf cfg.enable { - home-manager.users.leah = { + home-manager.users.katja = { home = { sessionVariables = { TERMINAL = "alacritty";
diff --git a/configurations/linux/programs/ausweisapp.nix b/configurations/linux/programs/ausweisapp.nix @@ -12,7 +12,7 @@ in { }; config = lib.mkIf cfg.enable { - home-manager.users.leah = { + home-manager.users.katja = { home.packages = with pkgs; [ AusweisApp2 ];
diff --git a/configurations/linux/programs/communication.nix b/configurations/linux/programs/communication.nix @@ -14,7 +14,7 @@ in { }; config = { - home-manager.users.leah = { + home-manager.users.katja = { home.packages = [ (lib.mkIf cfg.fractal.enable pkgs.fractal) (lib.mkIf cfg.tuba.enable pkgs.tuba)
diff --git a/configurations/linux/programs/ddcutil.nix b/configurations/linux/programs/ddcutil.nix @@ -15,7 +15,7 @@ in { boot.kernelModules = [ "i2c-dev" ]; security.sudo.extraRules= [ - { users = [ "leah" ]; + { users = [ "katja" ]; commands = [ { command = "${pkgs.ddcutil}/bin/ddcutil" ; options= [ "NOPASSWD" ]; @@ -24,7 +24,7 @@ in { } ]; - home-manager.users.leah = { + home-manager.users.katja = { home.packages = [ pkgs.ddcutil ]; }; };
diff --git a/configurations/linux/programs/firefox.nix b/configurations/linux/programs/firefox.nix @@ -12,8 +12,11 @@ in { }; config = lib.mkIf cfg.enable { - home-manager.users.leah = { + home-manager.users.katja = { home = { + packages = [ + pkgs.firefoxpwa + ]; sessionVariables = { BROWSER = "firefox"; }; @@ -25,6 +28,7 @@ in { package = pkgs.firefox; nativeMessagingHosts = with pkgs; [ ff2mpv-rust + firefoxpwa ]; }; };
diff --git a/configurations/linux/programs/imv.nix b/configurations/linux/programs/imv.nix @@ -12,7 +12,7 @@ in { }; config = lib.mkIf cfg.enable { - home-manager.users.leah = { + home-manager.users.katja = { home.packages = [ pkgs.imv ]; xdg = {
diff --git a/configurations/linux/programs/libreoffice.nix b/configurations/linux/programs/libreoffice.nix @@ -12,7 +12,7 @@ in { }; config = lib.mkIf cfg.enable { - home-manager.users.leah = { + home-manager.users.katja = { home = { packages = [ pkgs.libreoffice-fresh ]; };
diff --git a/configurations/linux/programs/mpv.nix b/configurations/linux/programs/mpv.nix @@ -12,7 +12,7 @@ in { }; config = lib.mkIf cfg.enable { - home-manager.users.leah = { + home-manager.users.katja = { home.packages = lib.mkIf config.ctucxConfig.wm.gnome.enable [ pkgs.celluloid ];
diff --git a/configurations/linux/programs/sway.nix b/configurations/linux/programs/sway.nix @@ -26,8 +26,8 @@ in { ]; }); - xsel = self.wl-clipboard-x11; - xclip = self.wl-clipboard-x11; + xsel = super.wl-clipboard-x11; + xclip = super.wl-clipboard-x11; })]; @@ -38,7 +38,7 @@ in { wlr.enable = true; }; - home-manager.users.leah = { + home-manager.users.katja = { home.packages = with pkgs; [ qt5.qtwayland wl-clipboard @@ -51,7 +51,7 @@ in { ''; wayland.windowManager.sway = let - cfg = config.home-manager.users.leah.wayland.windowManager.sway; + cfg = config.home-manager.users.katja.wayland.windowManager.sway; modifier = cfg.config.modifier; in {
diff --git a/configurations/linux/programs/thunar.nix b/configurations/linux/programs/thunar.nix @@ -18,7 +18,7 @@ in { tumbler.enable = true; }; - home-manager.users.leah = { + home-manager.users.katja = { home.packages = with pkgs; [ xfce.thunar ];
diff --git a/configurations/linux/programs/thunderbird.nix b/configurations/linux/programs/thunderbird.nix @@ -12,19 +12,19 @@ in { }; config = lib.mkIf cfg.enable { - home-manager.users.leah = { + home-manager.users.katja = { home.packages = with pkgs; [ thunderbird ]; - systemd.user.services.thunderbird = lib.mkIf config.home-manager.users.leah.wayland.windowManager.sway.enable { + systemd.user.services.thunderbird = lib.mkIf config.home-manager.users.katja.wayland.windowManager.sway.enable { Unit = { After = [ "graphical-session-pre.target" ]; PartOf = [ "graphical-session.target" ]; }; Service = { - Environment = "PATH=/run/wrappers/bin:/home/leah/.nix-profile/bin:/etc/profiles/per-user/leah/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin"; + Environment = "PATH=/run/wrappers/bin:/home/katja/.nix-profile/bin:/etc/profiles/per-user/katja/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin"; ExecStart = "${pkgs.thunderbird}/bin/thunderbird"; Restart = "always"; RestartSec = 5;
diff --git a/configurations/linux/programs/zathura.nix b/configurations/linux/programs/zathura.nix @@ -12,7 +12,7 @@ in { }; config = lib.mkIf cfg.enable { - home-manager.users.leah.home.packages = [ + home-manager.users.katja.home.packages = [ pkgs.zathura ]; };
diff --git a/configurations/linux/qt.nix b/configurations/linux/qt.nix @@ -2,7 +2,7 @@ { - home-manager.users.leah = { + home-manager.users.katja = { home.sessionVariables = { QT_QPA_PLATFORMTHEME = "gnome";
diff --git a/configurations/linux/services/easyeffects.nix b/configurations/linux/services/easyeffects.nix @@ -12,7 +12,7 @@ in { }; config = lib.mkIf cfg.enable { - home-manager.users.leah = { + home-manager.users.katja = { home.packages = with pkgs; [ easyeffects ]; @@ -24,7 +24,7 @@ in { }; Service = { - Environment = "PATH=/run/wrappers/bin:/home/leah/.nix-profile/bin:/etc/profiles/per-user/leah/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin"; + Environment = "PATH=/run/wrappers/bin:/home/katja/.nix-profile/bin:/etc/profiles/per-user/katja/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin"; ExecStart = "${pkgs.easyeffects}/bin/easyeffects --gapplication-service"; Restart = "always"; RestartSec = 5;
diff --git a/configurations/linux/services/mako.nix b/configurations/linux/services/mako.nix @@ -12,7 +12,7 @@ in { }; config = lib.mkIf cfg.enable { - home-manager.users.leah = { + home-manager.users.katja = { services.mako = { enable = true;
diff --git a/configurations/linux/services/pipewire.nix b/configurations/linux/services/pipewire.nix @@ -25,7 +25,7 @@ in { }; }; - home-manager.users.leah.home.packages = lib.mkIf config.ctucxConfig.wm.sway.enable [ + home-manager.users.katja.home.packages = lib.mkIf config.ctucxConfig.wm.sway.enable [ pkgs.pavucontrol ]; };
diff --git a/configurations/linux/services/swaylock.nix b/configurations/linux/services/swaylock.nix @@ -17,7 +17,7 @@ in { security.pam.services.swaylock = {}; - home-manager.users.leah.systemd.user.services = { + home-manager.users.katja.systemd.user.services = { swaylock = { Unit = { Requisite = [ "graphical-session.target" ]; @@ -25,7 +25,7 @@ in { }; Service = { - ExecStart = "${pkgs.swaylock}/bin/swaylock -i /home/leah/Pictures/Backgrounds/lock.png"; + ExecStart = "${pkgs.swaylock}/bin/swaylock -i /home/katja/Pictures/Backgrounds/lock.png"; ExecStopPost = "${pkgs.systemd}/bin/loginctl unlock-session"; };
diff --git a/configurations/linux/services/systemd-lock-handler.nix b/configurations/linux/services/systemd-lock-handler.nix @@ -13,7 +13,7 @@ in { config = lib.mkIf cfg.enable { - home-manager.users.leah.systemd.user = { + home-manager.users.katja.systemd.user = { services.systemd-lock-handler = { Unit = { Description = "Logind lock event to systemd target translation";
diff --git a/configurations/linux/services/usbmuxd.nix b/configurations/linux/services/usbmuxd.nix @@ -9,7 +9,7 @@ users.groups.usbmux = {}; users.users = { - leah.extraGroups = [ "usbmux" ]; + katja.extraGroups = [ "usbmux" ]; usbmux.description = "usbmuxd user"; usbmux.group = "usbmux";
diff --git a/configurations/linux/services/waybar.nix b/configurations/linux/services/waybar.nix @@ -13,7 +13,7 @@ in { config = lib.mkIf cfg.enable { - home-manager.users.leah = { + home-manager.users.katja = { wayland.windowManager.sway.config.startup = [ { always = true; command = "systemctl --user restart waybar"; } ];
diff --git a/configurations/linux/services/wlsunset.nix b/configurations/linux/services/wlsunset.nix @@ -13,7 +13,7 @@ in { config = lib.mkIf cfg.enable { - home-manager.users.leah.services.wlsunset = { + home-manager.users.katja.services.wlsunset = { enable = true; latitude = "8.26"; longitude = "49.01";
diff --git a/configurations/linux/sway.nix b/configurations/linux/sway.nix @@ -7,7 +7,7 @@ ./qt.nix ]; - users.users.leah.extraGroups = [ "dialout" ]; + users.users.katja.extraGroups = [ "dialout" ]; nixpkgs.config.allowUnfree = true; @@ -28,10 +28,10 @@ services = { nscd.enable = true; - getty.autologinUser = "leah"; + getty.autologinUser = "katja"; }; - home-manager.users.leah = { + home-manager.users.katja = { manual.html.enable = true; services.gnome-keyring.enable = true; };
diff --git a/configurations/linux/xdg.nix b/configurations/linux/xdg.nix @@ -2,7 +2,7 @@ { - home-manager.users.leah = { + home-manager.users.katja = { xdg = { enable = true; mime.enable = true;
diff --git a/machines/blechkasten/default.nix b/machines/blechkasten/default.nix @@ -11,7 +11,7 @@ #currently broken in nixpkgs-darwin ctucxConfig.programs.ocrmypdf.enable = lib.mkForce false; - home-manager.users.leah.home.stateVersion = "22.05"; + home-manager.users.katja.home.stateVersion = "24.11"; system.stateVersion = 4; }
diff --git a/machines/briefkasten/hardware-configuration.nix b/machines/briefkasten/hardware-configuration.nix @@ -19,7 +19,7 @@ options = [ "size=10G" "mode=755" ]; }; - fileSystems."/home/leah" = { + fileSystems."/home/katja" = { device = "tmpfs"; fsType = "tmpfs"; options = [ "size=2G" "mode=777" ];
diff --git a/machines/briefkasten/impermanence.nix b/machines/briefkasten/impermanence.nix @@ -31,20 +31,6 @@ programs.fuse.userAllowOther = true; - home-manager.users.leah = { - imports = [ - inputs.impermanence.nixosModules.home-manager.impermanence - ]; - - home.persistence."/nix/persist/home/leah" = { - allowOther = true; - files = [ - ".bash_history" - ".local/share/mcfly/history.db" - ]; - }; - }; - home-manager.users.katja = { imports = [ inputs.impermanence.nixosModules.home-manager.impermanence
diff --git a/machines/briefkasten/smarthome/mosquitto.nix b/machines/briefkasten/smarthome/mosquitto.nix @@ -3,8 +3,8 @@ { age.secrets = { - mosquitto-passwd-leah = { - file = ./. + "/../../../secrets/${config.networking.hostName}/mosquitto/passwd-leah.age"; + mosquitto-passwd-katja = { + file = ./. + "/../../../secrets/${config.networking.hostName}/mosquitto/passwd-katja.age"; owner = "mosquitto"; }; }; @@ -32,7 +32,7 @@ address = "::1"; port = 9005; users = { - leah.passwordFile = config.age.secrets.mosquitto-passwd-leah.path; + katja.passwordFile = config.age.secrets.mosquitto-passwd-katja.path; }; settings = { protocol = "websockets";
diff --git a/machines/coladose/default.nix b/machines/coladose/default.nix @@ -38,8 +38,7 @@ services.openssh.enable = true; system.stateVersion = "23.11"; - home-manager.users.leah.home.stateVersion = "23.11"; - home-manager.users.katja.home.stateVersion = "23.11"; + home-manager.users.katja.home.stateVersion = "24.11"; }
diff --git a/machines/trabbi/default.nix b/machines/trabbi/default.nix @@ -97,7 +97,6 @@ services.email-notify.enable = true; system.stateVersion = "23.11"; - home-manager.users.leah.home.stateVersion = "23.11"; home-manager.users.katja.home.stateVersion = "23.11"; }
diff --git a/machines/wanderduene/default.nix b/machines/wanderduene/default.nix @@ -157,7 +157,6 @@ }; system.stateVersion = "23.05"; - home-manager.users.leah.home.stateVersion = "23.05"; home-manager.users.katja.home.stateVersion = "23.05"; }
diff --git a/machines/wanderduene/syncthing.nix b/machines/wanderduene/syncthing.nix @@ -5,7 +5,7 @@ ctucxConfig.services.syncthing.enable = true; services.syncthing = rec { - dataDir = "/home/leah/syncthing"; + dataDir = "/home/katja/syncthing"; settings.folders = { "${dataDir}/Audiobooks".enable = lib.mkForce false; "${dataDir}/Music".enable = lib.mkForce false;
diff --git a/secrets/briefkasten/mosquitto/passwd-katja.age b/secrets/briefkasten/mosquitto/passwd-katja.age @@ -0,0 +1,12 @@ +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBsUE9KeEVyVk8ybEdYckxS +WU5aLzRQL3JvcDR6TzZJR1l5TWlkNGxLL0VNCjJ5c1ltUlNoangxam9FV0wwRlpZ +NVk3cExaTHNtWTI2K2dzRWxCWm9CNGsKLT4gc3NoLWVkMjU1MTkgNGhLQ013IGdl +WDNtWmxra3JsUmcxbFc2ZjVvQldGVnFKbzAveU0rNnhVazNvWGdwajAKVVYvRTNZ +UnBGZHdUekNBV0VxNDlranRhK2lxM2FLQjc2N1UwOVlIV0NOawotPiBEcGFyRFNf +Ny1ncmVhc2UgekQgZW8iCmFsS0lJbUsvUGRUUnpQSDRnYlR5QzdWMUp0aXJ5STFT +cmd2UmtxOXhUbDk4WklVckFBOFB2YWoxdDVvbmVxZ0YKalZrd0xaTnVkamtjWld4 +bUlZUEJJdlRoCi0tLSAybHJqa1hDb3p3TjBkb256cjBqZ1ptR1NublZXWFkzRTVu +QUd3eVpyaXFJCtH69PckuhDsWTfUGZjeqzGs5fK9aQnkY6ECsSs4rqn5maHFrDEo +0rXH +-----END AGE ENCRYPTED FILE-----
diff --git a/secrets/briefkasten/mosquitto/passwd-leah.age b/secrets/briefkasten/mosquitto/passwd-leah.age @@ -1,10 +0,0 @@ ------BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBqdmM0aDVURUp3aHhxVzhy -c2JCcHczTElwbzl1OXA1SkxDNk5mU0lvNlJjCmRrUGlDR2krUXdXSTQrNnNjM2No -dStqNkQ3bEN2cWY1RkE5MFlLd0UzV0kKLT4gc3NoLWVkMjU1MTkgNGhLQ013IENh -dkRrWkRUem1nTUd2QjdnWEJNWStqNmJSMytKb0FncWZkbUg5alZSemsKVWhoN1lW -ZStrZkw5UmVtcHl1azBVRlcvSGZ2QUhhYUFZRDRRVkNOa3hObwotPiBNa0YtZ3Jl -YXNlCkR3d3M5bFMrcWVaTHAzR3RqSWF3OTgzaWV0MjdKUHJvbGpPR0NXT21yVWta -Q0c1cwotLS0gVkllaFdWbjRTc2NrcXg1dk1zNUhMcUNBSWdINERhZWk0MUdJRkJ0 -UCsxYwqNkck4xnezo4KuFrL7JhzD6pgKlvCi/tLFAEPTZ7jtGyiokbutyBnOcw== ------END AGE ENCRYPTED FILE-----
diff --git a/secrets/passwords/leah.age b/secrets/passwords/leah.age @@ -1,22 +0,0 @@ ------BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBUbFlqTmhlaWUzbzZibE9H -cEFnRTNwRXNQcGpTRTJhRitpYUdFU3l4aVhJCmVPSVAxQ1RVQzFmYlpYV2dOeGUr -aFY4K0ZpUmxIR2EwY1N4eFZ2aWFqMUkKLT4gc3NoLWVkMjU1MTkgcThvY3pnIGU2 -VGlYeFFJaGg5UGxmS2NERzVLWUVtNXVLRGdRZXdEaGtOak12bmtFam8KOFQ2dWVs -N1J4a09abWJZK09EL0dDeCtkQmtsR0RrdjVCRUV4aXIxZ29NcwotPiBzc2gtZWQy -NTUxOSBPSlFWRFEgWWtTLysxKys1cFNkcDhLNGl5ZmFVcjZ1SytKVmEvKzZ1YTBm -aTVTa2J6RQpMV0ViU210M0xXVzA3VXpLOUNTQ2NKNkQxUWY2Q1QycDUybjF4MEF3 -NXhJCi0+IHNzaC1lZDI1NTE5IFpjeGI2ZyBLR24yQ2xBb1NrWWxnL3ZqVzBKQjN1 -OVE3eUt1MFM5RGFFcmZCTHZXMjFNCm9JR1p0WTRZdDhEd0xRRnZCcVVVNWNqZkNQ -NmhWRVhrb0ZWOEVGak5PTzAKLT4gc3NoLWVkMjU1MTkgNGhLQ013IDlScG1tRXNP -QnFXL0Nqa0J5ZFpJcm83V091ajQwNHdSUXlBejhtbEVyelUKajVCSmJhRjlkV3RB -MjFINENJT1NVdGlkVUdQa0wyQ0xZaXdFL1h5Ull0NAotPiBzc2gtZWQyNTUxOSBW -RVVFQ0EgeSt6M0FQRHFCL2I4S1NVNDluNXRIczNGcDZkWlkreHJMSzN3Y2V2TkdE -awpWa29VWjVCMm16Vkc5MXp0TTVxTW5sSk40ZnZnR0JLbzJwR0ZtOWxndlJNCi0+ -IGFmMVYwLWdyZWFzZSAyI3sgaUh2IGMKeWhtQU5nbUFFYms5TENxQmk1bTdrV1N6 -a3k0TXJocFd6T3RUWk9IazFXR0JYTmczazA1WUxHZkdCTFJ4Ci0tLSBrMElyOEJC -YkUwYndrNnBaSDdpMEUwV0lkdlFZaUEzRzl1eVpHMVdZeGNFCqhMMjjwf3gF9RF4 -k2sk8+6XslISMs5YgFqq+i/qcXpRv0VuxG8ZdjvM0goj72mpU+waJ0C7hp7V0Zc/ -46iLLoDlWikKxVbiN5zxzSWCk4CFpeJ9Cwz1O6Xqv2g25ocx5ghPHsNzOr09seL/ -Iklrwp+jYc4pRAlYdLVehId8aMonJszUEAxcETVpIQ== ------END AGE ENCRYPTED FILE-----
diff --git a/secrets/secrets.nix b/secrets/secrets.nix @@ -13,7 +13,6 @@ let in { "passwords/leah-at-f2k1-de.age".publicKeys = [ main-key trabbi wanderduene wanderduene-old briefkasten ]; - "passwords/leah.age".publicKeys = [ main-key trabbi wanderduene wanderduene-old briefkasten coladose ]; "passwords/katja.age".publicKeys = [ main-key trabbi wanderduene wanderduene-old briefkasten coladose ]; "restic-server/briefkasten.age".publicKeys = [ main-key trabbi briefkasten ]; @@ -37,7 +36,7 @@ in { "briefkasten/influx/master_token.age".publicKeys = [ main-key briefkasten ]; "briefkasten/influx/backup_env.age".publicKeys = [ main-key briefkasten ]; - "briefkasten/mosquitto/passwd-leah.age".publicKeys = [ main-key briefkasten ]; + "briefkasten/mosquitto/passwd-katja.age".publicKeys = [ main-key briefkasten ]; "briefkasten/zigbee2mqtt/secrets.age".publicKeys = [ main-key briefkasten ]; "briefkasten/zigbee2mqtt/htpasswd.age".publicKeys = [ main-key briefkasten ];