From a465daa9c78441da300d5f8e52c51af8007efa81 Mon Sep 17 00:00:00 2001 From: mikl Date: Fri, 3 Jul 2026 21:41:42 +0300 Subject: [PATCH] refactor: migrate user from michaotic to mikl --- flake.nix | 4 ++-- home/default.nix | 6 +++--- home/zsh.nix | 2 +- hosts/common/default.nix | 4 ++-- hosts/muscari/default.nix | 4 ++-- hosts/poppy/default.nix | 14 +++++++------- hosts/poppy/system.nix | 4 ++-- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/flake.nix b/flake.nix index e11eb5f..91987eb 100644 --- a/flake.nix +++ b/flake.nix @@ -42,7 +42,7 @@ useGlobalPkgs = true; useUserPackages = true; backupFileExtension = "backup"; - users.michaotic = import ./home; + users.mikl = import ./home; }; } ]; @@ -59,7 +59,7 @@ useGlobalPkgs = true; useUserPackages = true; backupFileExtension = "backup"; - users.michaotic = import ./home; + users.mikl = import ./home; }; } ]; diff --git a/home/default.nix b/home/default.nix index edea693..cf0d005 100644 --- a/home/default.nix +++ b/home/default.nix @@ -1,20 +1,20 @@ -{ pkgs, ... }: +{ pkgs, lib, ... }: { imports = [ ./cli.nix ./git.nix ./ssh.nix ./zsh.nix - ./duti.nix ./pass.nix ./syncthing.nix + # ./duti.nix - импортируется только в hosts/poppy/default.nix (macOS only) ]; home.stateVersion = "24.11"; home.sessionVariables = { SEARXNG_URL = "https://search.iscg.dev"; - PATH = "/etc/profiles/per-user/michaotic/bin:$HOME/.nix-profile/bin:$HOME/bin:$HOME/.local/bin:$HOME/.npm-global/bin:/Users/michaotic/.opencode/bin:/Users/michaotic/.local/share/pi-node/node-v22.23.1-darwin-arm64/bin"; + PATH = "/etc/profiles/per-user/mikl/bin:$HOME/.nix-profile/bin:$HOME/bin:$HOME/.local/bin:$HOME/.npm-global/bin:/Users/mikl/.opencode/bin:/Users/mikl/.local/share/pi-node/node-v22.23.1-darwin-arm64/bin"; # OPENROUTER_API_KEY = ""; # TODO: move to sops-nix secrets SOPS_AGE_KEY_FILE = "$HOME/.config/sops/age/keys.txt"; EDITOR = "micro"; diff --git a/home/zsh.nix b/home/zsh.nix index 9f00444..2a5db39 100644 --- a/home/zsh.nix +++ b/home/zsh.nix @@ -75,7 +75,7 @@ # Init content - uses lib.mkBefore to run before home-manager generated code initContent = lib.mkMerge [ (lib.mkBefore '' - export PATH="/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/sbin:/usr/sbin:$HOME/.nix-profile/bin:/etc/profiles/per-user/michaotic/bin:$PATH" + export PATH="/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/sbin:/usr/sbin:$HOME/.nix-profile/bin:/etc/profiles/per-user/mikl/bin:$PATH" '') '' # Show fastfetch on shell start diff --git a/hosts/common/default.nix b/hosts/common/default.nix index 2e570d2..0e9b6c6 100644 --- a/hosts/common/default.nix +++ b/hosts/common/default.nix @@ -9,10 +9,10 @@ # Required when using zsh as user shell programs.zsh.enable = true; - users.users.michaotic = { + users.users.mikl = { isNormalUser = true; shell = pkgs.zsh; - home = "/home/michaotic"; + home = "/home/mikl"; }; environment.systemPackages = [ diff --git a/hosts/muscari/default.nix b/hosts/muscari/default.nix index 56cb3b0..342905b 100644 --- a/hosts/muscari/default.nix +++ b/hosts/muscari/default.nix @@ -31,9 +31,9 @@ boot.loader.systemd-boot.enable = lib.mkForce false; boot.loader.efi.canTouchEfiVariables = lib.mkForce false; - # SSH ключи для michaotic: forgejo .keys endpoint с sha256-pinning + # SSH ключи для mikl: forgejo .keys endpoint с sha256-pinning # + hardcoded fallback ключ для восстановления - users.users.michaotic.openssh.authorizedKeys.keyFiles = [ + users.users.mikl.openssh.authorizedKeys.keyFiles = [ (pkgs.fetchurl { url = "https://git.iscg.dev/mikl.keys"; sha256 = "sha256-4n6QLUPozdhHOmsRCuFn7HR9BU3nF0/GR2E7s5Lpz+Q="; diff --git a/hosts/poppy/default.nix b/hosts/poppy/default.nix index a1a0834..2d03646 100644 --- a/hosts/poppy/default.nix +++ b/hosts/poppy/default.nix @@ -2,14 +2,14 @@ imports = [ ./apps.nix ./system.nix ]; networking.hostName = "poppy"; - system.primaryUser = "michaotic"; + system.primaryUser = "mikl"; system.stateVersion = 7; nixpkgs.config.allowUnfree = true; nix.enable = false; - users.users.michaotic = { - home = "/Users/michaotic"; + users.users.mikl = { + home = "/Users/mikl"; shell = pkgs.zsh; }; @@ -17,13 +17,13 @@ # Apply default apps via duti on activation system.activationScripts.defaultApps.text = '' - if [ -f "/Users/michaotic/.config/duti/config" ]; then - ${pkgs.duti}/bin/duti -d /Users/michaotic/.config/duti/config || true + if [ -f "/Users/mikl/.config/duti/config" ]; then + ${pkgs.duti}/bin/duti -d /Users/mikl/.config/duti/config || true fi ''; - home-manager.users.michaotic = { - imports = [ ../../home/kitty.nix ]; + home-manager.users.mikl = { + imports = [ ../../home/kitty.nix ../../home/duti.nix ]; programs.zsh.shellAliases = { switch = "darwin-rebuild switch --flake .#poppy"; update = "nix flake update && darwin-rebuild switch --flake .#poppy"; diff --git a/hosts/poppy/system.nix b/hosts/poppy/system.nix index 5962723..6fbbaa7 100644 --- a/hosts/poppy/system.nix +++ b/hosts/poppy/system.nix @@ -132,7 +132,7 @@ "/System/Applications/Calendar.app" "/Applications/Obsidian.app" "/Applications/VSCodium.app" - "/Users/michaotic/Applications/Home Manager Apps/kitty.app" + "/Users/mikl/Applications/Home Manager Apps/kitty.app" "/System/Applications/Books.app" "/System/Applications/QuickTime Player.app" ]; @@ -141,7 +141,7 @@ system.activationScripts.postActivation.text = '' echo "Restarting Dock..." - sudo -u michaotic /usr/bin/killall Dock + sudo -u mikl /usr/bin/killall Dock ''; security.pam.services.sudo_local.touchIdAuth = true;