diff options
| -rw-r--r-- | flake.lock | 78 | ||||
| -rw-r--r-- | machines/work.nix | 36 | ||||
| -rw-r--r-- | mut/lf/lfrc | 1 | ||||
| -rw-r--r-- | mut/neovim/fnl/conf/pkgs.fnl | 1 | ||||
| -rw-r--r-- | mut/neovim/fnl/conf/pkgs/lualine.fnl | 8 | ||||
| -rw-r--r-- | mut/neovim/fnl/conf/settings.fnl | 2 | ||||
| -rw-r--r-- | overlays/vimPlugins.nix | 25 | ||||
| -rw-r--r-- | profiles/core/configuration.nix | 2 | ||||
| -rw-r--r-- | profiles/core/home.nix | 11 | ||||
| -rw-r--r-- | profiles/core/neovim.nix | 3 | ||||
| -rw-r--r-- | profiles/station/packages.nix | 1 |
11 files changed, 95 insertions, 73 deletions
@@ -23,11 +23,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1704875591, - "narHash": "sha256-eWRLbqRcrILgztU/m/k7CYLzETKNbv0OsT2GjkaNm8A=", + "lastModified": 1711973905, + "narHash": "sha256-UFKME/N1pbUtn+2Aqnk+agUt8CekbpuqwzljivfIme8=", "owner": "serokell", "repo": "deploy-rs", - "rev": "1776009f1f3fb2b5d236b84d9815f2edee463a9b", + "rev": "88b3059b020da69cbe16526b8d639bd5e0b51c8b", "type": "github" }, "original": { @@ -113,11 +113,11 @@ ] }, "locked": { - "lastModified": 1704982712, - "narHash": "sha256-2Ptt+9h8dczgle2Oo6z5ni5rt/uLMG47UFTR1ry/wgg=", + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "07f6395285469419cf9d078f59b5b49993198c00", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", "type": "github" }, "original": { @@ -135,11 +135,11 @@ ] }, "locked": { - "lastModified": 1701473968, - "narHash": "sha256-YcVE5emp1qQ8ieHUnxt1wCZCC3ZfAS+SRRWZ2TMda7E=", + "lastModified": 1709336216, + "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "34fed993f1674c8d06d58b37ce1e0fe5eebcb9f5", + "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", "type": "github" }, "original": { @@ -189,11 +189,11 @@ ] }, "locked": { - "lastModified": 1704029560, - "narHash": "sha256-a4Iu7x1OP+uSYpqadOu8VCPY+MPF3+f6KIi+MAxlgyw=", + "lastModified": 1710478346, + "narHash": "sha256-Xjf8BdnQG0tLhPMlqQdwCIjOp7Teox0DP3N/jjyiGM4=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "d5cbf433a6ae9cae05400189a8dbc6412a03ba16", + "rev": "64e7763d72c1e4c1e5e6472640615b6ae2d40fbf", "type": "github" }, "original": { @@ -209,11 +209,11 @@ ] }, "locked": { - "lastModified": 1707175763, - "narHash": "sha256-0MKHC6tQ4KEuM5rui6DjKZ/VNiSANB4E+DJ/+wPS1PU=", + "lastModified": 1712266167, + "narHash": "sha256-gr2CBgT8t+utDqzWSp2vSjX/c39Q0BNtrWE6/cDhhEE=", "owner": "nix-community", "repo": "home-manager", - "rev": "f99eace7c167b8a6a0871849493b1c613d0f1b80", + "rev": "0c73c1b8da28a24c4fe842ced3f2548d5828b550", "type": "github" }, "original": { @@ -232,11 +232,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1706140641, - "narHash": "sha256-H1qHhkf7sF7yrG2rb9Ks1Y4EtLY3cXGp16KCGveJWY4=", + "lastModified": 1712273065, + "narHash": "sha256-gN4v1Gd0teluIokBHoj9M5ilGu7VFwMrRo3LN8GhAhQ=", "owner": "neovim", "repo": "neovim", - "rev": "4e59422e1d4950a3042bad41a7b81c8db4f8b648", + "rev": "dc69c475a5804c6c01987722f4cf6298d4e33e64", "type": "github" }, "original": { @@ -255,11 +255,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1706141075, - "narHash": "sha256-o66/XFTXmcJSpEcO508V5r765HtgT8qtr+H4LRIB9BY=", + "lastModified": 1712275479, + "narHash": "sha256-qFFO9qzQG4YhUtJu9CRmPcd2QroaRw2mimxasbkQqd0=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "1da2e054a16309d7d7f7669438c8b9a5ef1b4642", + "rev": "fa5d197b569eabfb0742e32b751269a5aa08c389", "type": "github" }, "original": { @@ -275,8 +275,8 @@ ] }, "locked": { - "lastModified": 1707672079, - "narHash": "sha256-qwjdPzi6nPKnsBGWm0vhtf32aOPMbI7+ydRpa6SRMrQ=", + "lastModified": 1712307593, + "narHash": "sha256-FQaRZ06jwQ9u/TmXBD52T+GR9SB5IKdwQavykassLeQ=", "path": "/Users/ivi/nix-darwin", "type": "path" }, @@ -333,27 +333,27 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1705957679, - "narHash": "sha256-Q8LJaVZGJ9wo33wBafvZSzapYsjOaNjP/pOnSiKVGHY=", + "lastModified": 1711819797, + "narHash": "sha256-tNeB6emxj74Y6ctwmsjtMlzUMn458sBmwnD35U5KIM4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9a333eaa80901efe01df07eade2c16d183761fa3", + "rev": "2b4e3ca0091049c6fbb4908c66b05b77eaef9f0c", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-23.05", + "ref": "release-23.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1706006310, - "narHash": "sha256-nDPz0fj0IFcDhSTlXBU2aixcnGs2Jm4Zcuoj0QtmiXQ=", + "lastModified": 1712192574, + "narHash": "sha256-LbbVOliJKTF4Zl2b9salumvdMXuQBr2kuKP5+ZwbYq4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b43bb235efeab5324c5e486882ef46749188eee2", + "rev": "f480f9d09e4b4cf87ee6151eba068197125714de", "type": "github" }, "original": { @@ -365,11 +365,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1707092692, - "narHash": "sha256-ZbHsm+mGk/izkWtT4xwwqz38fdlwu7nUUKXTOmm4SyE=", + "lastModified": 1712163089, + "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "faf912b086576fd1a15fca610166c98d47bc667e", + "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5", "type": "github" }, "original": { @@ -396,11 +396,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1706925685, - "narHash": "sha256-hVInjWMmgH4yZgA4ZtbgJM1qEAel72SYhP5nOWX4UIM=", + "lastModified": 1711715736, + "narHash": "sha256-9slQ609YqT9bT/MNX9+5k5jltL9zgpn36DpFB7TkttM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "79a13f1437e149dc7be2d1290c74d378dad60814", + "rev": "807c549feabce7eddbf259dbdcec9e0600a0660d", "type": "github" }, "original": { @@ -452,11 +452,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1707015547, - "narHash": "sha256-YZr0OrqWPdbwBhxpBu69D32ngJZw8AMgZtJeaJn0e94=", + "lastModified": 1711855048, + "narHash": "sha256-HxegAPnQJSC4cbEbF4Iq3YTlFHZKLiNTk8147EbLdGg=", "owner": "Mic92", "repo": "sops-nix", - "rev": "23f61b897c00b66855074db471ba016e0cda20dd", + "rev": "99b1e37f9fc0960d064a7862eb7adfb92e64fa10", "type": "github" }, "original": { diff --git a/machines/work.nix b/machines/work.nix index 4c43fdb..a68ba20 100644 --- a/machines/work.nix +++ b/machines/work.nix @@ -14,8 +14,9 @@ }; }; security = { - sudo = mkSinkUndeclaredOptions {}; + sudo.wheelNeedsPassword = mkSinkUndeclaredOptions {}; }; + systemd = mkSinkUndeclaredOptions {}; users.users = mkOption { type = types.attrsOf (types.submodule ({...}: { options = { @@ -41,11 +42,21 @@ pkgs.zsh pkgs.bashInteractive pkgs.awscli2 - ]; - hm.home.sessionPath = [ - "/opt/homebrew/bin" - ]; + pkgs.skhd + pkgs.act + ]; hm = { + home = { + sessionPath = [ + "/opt/homebrew/bin" + ]; + file."gpg-agent.conf" = { + text = '' + pinentry-program /opt/homebrew/bin/pinentry-mac + ''; + target = ".gnupg/gpg-agent.conf"; + }; + }; programs.kitty = { enable = true; shellIntegration = { @@ -68,6 +79,9 @@ map kitty_mod+v mouse_select_command_output scrollback_pager less --chop-long-lines --RAW-CONTROL-CHARS +INPUT_LINE_NUMBER + map kitty_mod+shift+k change_font_size all +2.0 + map kitty_mod+shift+j change_font_size all -2.0 + map kitty_mod+k scroll_to_prompt -1 map kitty_mod+j scroll_to_prompt 1 map kitty_mod+l show_last_visited_command_output @@ -149,6 +163,7 @@ enable = true; brews = [ "choose-gui" + "pinentry-mac" ]; casks = [ "docker" @@ -184,6 +199,14 @@ cmd - 4 : osascript -e 'tell application "Microsoft Teams (work or school)" to activate' cmd - 5 : osascript -e 'tell application "calendar" to activate' cmd - 6 : osascript -e 'tell application "mail" to activate' + cmd - w [ + "Google Chrome" ~ + * : osascript -e 'tell application "Google Chrome" to activate' + ] + cmd - e : osascript -e 'tell application "mail" to activate' + cmd - m : osascript -e 'tell application "Slack" to activate' + cmd + shift - m : osascript -e 'tell application "Microsoft Teams (work or school)" to activate' + cmd - return : osascript -e 'tell application "kitty" to activate' cmd + shift - d : ${pkgs.writers.writeBash "passmenu" '' shopt -s nullglob globstar @@ -232,6 +255,9 @@ }; environment.shells = [pkgs.bashInteractive pkgs.zsh]; environment.pathsToLink = [ "/share/zsh" ]; + environment.variables = { + SLACK_NO_AUTO_UPDATES = "1"; + }; programs.zsh.enable = true; }; } diff --git a/mut/lf/lfrc b/mut/lf/lfrc index c34ba42..7047e2d 100644 --- a/mut/lf/lfrc +++ b/mut/lf/lfrc @@ -25,6 +25,7 @@ set hiddenfiles ".*:*.aux:*.log:*.bbl:*.bcf:*.blg:*.run.xml" set cleaner '~/.config/lf/cleaner' set previewer '~/.config/lf/scope' set autoquit true +set relativenumber cmd z %{{ echo "$1" > ~/lflogs diff --git a/mut/neovim/fnl/conf/pkgs.fnl b/mut/neovim/fnl/conf/pkgs.fnl index c48b40d..70e4805 100644 --- a/mut/neovim/fnl/conf/pkgs.fnl +++ b/mut/neovim/fnl/conf/pkgs.fnl @@ -6,5 +6,6 @@ (require :conf.pkgs.gitsigns) (require :conf.pkgs.oil) (require :conf.pkgs.lint) +(require :conf.pkgs.lualine) ;; (require :conf.pkgs.lsp_lines) ;; (require :conf.pkgs.null-ls) diff --git a/mut/neovim/fnl/conf/pkgs/lualine.fnl b/mut/neovim/fnl/conf/pkgs/lualine.fnl new file mode 100644 index 0000000..6f2d66b --- /dev/null +++ b/mut/neovim/fnl/conf/pkgs/lualine.fnl @@ -0,0 +1,8 @@ +(local lualine (require :lualine)) +(lualine.setup + {:winbar + {:lualine_a [:filename]} + :inactive_winbar + {:lualine_a [:filename]} + :tabline + {:lualine_a [:tabs]}}) diff --git a/mut/neovim/fnl/conf/settings.fnl b/mut/neovim/fnl/conf/settings.fnl index bc01181..1fbed85 100644 --- a/mut/neovim/fnl/conf/settings.fnl +++ b/mut/neovim/fnl/conf/settings.fnl @@ -70,5 +70,5 @@ ; winbar "%=%m %f" winbar "" hlsearch off - showtabline 0 + showtabline 1 cmdheight 1) diff --git a/overlays/vimPlugins.nix b/overlays/vimPlugins.nix index 7933c5a..0454047 100644 --- a/overlays/vimPlugins.nix +++ b/overlays/vimPlugins.nix @@ -6,7 +6,7 @@ rev, ref ? "master", }: - pkgs.vimUtils.buildVimPluginFrom2Nix { + pkgs.vimUtils.buildVimPlugin { inherit name; src = builtins.fetchGit { url = "https://github.com/${git}"; @@ -18,31 +18,16 @@ in prev.vimPlugins // { - neotest-python = getVimPlugin { - name = "neotest-python"; - git = "nvim-neotest/neotest-python"; - rev = "e53920d145d37783c8d8428365a0a230e0a18cb5"; - }; - firvish-nvim = getVimPlugin { - name = "firvish-nvim"; - git = "Furkanzmc/firvish.nvim"; - rev = "127f9146175d6bbaff6a8b761081cfd2279f8351"; + nvim-nio = getVimPlugin { + name = "nvim-nio"; + git = "nvim-neotest/nvim-nio"; + rev = "5800f585def265d52f1d8848133217c800bcb25d"; }; nvim-parinfer = getVimPlugin { name = "nvim-parinfer"; git = "gpanders/nvim-parinfer"; rev = "82bce5798993f4fe5ced20e74003b492490b4fe8"; }; - vim-just = getVimPlugin { - name = "vim-just"; - git = "NoahTheDuke/vim-just"; - rev = "838c9096d4c5d64d1000a6442a358746324c2123"; - }; - vim-rest-console = getVimPlugin { - name = "vim-rest-console"; - git = "diepm/vim-rest-console"; - rev = "7b407f47185468d1b57a8bd71cdd66c9a99359b2"; - }; codeium-vim = getVimPlugin { name = "codeium-vim"; git = "Exafunction/codeium.vim"; diff --git a/profiles/core/configuration.nix b/profiles/core/configuration.nix index 3a605b1..51e2f91 100644 --- a/profiles/core/configuration.nix +++ b/profiles/core/configuration.nix @@ -81,6 +81,6 @@ nix.package = pkgs.nixUnstable; nix.extraOptions = '' - experimental-features = nix-command flakes + experimental-features = nix-command flakes configurable-impure-env ''; } diff --git a/profiles/core/home.nix b/profiles/core/home.nix index eb0bcac..c003fc0 100644 --- a/profiles/core/home.nix +++ b/profiles/core/home.nix @@ -40,11 +40,8 @@ ''; in { enable = true; - } // (if machine.isDarwin then { - tmuxConfig = cfg; - } else { extraConfig = cfg; - }); + }; hm = { fonts.fontconfig.enable = true; @@ -123,6 +120,9 @@ zsh = { enable = true; completionInit = '' + if type brew &>/dev/null; then + FPATH="$(brew --prefix)/share/zsh/site-functions:''${FPATH}" + fi autoload -U compinit select-word-style select-word-style select-word-style bash zstyle ':completion:*' menu select @@ -274,7 +274,8 @@ enableSshSupport = false; defaultCacheTtl = 34550000; maxCacheTtl = 34550000; - pinentryFlavor = "gtk2"; + # pinentryFlavor = "gtk2"; + pinentryPackage = pkgs.pinentry-gtk2; }; }; } diff --git a/profiles/core/neovim.nix b/profiles/core/neovim.nix index e1da7cc..86d4a78 100644 --- a/profiles/core/neovim.nix +++ b/profiles/core/neovim.nix @@ -42,7 +42,6 @@ alejandra statix fzf - bat nil shellcheck vale @@ -56,6 +55,7 @@ lsp_lines-nvim gitsigns-nvim vim-helm + lualine-nvim # external oil-nvim @@ -73,6 +73,7 @@ lsp_signature-nvim nvim-dap nvim-dap-ui + nvim-nio nvim-dap-python luasnip vim-test diff --git a/profiles/station/packages.nix b/profiles/station/packages.nix index 587d25e..4d16657 100644 --- a/profiles/station/packages.nix +++ b/profiles/station/packages.nix @@ -15,7 +15,6 @@ k9s krew azure-cli - github-cli argocd (google-cloud-sdk.withExtraComponents (with google-cloud-sdk.components; [ gke-gcloud-auth-plugin |