diff --git a/README.md b/README.md index e31f5cb..61ee0f0 100644 --- a/README.md +++ b/README.md @@ -122,7 +122,10 @@ Most services are served over [tailscale](https://tailscale.com/), using certifi Includes links to stuff which used to be in the previous section but is not used anymore. Only created this section in June 2023, so stuff I used earlier might not be here. Sorted with the most recently dropped things at the top. -- [eww](https://github.com/elkowar/eww) - experimented with eww for a bit, but setup was painful and bars are a bit useless +- [winbar.nvim](https://github.com/fgheng/winbar.nvim) — I mostly had this here for the looks, so I moved the path it provided to my statusbar +- [treesitter-visual-context.nvim](https://github.com/haringsrob/nvim_context_vt) — felt like this was cluttering my screen more than anything +- [Paperplanes.nvim](https://rktjmp/paperplanes.nvim) — replaced by a single curl call +- [Eww](https://github.com/elkowar/eww) - experimented with eww for a bit, but setup was painful and bars are a bit useless - [Neogit](https://github.com/NeogitOrg/neogit) — was a bit slow / clunky, so I switched to [lazygit](https://github.com/jesseduffield/lazygit) - [Slambda](https://github.com/Mateiadrielrafael/slambda) — custom keyboard chording utility. I retired the project in favour of [kanta](https://github.com/jtroo/kanata) - [GPG](https://gnupg.org/) + [pass](https://www.passwordstore.org/) — I switched to [vaultwarden](https://github.com/dani-garcia/vaultwarden/) diff --git a/home/features/cli/fish/default.nix b/home/features/cli/fish/default.nix index 642039e..6067362 100644 --- a/home/features/cli/fish/default.nix +++ b/home/features/cli/fish/default.nix @@ -33,7 +33,6 @@ in enable = true; defaultOptions = [ "--no-scrollbar" ]; - changeDirWidgetOptions = [ "--preview '${lib.getExe pkgs.eza} --icons --tree --color=always {}'" ]; @@ -87,7 +86,7 @@ in satellite.persistence.at.state.apps.fish.directories = [ "${config.xdg.dataHome}/fish" - "${config.xdg.dataHome}/z" # The z fish plugin + "${config.xdg.dataHome}/z" # The z fish plugin requires this ]; # }}} } diff --git a/home/features/neovim/config/lazy-lock.json b/home/features/neovim/config/lazy-lock.json index 98764e2..bdcd3e8 100644 --- a/home/features/neovim/config/lazy-lock.json +++ b/home/features/neovim/config/lazy-lock.json @@ -33,8 +33,6 @@ "live-command": { "branch": "main", "commit": "d460067d47948725a6f25b20f31ea8bbfdfe4622" }, "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" }, "luasnip": { "branch": "master", "commit": "8ae1dedd988eb56441b7858bd1e8554dfadaa46d" }, - "mini.base16": { "branch": "main", "commit": "f770a9cecf91bc690ba7943818caff0b5770f0f1" }, - "mini.colors": { "branch": "main", "commit": "f64963332f7fcb45c8dfcc243f682a9a0fb9935d" }, "mini.comment": { "branch": "main", "commit": "a4b7e46deb9ad2feb8902cc5dbf087eced112ee5" }, "mini.files": { "branch": "main", "commit": "eab771c69b787a3f042dc6505d15613c282aa786" }, "mini.operators": { "branch": "main", "commit": "0765e4818086e96b8fb55d280e47af781a5bc56a" }, @@ -43,11 +41,9 @@ "mini.surround": { "branch": "main", "commit": "a1b590cc3b676512de507328d6bbab5e43794720" }, "neoconf": { "branch": "main", "commit": "4ef6c6c5882e7e16209173fb8c47414202843384" }, "neodev.nvim": { "branch": "main", "commit": "b0ccf605c952eb0d1efe3692d5b241c52ceee187" }, - "neogit": { "branch": "master", "commit": "4075ca97222e0a1ab517dcb8fd4542fd8df4ca91" }, "nui": { "branch": "main", "commit": "c3c7fd618dcb5a89e443a2e1033e7d11fdb0596b" }, "null-ls": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" }, "nvim-lspconfig": { "branch": "master", "commit": "6b9f4bbe0aa1f351fd4845dc5fd4f3450b010f88" }, - "nvim-tree": { "branch": "master", "commit": "030defdb6522f5f716d8201d20ca1a2baa57ca66" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "7f00d94543f1fd37cab2afa2e9a6cd54e1c6b9ef" }, "nvim-web-devicons": { "branch": "master", "commit": "14ac5887110b06b89a96881d534230dac3ed134d" }, "paperlanes": { "branch": "master", "commit": "bd52c54c36ad2e9ac563ae1c6a4f6ed1f5faacd2" }, diff --git a/home/features/neovim/default.nix b/home/features/neovim/default.nix index 72a98da..f81a837 100644 --- a/home/features/neovim/default.nix +++ b/home/features/neovim/default.nix @@ -149,6 +149,9 @@ let (nmap "ss" (thunk /* lua */ "vim.opt.spell = not vim.o.spell") "toggle [s]pell checker") + (nmap "yp" + ("!curl --data-binary @% https://paste.rs") + "[y]ank [p]aste.rs link") # }}} ]; # }}} @@ -302,7 +305,7 @@ let # {{{ web-devicons web-devicons.package = "nvim-tree/nvim-web-devicons"; # }}} - # {{{ Scrap + # {{{ scrap scrap = { package = "mateiadrielrafael/scrap.nvim"; @@ -336,7 +339,9 @@ let return st.combine_groups({ { hl = mode_hl, strings = { mode } }, { hl = "MiniStatuslineDevinfo", strings = { git } }, - { hl = "MiniStatuslineFilename", strings = { vim.fn.expand("%:t") } }, + { hl = "MiniStatuslineFilename", strings = { + vim.fn.fnamemodify(vim.fn.expand("%:p"), ":~:.") + } }, "%=", -- End left alignment { hl = "MiniStatuslineFilename", strings = { diagnostics } }, { hl = "MiniStatuslineDevinfo", strings = { vim.bo.filetype } }, @@ -367,17 +372,6 @@ let opts.mappings.go_in_plus = "l"; }; # }}} - # {{{ winbar - winbar = { - package = "fgheng/winbar.nvim"; - - cond = [ (blacklist [ "vscode" "firenvim" ]) notmp ]; - event = "BufReadPost"; - - opts.enabled = true; - # TODO: blacklist harpoon - }; - # }}} # {{{ harpoon harpoon = { package = "ThePrimeagen/harpoon"; @@ -610,15 +604,6 @@ let }; # }}} # {{{ treesitter context - # Show context at the of closing delimiters - treesitter-virtual-context = { - package = "haringsrob/nvim_context_vt"; - dependencies.lua = [ "treesitter" ]; - - cond = blacklist "vscode"; - event = "VeryLazy"; - }; - # REASON: broken # show context at top of file # treesitter-top-context = { @@ -1315,14 +1300,6 @@ let keys = mapping; }; # }}} - # {{{ paperplanes - # export to pastebin like services - paperlanes = { - package = "rktjmp/paperplanes.nvim"; - cmd = "PP"; - opts.provider = "paste.rs"; - }; - # }}} # {{{ obsidian obsidian = let diff --git a/hosts/nixos/lapetus/default.nix b/hosts/nixos/lapetus/default.nix index 14728d1..fa2cb48 100644 --- a/hosts/nixos/lapetus/default.nix +++ b/hosts/nixos/lapetus/default.nix @@ -15,7 +15,7 @@ ./services/zfs.nix ./services/prometheus.nix ./services/grafana.nix - ./services/commarss.nix + ./services/commafeed.nix ./filesystems ./hardware ]; diff --git a/hosts/nixos/lapetus/services/commarss.nix b/hosts/nixos/lapetus/services/commafeed.nix similarity index 94% rename from hosts/nixos/lapetus/services/commarss.nix rename to hosts/nixos/lapetus/services/commafeed.nix index 4ffb3ab..dee9e52 100644 --- a/hosts/nixos/lapetus/services/commarss.nix +++ b/hosts/nixos/lapetus/services/commafeed.nix @@ -17,6 +17,7 @@ in ports = [ "${toString port}:8082" ]; # server:docker volumes = [ "${dataDir}:/commafeed/data" ]; # server:docker + extraOptions = [ "--memory 64m" ]; # the JVM is way too hungry # https://github.com/Athou/commafeed/blob/master/commafeed-server/config.yml.example environment = {