From ca77221ff28093bcef00af702993db332cf74f7d Mon Sep 17 00:00:00 2001 From: Gene Liverman Date: Thu, 28 Dec 2023 15:57:04 -0500 Subject: [PATCH 1/8] Add bandwhich --- modules/system/common/all-darwin.nix | 1 + modules/system/common/all-nixos.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/modules/system/common/all-darwin.nix b/modules/system/common/all-darwin.nix index 408fa99..e29c9ff 100644 --- a/modules/system/common/all-darwin.nix +++ b/modules/system/common/all-darwin.nix @@ -8,6 +8,7 @@ ]; systemPackages = with pkgs; [ age + bandwhich coreutils hugo mas diff --git a/modules/system/common/all-nixos.nix b/modules/system/common/all-nixos.nix index 9dffacd..cda42f0 100644 --- a/modules/system/common/all-nixos.nix +++ b/modules/system/common/all-nixos.nix @@ -43,6 +43,7 @@ }; programs = { + bandwhich.enable = true; zsh.enable = true; }; From 41e221544e0fab9ee4b20a16cf5d5c7a4d57045e Mon Sep 17 00:00:00 2001 From: Gene Liverman Date: Fri, 29 Dec 2023 09:00:22 -0500 Subject: [PATCH 2/8] Add some video tools --- modules/system/common/all-darwin.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/system/common/all-darwin.nix b/modules/system/common/all-darwin.nix index e29c9ff..296cfd7 100644 --- a/modules/system/common/all-darwin.nix +++ b/modules/system/common/all-darwin.nix @@ -47,11 +47,14 @@ "font-inconsolata-g-for-powerline" "font-source-code-pro-for-powerline" "gitkraken" + "handbrake" "iterm2" "keepingyouawake" "libreoffice" "logseq" + "makemkv" "meld" + "MKVToolNix" "nextcloud" "onlyoffice" "raycast" From 0f6f01467295d0a4df6a872903962bf4c41cdd2c Mon Sep 17 00:00:00 2001 From: Gene Liverman Date: Fri, 29 Dec 2023 09:00:55 -0500 Subject: [PATCH 3/8] Add HTTPie --- modules/home-manager/common/all-cli.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/home-manager/common/all-cli.nix b/modules/home-manager/common/all-cli.nix index c5ae93f..f890e3c 100644 --- a/modules/home-manager/common/all-cli.nix +++ b/modules/home-manager/common/all-cli.nix @@ -9,6 +9,7 @@ git-filter-repo gotop htop + httpie hub jq lazygit From d27085a3a6199593b0ff3f4a043d8d73da4f09c8 Mon Sep 17 00:00:00 2001 From: Gene Liverman Date: Fri, 29 Dec 2023 10:07:05 -0500 Subject: [PATCH 4/8] Add bottom, an alternative to top and htop Also add a couple of aliases to help me learn the actual command name for bottom and trippy. --- modules/home-manager/common/all-cli.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/home-manager/common/all-cli.nix b/modules/home-manager/common/all-cli.nix index f890e3c..7e748cc 100644 --- a/modules/home-manager/common/all-cli.nix +++ b/modules/home-manager/common/all-cli.nix @@ -66,6 +66,7 @@ }; }; }; + bottom.enable = true; eza.enable = true; gh.enable = true; git = { @@ -234,6 +235,7 @@ bcrrs = "bcrr --stream --no-verbose"; beo = "bundle exec onceover run spec --trace --force"; biv = "bundle install --path=vendor/bundle"; + bottom = "echo 'To run bottom, the command is btm'"; ce = "code-exploration"; dots = "cd ~/repos/dots"; gbc = '' @@ -246,6 +248,7 @@ sal = "ssh-add -L"; st = "open -a SourceTree"; sz = "source ~/.zshrc"; + trippy = "echo 'To run trippy, the command is trip'"; usegpg = "killall ssh-agent; export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) && gpgconf --launch gpg-agent"; usessh = "gpgconf --kill gpg-agent"; }; From ee60b2feeca763f4f9495db13afc5fcd732226d5 Mon Sep 17 00:00:00 2001 From: Gene Liverman Date: Fri, 29 Dec 2023 10:26:35 -0500 Subject: [PATCH 5/8] Add broot, a tree alternative --- modules/home-manager/common/all-cli.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/home-manager/common/all-cli.nix b/modules/home-manager/common/all-cli.nix index 7e748cc..006145e 100644 --- a/modules/home-manager/common/all-cli.nix +++ b/modules/home-manager/common/all-cli.nix @@ -67,6 +67,7 @@ }; }; bottom.enable = true; + broot.enable = true; eza.enable = true; gh.enable = true; git = { From 95eec44e8907d78c0347bc8c0e95b8d16e4853ab Mon Sep 17 00:00:00 2001 From: Gene Liverman Date: Fri, 29 Dec 2023 10:43:56 -0500 Subject: [PATCH 6/8] Add duf, a du alternative that is nice looking --- modules/home-manager/common/all-cli.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/home-manager/common/all-cli.nix b/modules/home-manager/common/all-cli.nix index 006145e..f15c9dc 100644 --- a/modules/home-manager/common/all-cli.nix +++ b/modules/home-manager/common/all-cli.nix @@ -5,6 +5,7 @@ dogdns dos2unix du-dust + duf fd git-filter-repo gotop From 0962ff6ecaa9c2d166c801d1d4165caa5e3a87e5 Mon Sep 17 00:00:00 2001 From: Gene Liverman Date: Tue, 2 Jan 2024 15:58:03 -0500 Subject: [PATCH 7/8] Adjust some nvim bits --- modules/home-manager/common/all-cli.nix | 31 ++++++++++++++---- .../lua/{plugins => disabled}/cheatsheet.lua | 0 .../nvim/lua/plugins/telescope-cheat.lua | 7 ++++ .../nvim/lua/plugins/telescope-symbols.lua | 1 + .../nvim/lua/plugins/telescope-ui-select.lua | 15 --------- .../files/nvim/lua/plugins/telescope.lua | 32 ++++++++++++++----- 6 files changed, 57 insertions(+), 29 deletions(-) rename modules/home-manager/files/nvim/lua/{plugins => disabled}/cheatsheet.lua (100%) create mode 100644 modules/home-manager/files/nvim/lua/plugins/telescope-cheat.lua create mode 100644 modules/home-manager/files/nvim/lua/plugins/telescope-symbols.lua diff --git a/modules/home-manager/common/all-cli.nix b/modules/home-manager/common/all-cli.nix index f15c9dc..4b4da69 100644 --- a/modules/home-manager/common/all-cli.nix +++ b/modules/home-manager/common/all-cli.nix @@ -1,6 +1,14 @@ -{ pkgs, genebean-omp-themes, ... }: { +{ pkgs, genebean-omp-themes, ... }: let + sqlite_lib = if builtins.elem pkgs.system [ + "aarch64-darwin" + "x86_64-darwin" + ] + then "libsqlite3.dylib" + else "libsqlite3.so"; +in { home.packages = with pkgs; [ cargo + cheat colordiff dogdns dos2unix @@ -94,15 +102,22 @@ jq.enable = true; neovim = { enable = true; - defaultEditor = false; + defaultEditor = true; extraLuaConfig = '' local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" vim.opt.rtp:prepend(lazypath) require("config.keymaps") require("lazy").setup("plugins") + + vim.g.sqlite_clib_path = '${pkgs.sqlite.out}/lib/${sqlite_lib}' + -- NOTE: This will get the OS from Lua: + -- print(vim.loop.os_uname().sysname) ''; - extraPackages = [ pkgs.gcc ]; # needed so treesitter can do compiling + extraPackages = with pkgs; [ + gcc # needed so treesitter can do compiling + sqlite # needed by sqlite.lua used by telescope-cheat + ]; plugins = [ pkgs.vimPlugins.lazy-nvim ]; # let lazy.nvim manage every other plugin }; oh-my-posh = { @@ -132,7 +147,7 @@ }; vim = { enable = true; - defaultEditor = true; + defaultEditor = false; plugins = with pkgs.vimPlugins; [ syntastic tabular @@ -258,8 +273,12 @@ }; # end programs home.file = { - ".config/nvim/lua" = { - source = ../files/nvim/lua; + ".config/nvim/lua/config" = { + source = ../files/nvim/lua/config; + recursive = true; + }; + ".config/nvim/lua/plugins" = { + source = ../files/nvim/lua/plugins; recursive = true; }; ".config/powershell/Microsoft.PowerShell_profile.ps1".source = ../files/Microsoft.PowerShell_profile.ps1; diff --git a/modules/home-manager/files/nvim/lua/plugins/cheatsheet.lua b/modules/home-manager/files/nvim/lua/disabled/cheatsheet.lua similarity index 100% rename from modules/home-manager/files/nvim/lua/plugins/cheatsheet.lua rename to modules/home-manager/files/nvim/lua/disabled/cheatsheet.lua diff --git a/modules/home-manager/files/nvim/lua/plugins/telescope-cheat.lua b/modules/home-manager/files/nvim/lua/plugins/telescope-cheat.lua new file mode 100644 index 0000000..263ea37 --- /dev/null +++ b/modules/home-manager/files/nvim/lua/plugins/telescope-cheat.lua @@ -0,0 +1,7 @@ +return { + "nvim-telescope/telescope-cheat.nvim", + dependencies = { + "kkharji/sqlite.lua", + "nvim-telescope/telescope.nvim", + }, +} diff --git a/modules/home-manager/files/nvim/lua/plugins/telescope-symbols.lua b/modules/home-manager/files/nvim/lua/plugins/telescope-symbols.lua new file mode 100644 index 0000000..322ccc0 --- /dev/null +++ b/modules/home-manager/files/nvim/lua/plugins/telescope-symbols.lua @@ -0,0 +1 @@ +return { "nvim-telescope/telescope-symbols.nvim" } diff --git a/modules/home-manager/files/nvim/lua/plugins/telescope-ui-select.lua b/modules/home-manager/files/nvim/lua/plugins/telescope-ui-select.lua index 078c00e..5458189 100644 --- a/modules/home-manager/files/nvim/lua/plugins/telescope-ui-select.lua +++ b/modules/home-manager/files/nvim/lua/plugins/telescope-ui-select.lua @@ -1,18 +1,3 @@ return { "nvim-telescope/telescope-ui-select.nvim", - config = function () - -- This is your opts table - require("telescope").setup({ - extensions = { - ["ui-select"] = { - require("telescope.themes").get_dropdown({ - -- even more opts - }) - } - } - }) - -- load_extension, somewhere after setup function: - require("telescope").load_extension("ui-select") - end } - diff --git a/modules/home-manager/files/nvim/lua/plugins/telescope.lua b/modules/home-manager/files/nvim/lua/plugins/telescope.lua index b0ad305..7ced43b 100644 --- a/modules/home-manager/files/nvim/lua/plugins/telescope.lua +++ b/modules/home-manager/files/nvim/lua/plugins/telescope.lua @@ -1,13 +1,29 @@ return { "nvim-telescope/telescope.nvim", - tag = "0.1.5", + tag = "0.1.5", dependencies = { "nvim-lua/plenary.nvim" }, - config = function () - local builtin = require('telescope.builtin') + config = function() + -- This is your opts table + require("telescope").setup({ + extensions = { + ["ui-select"] = { + require("telescope.themes").get_dropdown({ + -- even more opts + }), + }, + }, + }) - vim.keymap.set('n', '', builtin.find_files, {}) - vim.keymap.set('n', '', builtin.oldfiles, {}) - vim.keymap.set('n', 'fg', builtin.live_grep, {}) - vim.keymap.set('n', 'fh', builtin.help_tags, {}) - end + -- load_extension, somewhere after setup function: + require("telescope").load_extension("cheat") + require("telescope").load_extension("ui-select") + + local builtin = require("telescope.builtin") + + vim.keymap.set("n", "ts", ":Telescope") + vim.keymap.set("n", "", builtin.find_files, {}) + vim.keymap.set("n", "", builtin.oldfiles, {}) + vim.keymap.set("n", "fg", builtin.live_grep, {}) + vim.keymap.set("n", "fh", builtin.help_tags, {}) + end, } From e0a83fdeb8abe230cef69f3e17738cae943efb74 Mon Sep 17 00:00:00 2001 From: Gene Liverman Date: Tue, 2 Jan 2024 16:06:59 -0500 Subject: [PATCH 8/8] Add vim background option, update formatting --- modules/home-manager/files/nvim/lua/config/keymaps.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/home-manager/files/nvim/lua/config/keymaps.lua b/modules/home-manager/files/nvim/lua/config/keymaps.lua index 2d096b8..0a1e7e2 100644 --- a/modules/home-manager/files/nvim/lua/config/keymaps.lua +++ b/modules/home-manager/files/nvim/lua/config/keymaps.lua @@ -1,6 +1,9 @@ vim.g.mapleader = " " vim.g.maplocalleader = " " +-- make sure vim know I always have a dark terminal +vim.opt.background = "dark" + -- use spaces for tabs and whatnot vim.opt.expandtab = true vim.opt.tabstop = 2 @@ -8,4 +11,4 @@ vim.opt.softtabstop = 2 vim.opt.shiftwidth = 2 vim.opt.shiftround = true -vim.keymap.set('n', 'h', ':nohlsearch') +vim.keymap.set("n", "h", ":nohlsearch")