refactor: migrate user from michaotic to mikl
This commit is contained in:
parent
514090fced
commit
a465daa9c7
7 changed files with 19 additions and 19 deletions
|
|
@ -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;
|
||||
};
|
||||
}
|
||||
];
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 = [
|
||||
|
|
|
|||
|
|
@ -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=";
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Reference in a new issue