From 170fbb3a7cb5226cac766b4d5f6501690e448f02 Mon Sep 17 00:00:00 2001 From: Dave Gallant Date: Wed, 28 Jul 2021 12:08:14 -0400 Subject: [PATCH] Speedup zsh --- README.md | 2 +- flake.lock | 36 ++++++++++++++++++------------------ home/default.nix | 7 ------- home/nvim/lua/init.lua | 1 - 4 files changed, 19 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index 50ec854..e2e2ecc 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ This repo stores nix to manage my machines running both [NixOS](https://nixos.org/) and macOS. The initial structure was inspired by [samuelgrf/nixos-config](https://gitlab.com/samuelgrf/nixos-config/-/tree/master/). -The configuration is very specific to my own machines and setup, but it may be a useful reference for anyone else learning or experimenting with nix, whether it be on a desktop or a server. +The configuration is very specific to my own machines and setup, but it may be a useful reference for anyone else learning or experimenting with nix, whether it be on a personal machine or a server. ## Setup diff --git a/flake.lock b/flake.lock index c726b46..739391d 100644 --- a/flake.lock +++ b/flake.lock @@ -58,11 +58,11 @@ ] }, "locked": { - "lastModified": 1627267207, - "narHash": "sha256-chP4cF4yV0ZUI9E0zwm5KFmRJJ8sHnGrSaKzRKOMioU=", + "lastModified": 1627422633, + "narHash": "sha256-9UvA3wn0xap6WLjhE7+90JwCD+PNj630qt721XRC3TQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "addc78bea024c85860d60d9682a1ed2664fdf2f6", + "rev": "ae8cb242f2e450c525274732af58b3050399f5bd", "type": "github" }, "original": { @@ -80,11 +80,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1627125518, - "narHash": "sha256-0FsL86dSiNDEjPDu9NGYgQ3CVhjQIZktMaZWzHxk+ms=", + "lastModified": 1627459845, + "narHash": "sha256-hG4lvrQHOZQeD/M9IChfAWx3R0gEE22H6jSD7ajrtkA=", "owner": "neovim", "repo": "neovim", - "rev": "46009499afbb0232124072d775caa9552d0f71de", + "rev": "701c21480e5b7ed15bff0e0571787fe220f7de6f", "type": "github" }, "original": { @@ -101,11 +101,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1627200686, - "narHash": "sha256-+05Bku1+VKx2bC7/0oMazq0bIKWVyanhr/iy4sb7SzE=", + "lastModified": 1627459903, + "narHash": "sha256-sIGHpshll67YyYHKHY8vrPaPVNKQqkA+LMYqop/gaKk=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "9b49e4d4e64939540e530249c09b8d35fd1ce55d", + "rev": "8eae52431f645b04a9326fe7019c4faf145027db", "type": "github" }, "original": { @@ -116,11 +116,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1627212500, - "narHash": "sha256-KMUQCT3JSqznp+dR6BTvbwLqPFErjNlotVpkp/P/ZmM=", + "lastModified": 1627365147, + "narHash": "sha256-weGn8tUd8VP+YFCqYZ8fOV8OPJxrZLtna8YJKri0Zfk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "03e7686c72345f237405c0b46b153dccd3ec9913", + "rev": "615e23579fec9bf0753fd72a8a447d9fb847c58f", "type": "github" }, "original": { @@ -132,11 +132,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1627128856, - "narHash": "sha256-yw3lA8zyNFhj309lmxvNByEEymRT1rRy5oE+jEPnsP4=", + "lastModified": 1627391865, + "narHash": "sha256-tPoWBO9Nzu3wuX37WcnctzL6LoDCErJLnfLGqqmXCm4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dd14e5d78e90a2ccd6007e569820de9b4861a6c2", + "rev": "8ecc61c91a596df7d3293603a9c2384190c1b89a", "type": "github" }, "original": { @@ -148,11 +148,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1627128856, - "narHash": "sha256-yw3lA8zyNFhj309lmxvNByEEymRT1rRy5oE+jEPnsP4=", + "lastModified": 1627391865, + "narHash": "sha256-tPoWBO9Nzu3wuX37WcnctzL6LoDCErJLnfLGqqmXCm4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dd14e5d78e90a2ccd6007e569820de9b4861a6c2", + "rev": "8ecc61c91a596df7d3293603a9c2384190c1b89a", "type": "github" }, "original": { diff --git a/home/default.nix b/home/default.nix index 2482ca8..9312960 100644 --- a/home/default.nix +++ b/home/default.nix @@ -121,24 +121,17 @@ in export PATH=$PATH:$GOBIN eval "$(direnv hook zsh)" - eval "$(_RFD_COMPLETE=source_zsh rfd)" - eval "$(rbenv init -)" setopt noincappendhistory - source $HOME/.cargo/env - source $HOME/.zsh-work - pfetch '' + lib.optionals stdenv.isDarwin '' export PATH="$(brew --prefix)/opt/gnu-tar/libexec/gnubin:$PATH" export PATH="$(brew --prefix)/opt/gnu-sed/libexec/gnubin:$PATH" ''; shellAliases = { - aws-azure-login = - "docker run --rm -it -v ~/.aws:/root/.aws sportradar/aws-azure-login"; ".." = "cd .."; grep = "rg --smart-case"; k = "kubectl"; diff --git a/home/nvim/lua/init.lua b/home/nvim/lua/init.lua index 0f72e26..7778504 100644 --- a/home/nvim/lua/init.lua +++ b/home/nvim/lua/init.lua @@ -230,7 +230,6 @@ require("twilight").setup { }, exclude = {}, -- exclude these filetypes } -vim.cmd[[autocmd BufEnter * :TwilightEnable]] -- vim-go vim.g.go_auto_sameids = 0