diff --git a/.gitignore b/.gitignore index 633dbea..958cb85 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ for_config/* home-manager/modules/custom/* nixos/configuration.nix -nixos/my.nix -home-manager/modules/custom/config.nix \ No newline at end of file +nixos/my.nix \ No newline at end of file diff --git a/home-manager/modules/git.nix b/home-manager/modules/git.nix index 62b0fff..a04a8a1 100644 --- a/home-manager/modules/git.nix +++ b/home-manager/modules/git.nix @@ -4,9 +4,12 @@ programs.git = { enable = true; - settings.user = { - name = "Krosh"; - email = "gudovdo@my.msu.ru"; + settings = { + pull.rebase = true; + user = { + name = "Krosh"; + email = "gudovdo@my.msu.ru"; + }; }; }; } diff --git a/home-manager/modules/zsh/zsh.nix b/home-manager/modules/zsh/zsh.nix index edb1265..2fd829e 100644 --- a/home-manager/modules/zsh/zsh.nix +++ b/home-manager/modules/zsh/zsh.nix @@ -63,7 +63,7 @@ rr = "sudo nixos-rebuild switch"; amnezia = '' - (pgrep -x "AmneziaVPN-service" > /dev/null 2>&1 || sudo AmneziaVPN-service > /dev/null 2>&1 &) & + (pgrep -x ".AmneziaVPN-ser" > /dev/null 2>&1 || sudo AmneziaVPN-service > /dev/null 2>&1 &) & AmneziaVPN > /dev/null 2>&1 & ''; # i don't know any good ways for it. };