diff --git a/flake.lock b/flake.lock index 61131fa..7bcb400 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1684176547, + "lastModified": 1684251214, "narHash": "sha256-c+hiXMdeBXKWGZqU/3RPz3Wymg0UcgOnbcW1eJip+88=", "owner": "cachix", "repo": "devenv", - "rev": "1344383a60ac5d18eb0f85555023004755bc2d11", + "rev": "957e4eb5ce74541f63af5e221a7917107c0c1d22", "type": "github" }, "original": { @@ -164,11 +164,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1684130981, - "narHash": "sha256-5IPp/rUAOogega5xuRoxcpfkwlGDAyWdizL0Tp2GA4s=", + "lastModified": 1684280442, + "narHash": "sha256-nC1/kfh6tpMQSLQalbNTNnireIlxvLLugrjZdasNh+I=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d41eea2839de7de0f2cbe4aa90fde5db8afcd30a", + "rev": "6c591e7adc514090a77209f56c9d0c551ab8530d", "type": "github" }, "original": { diff --git a/nix/home-manager/flake.lock b/nix/home-manager/flake.lock index aa68c1d..6ea11cf 100644 --- a/nix/home-manager/flake.lock +++ b/nix/home-manager/flake.lock @@ -82,11 +82,11 @@ ] }, "locked": { - "lastModified": 1684061181, - "narHash": "sha256-EJpZ+Drpt3aHpowddpsQFBWsqLSJHyP6dnremTVMdWw=", + "lastModified": 1684321175, + "narHash": "sha256-V4EbM+jK7pvjKBaj0dgAiW9ultzDE27Nz5fRyu/ceMk=", "owner": "nix-community", "repo": "home-manager", - "rev": "e4272987f785a8848205263abb4911b922c21e1b", + "rev": "59659243cd4ababda605e79b4a9c2e6d83e24c86", "type": "github" }, "original": { @@ -205,11 +205,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1684049129, - "narHash": "sha256-7WB9LpnPNAS8oI7hMoHeKLNhRX7k3CI9uWBRSfmOCCE=", + "lastModified": 1684215771, + "narHash": "sha256-fsum28z+g18yreNa1Y7MPo9dtps5h1VkHfZbYQ+YPbk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0470f36b02ef01d4f43c641bbf07020bcab71bf1", + "rev": "963006aab35e3e8ebbf6052b6bf4ea712fdd3c28", "type": "github" }, "original": { diff --git a/nix/home-manager/home.nix b/nix/home-manager/home.nix index a1431eb..a1d04e3 100644 --- a/nix/home-manager/home.nix +++ b/nix/home-manager/home.nix @@ -84,8 +84,11 @@ }; programs.gh = { - enable = false; - # TODO + enable = true; + settings = { + editor = "nvim"; + git_protocol = "ssh"; + }; }; programs.htop = { diff --git a/nix/update.sh b/nix/update.sh new file mode 100755 index 0000000..c87ccc1 --- /dev/null +++ b/nix/update.sh @@ -0,0 +1,7 @@ +pushd ~/.dotfiles +printf "Updating devenv\n" +nix flake update +pushd ./nix/home-manager +printf "Updating home-manager\n" +nix flake update +home-manager switch --flake '.#aarch64-darwin-acicchetti' diff --git a/zsh/funcs/oc b/zsh/funcs/oc index 9fc4991..3894699 100644 --- a/zsh/funcs/oc +++ b/zsh/funcs/oc @@ -1,8 +1,8 @@ if [[ ( $ZNAP_USED = 1 ) ]]; then if [[ $( command -v kubectl ) ]]; then - znap compdef _kubectl 'kubectl completion zsh' + znap fpath _kubectl 'kubectl completion zsh' fi if [[ $( command -v oc ) ]]; then - znap compdef _oc 'oc completion zsh' + znap fpath _oc 'oc completion zsh' fi fi diff --git a/zsh/funcs/rustup b/zsh/funcs/rustup index 6f3b276..bac7f17 100644 --- a/zsh/funcs/rustup +++ b/zsh/funcs/rustup @@ -1,7 +1,7 @@ if [[ $(command -v rustup) ]]; then if [[ ( $ZNAP_USED = 1) ]]; then - znap compdef _rustup 'rustup completions zsh' - znap compdef _cargo 'rustup completions zsh cargo' + znap fpath _rustup 'rustup completions zsh' + znap fpath _cargo 'rustup completions zsh cargo' fi fi diff --git a/zsh/zshrc b/zsh/zshrc index efbc715..84d631d 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -95,7 +95,7 @@ fi if (_command-exists starship); then znap eval starship 'starship init zsh --print-full-init' - znap prompt starship + znap prompt else if [[ ( $ZNAP_USED = 1 ) ]]; then autoload -Uz promptinit