diff --git a/flake.lock b/flake.lock index a5c0168..d65b3e0 100644 --- a/flake.lock +++ b/flake.lock @@ -84,11 +84,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1688062416, - "narHash": "sha256-6Mp0sJvxVxPhP/JYz0c85GdiFezv2TuLUZhPu2BgF30=", + "lastModified": 1688063586, + "narHash": "sha256-ywshC598IZ31UoP04vHSAR5OT6T8Z8Lsz/MRNQkJiOs=", "owner": "pegasust", "repo": "crane", - "rev": "05e1ed1ada4a820212a87c3aad0f1a1470e3633c", + "rev": "cb14ad86d991493dfdc439772d7959e6f50bf46b", "type": "github" }, "original": { @@ -674,11 +674,11 @@ "gnmic": { "flake": false, "locked": { - "lastModified": 1687960854, - "narHash": "sha256-nBRHuKg+5vlxm/SSfznbn/idssThBTf+2yb8wBG+p58=", + "lastModified": 1688058431, + "narHash": "sha256-IMX2LT9FQwz5u0XJh1COmPWeWqqEBIunNUXlLsE1CYM=", "owner": "openconfig", "repo": "gnmic", - "rev": "9772618306ab6836f452464515dbe68108aa552e", + "rev": "8e7d054623c4f7594cf09c64655f0baf307ee6ff", "type": "github" }, "original": { @@ -811,11 +811,11 @@ ] }, "locked": { - "lastModified": 1688552611, - "narHash": "sha256-pV/1/AU1l5CNFeKmdJ1jofcaKHhtKAbxY4gazeCyoSo=", + "lastModified": 1689495092, + "narHash": "sha256-yZu2j5FpLZEPhJQQutMCPTxa1VMigLPabLYvLTq6ASM=", "owner": "nix-community", "repo": "home-manager", - "rev": "b23c7501f7e0a001486c9a5555a6c53ac7b08e85", + "rev": "2f84579a70b8c74e5ebb37299a0c3ba279f09382", "type": "github" }, "original": { @@ -967,11 +967,11 @@ "std": "std" }, "locked": { - "lastModified": 1688064765, - "narHash": "sha256-yoEeM8dIxE+UrVO2KkG9MBbo8oMe2CKBajOmCI/CLwY=", + "lastModified": 1689005484, + "narHash": "sha256-9UpR36YpwU9246rfPOnWI1qyIMjzoOv81IEARaPyuYw=", "ref": "bleed", - "rev": "20e4618d378686526c1a525eee3ebfd4758c5006", - "revCount": 95, + "rev": "296de75f052d88880414a72c6df6fe3b6a3f603d", + "revCount": 105, "type": "git", "url": "https://git.pegasust.com/pegasust/nix-boost" }, @@ -1011,11 +1011,11 @@ ] }, "locked": { - "lastModified": 1688680913, - "narHash": "sha256-jo/RDXXL7Zx6M36m0f0F+tQPJRzs31Y7gaDiTqqh4Ns=", + "lastModified": 1689479461, + "narHash": "sha256-Ak+PTYdmfOQEmcOsOEnrwqdP0HP20PLraRwpjSAzSeE=", "owner": "mic92", "repo": "nix-index-database", - "rev": "44337c30729a3616c7a71d485af70d231b29675a", + "rev": "22fa44b7f14684d184733fb26a628f3878ff7aaf", "type": "github" }, "original": { @@ -1168,11 +1168,11 @@ }, "nixpkgs-latest": { "locked": { - "lastModified": 1688715196, - "narHash": "sha256-6m2PI/aBHxmTYN4EZbTECgYRi9xQuSAST5PYMNcw/D8=", + "lastModified": 1689615243, + "narHash": "sha256-FbR3tYDggqSekDd2Yv+t/mY6n1F+2JOCpYBB0HVH38M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "457beb8d79b2127aa84154f26bf2a76b762e9927", + "rev": "14ef6934ca5cdf2a17c0dda30d4bf3d3e8ecff23", "type": "github" }, "original": { @@ -1267,11 +1267,11 @@ }, "nixpkgs_11": { "locked": { - "lastModified": 1688590700, - "narHash": "sha256-ZF055rIUP89cVwiLpG5xkJzx00gEuuGFF60Bs/LM3wc=", + "lastModified": 1689534811, + "narHash": "sha256-jnSUdzD/414d94plCyNlvTJJtiTogTep6t7ZgIKIHiE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f292b4964cb71f9dfbbd30dc9f511d6165cd109b", + "rev": "6cee3b5893090b0f5f0a06b4cf42ca4e60e5d222", "type": "github" }, "original": { @@ -1924,11 +1924,11 @@ "yants": "yants_2" }, "locked": { - "lastModified": 1688450460, - "narHash": "sha256-/42q81j9/ZKFrXY3YvOjrg3M4V70aZnxhu/YsuEHVl4=", + "lastModified": 1689337213, + "narHash": "sha256-qa0B38ihDW1MuAshwgvlbkk3CgheWlvYr35oMpDrxJs=", "owner": "divnix", "repo": "std", - "rev": "3e623646d47ec277947c9626d595f43042b94ab9", + "rev": "17dc4eb9587517397dad00617b020769fece3cfe", "type": "github" }, "original": { diff --git a/native_configs/ssh/config b/native_configs/ssh/config index d43536b..0c767c1 100644 --- a/native_configs/ssh/config +++ b/native_configs/ssh/config @@ -62,6 +62,8 @@ Host bgp1 User htran Port 22 StrictHostKeyChecking no + IdentityFile ~/.ssh/id_ed25519 + IdentityFile ~/.ssh/id_rsa HostKeyAlgorithms=+ssh-dss,ssh-rsa KexAlgorithms +diffie-hellman-group1-sha1,diffie-hellman-group-exchange-sha1,diffie-hellman-group14-sha1 @@ -70,6 +72,18 @@ Host bgp2 User htran Port 22 StrictHostKeyChecking no + IdentityFile ~/.ssh/id_ed25519 + IdentityFile ~/.ssh/id_rsa + HostKeyAlgorithms=+ssh-dss,ssh-rsa + KexAlgorithms +diffie-hellman-group1-sha1,diffie-hellman-group-exchange-sha1,diffie-hellman-group14-sha1 + +Host huaweil3 + HostName 10.111.100.* + User htran + Port 22 + StrictHostKeyChecking no + IdentityFile ~/.ssh/id_ed25519 + IdentityFile ~/.ssh/id_rsa HostKeyAlgorithms=+ssh-dss,ssh-rsa KexAlgorithms +diffie-hellman-group1-sha1,diffie-hellman-group-exchange-sha1,diffie-hellman-group14-sha1 diff --git a/nix/repo/home-configs/default.nix b/nix/repo/home-configs/default.nix index c236424..69586b6 100644 --- a/nix/repo/home-configs/default.nix +++ b/nix/repo/home-configs/default.nix @@ -38,6 +38,7 @@ in { modules = base-modules ++ [ + home-profiles.darwin-patches home-profiles.nerd_font_module home-profiles.git-htran home-profiles.dev-packages @@ -62,6 +63,7 @@ in { modules = base-modules ++ [ + home-profiles.darwin-patches home-profiles.nerd_font_module home-profiles.git-pegasust home-profiles.dev-packages diff --git a/nix/repo/home-profiles/default.nix b/nix/repo/home-profiles/default.nix index 1ef28b4..0f1166b 100644 --- a/nix/repo/home-profiles/default.nix +++ b/nix/repo/home-profiles/default.nix @@ -215,4 +215,10 @@ in { # On Linux, however, it correctly gives `keepassxc-cli` home.packages = [cell.packages.kpxc]; }; + + darwin-patches = { + # This should ideally be as empty as possible. Though, home-manager is + # a community-driven project. Things fail to build all the time. + manual.manpages.enable = false; + }; } diff --git a/nix/repo/home-profiles/neovim.nix b/nix/repo/home-profiles/neovim.nix index 2b7a26e..2f668fa 100644 --- a/nix/repo/home-profiles/neovim.nix +++ b/nix/repo/home-profiles/neovim.nix @@ -21,6 +21,8 @@ # my_neovim = pkgs.neovim-unwrapped; my_neovim = inputs.neovim-nightly-overlay.packages.${system}.neovim; + # These are added to the wrapper. Which means `which zk` is likely to show only + # within neovim's environment nvim_pkgs = [ # pkgs.gccStdenv @@ -32,8 +34,6 @@ pkgs.stdenv.cc.cc.lib pkgs.nil # oxalica's better nix language server inputs.nix-boost.packages."${system}".rust4cargo - pkgs.nickel - pkgs.nls inputs.sg-nvim.packages.${system}.default pkgs.go # doesn't work, Mason installs from runtime path diff --git a/nix/repo/home-profiles/shells.nix b/nix/repo/home-profiles/shells.nix index 44a0bfb..b619c8e 100644 --- a/nix/repo/home-profiles/shells.nix +++ b/nix/repo/home-profiles/shells.nix @@ -92,7 +92,7 @@ in { programs.zsh = { enable = true; enableCompletion = true; - enableAutosuggestions = true; + # enableAutosuggestions = true; shellAliases = { nix-rebuild = "sudo nixos-rebuild switch"; @@ -107,8 +107,11 @@ in { enable = true; plugins = [ "git" # git command aliases: https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/git#aliases - "command-not-found" # suggests which package to install; does not support nixos (we have solution already) - "gitignore" # `gi list` -> `gi java >>.gitignore` + # DEPRECATION: potentially smelly plugin with nix + # "command-not-found" # suggests which package to install; does not support nixos (we have solution already) + + # DEPRECATION: 0 usage, mostly because I don't have a use for it + # "gitignore" # `gi list` -> `gi java >>.gitignore` "ripgrep" # adds completion for `rg` "rust" # compe for rustc/cargo "poetry" # compe for poetry - Python's cargo @@ -120,6 +123,7 @@ in { # VI_MODE_SET_CURSOR = true; # ZVM_VI_ESCAPE_BINDKEY = ""; ZVM_READKEY_ENGINE = "$ZVM_READKEY_ENGINE_NEX"; + # lowest possible: 0.004s ZVM_KEYTIMEOUT = 0.004; # 40ms, or subtly around 25 FPS. I'm a gamer :) ZVM_ESCAPE_KEYTIMEOUT = 0.004; # 40ms, or subtly around 25 FPS. I'm a gamer :) };