diff --git a/flake.lock b/flake.lock
index 52ffd66..a1e9aa9 100644
--- a/flake.lock
+++ b/flake.lock
@@ -504,11 +504,11 @@
},
"nixpkgs_3": {
"locked": {
- "lastModified": 1685836261,
- "narHash": "sha256-rpxEPGeW4JZJcH58SQApJUtJ7w78VPtkF6Cut/Pq6Kg=",
+ "lastModified": 1685931219,
+ "narHash": "sha256-8EWeOZ6LKQfgAjB/USffUSELPRjw88A+xTcXnOUvO5M=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "dd4982554e18b936790da07c4ea2db7c7600f283",
+ "rev": "7409480d5c8584a1a83c422530419efe4afb0d19",
"type": "github"
},
"original": {
@@ -804,11 +804,11 @@
"yants": "yants_2"
},
"locked": {
- "lastModified": 1685759602,
- "narHash": "sha256-aEIGXP3RecgVQ0qEsRM+OuYrY4GYzq7mmlVjpO+SOuo=",
+ "lastModified": 1686006649,
+ "narHash": "sha256-6sdvFtQyx7SZoki1MlO2+3Xns4jmR34FEjlXawQdwhk=",
"owner": "divnix",
"repo": "std",
- "rev": "1607dab0469ac89ca6727a1cadde8bce3a958438",
+ "rev": "d6bcee9c35fb4a905b51c39e4d5ca842e9a421eb",
"type": "github"
},
"original": {
diff --git a/native_configs/neovim/init.lua b/native_configs/neovim/init.lua
index 5302860..df1e4c8 100644
--- a/native_configs/neovim/init.lua
+++ b/native_configs/neovim/init.lua
@@ -59,7 +59,7 @@ Plug('nathanalderson/yang.vim')
-- Plug('windwp/nvim-autopairs') -- matches pairs like [] (),...
-- Plug('windwp/nvim-ts-autotag') -- matches tags
hello
-- Plug('NMAC427/guess-indent.nvim') -- guesses the indentation of an opened buffer
--- Plug('j-hui/fidget.nvim') -- Progress bar for LSP
+-- Plug('j-hui/fidget.nvim') -- Progress bar for LSP
Plug('numToStr/Comment.nvim') -- "gc" to comment visual regions/lines
Plug('lewis6991/gitsigns.nvim') -- add git info to sign columns
Plug('tpope/vim-fugitive') -- git commands in nvim
@@ -507,12 +507,6 @@ require("inlay-hints").setup {
}
}
local on_attach = function(client, bufnr)
- -- NOTE: Remember that lua is a real programming language, and as such it is possible
- -- to define small helper and utility functions so you don't have to repeat yourself
- -- many times.
- --
- -- In this case, we create a function that lets us more easily define mappings specific
- -- for LSP related items. It sets the mode, buffer and description for us each time.
local nmap = function(keys, func, desc)
if desc then
desc = 'LSP: ' .. desc
@@ -523,6 +517,7 @@ local on_attach = function(client, bufnr)
nmap('rn', vim.lsp.buf.rename, '[R]e[n]ame')
nmap('ca', vim.lsp.buf.code_action, '[C]ode [A]ction')
+ -- NOTE: I have no clue what this does again
vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
nmap('df', function() vim.lsp.buf.format({ async = true }) end, '[D]ocument [F]ormat')
@@ -533,15 +528,19 @@ local on_attach = function(client, bufnr)
nmap('ds', require('telescope.builtin').lsp_document_symbols, '[D]ocument [S]ymbols')
nmap('ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols')
- -- documentations. See `:help K` for why this keymap
+ -- documentations & helps
+ -- NOTE: When you press K, it shows in-line Documentation
+ -- This is to stay faithful with vim's default keybind for help.
+ -- See `:help K` for even more info on Vim's original keybindings for help
nmap('K', vim.lsp.buf.hover, 'Hover Documentation')
nmap('', vim.lsp.buf.signature_help, 'Signature Documentation')
- -- Lesser used LSP functionality
-
+ -- Less likely LSP functionality to be used
nmap('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')
nmap('gtd', vim.lsp.buf.type_definition, '[G]oto [T]ype [D]efinition')
nmap('D', vim.lsp.buf.type_definition, 'Type [D]efinition')
+ --
+ -- Very rarely used
nmap('wa', vim.lsp.buf.add_workspace_folder, '[W]orkspace [A]dd Folder')
nmap('wr', vim.lsp.buf.remove_workspace_folder, '[W]orkspace [R]emove Folder')
nmap('wl', function()
@@ -1086,52 +1085,53 @@ require('lualine').setup {
require('nvim-surround').setup {}
require('tsql').setup()
require('fidget').setup({
- text = {
- spinner = "pipe", -- animation shown when tasks are ongoing
- done = "✔", -- character shown when all tasks are complete
- commenced = "Started", -- message shown when task starts
- completed = "Completed", -- message shown when task completes
- },
- align = {
- bottom = true, -- align fidgets along bottom edge of buffer
- right = true, -- align fidgets along right edge of buffer
- },
- timer = {
- spinner_rate = 125, -- frame rate of spinner animation, in ms
- fidget_decay = 2000, -- how long to keep around empty fidget, in ms
- task_decay = 1000, -- how long to keep around completed task, in ms
- },
- window = {
- relative = "win", -- where to anchor, either "win" or "editor"
- blend = 100, -- &winblend for the window
- zindex = nil, -- the zindex value for the window
- border = "none", -- style of border for the fidget window
- },
- fmt = {
- leftpad = true, -- right-justify text in fidget box
- stack_upwards = true, -- list of tasks grows upwards
- max_width = 0, -- maximum width of the fidget box
- fidget = -- function to format fidget title
- function(fidget_name, spinner)
- return string.format("%s %s", spinner, fidget_name)
- end,
- task = -- function to format each task line
- function(task_name, message, percentage)
- return string.format(
- "%s%s [%s]",
- message,
- percentage and string.format(" (%s%%)", percentage) or "",
- task_name
- )
- end,
- },
- sources = { -- Sources to configure
- * = { -- Name of source
- ignore = false, -- Ignore notifications from this source
+ text = {
+ spinner = "moon", -- animation shown when tasks are ongoing
+ done = "✔", -- character shown when all tasks are complete
+ commenced = "Started", -- message shown when task starts
+ completed = "Completed", -- message shown when task completes
+ },
+ align = {
+ bottom = true, -- align fidgets along bottom edge of buffer
+ right = true, -- align fidgets along right edge of buffer
+ },
+ timer = {
+ spinner_rate = 125, -- frame rate of spinner animation, in ms
+ fidget_decay = 2000, -- how long to keep around empty fidget, in ms
+ task_decay = 1000, -- how long to keep around completed task, in ms
+ },
+ window = {
+ relative = "editor", -- where to anchor, either "win" or "editor"
+ blend = 100, -- &winblend for the window
+ zindex = nil, -- the zindex value for the window
+ border = "none", -- style of border for the fidget window
+ },
+ fmt = {
+ leftpad = true, -- right-justify text in fidget box
+ stack_upwards = true, -- list of tasks grows upwards
+ max_width = 0, -- maximum width of the fidget box
+ fidget = -- function to format fidget title
+ function(fidget_name, spinner)
+ return string.format("%s %s", spinner, fidget_name)
+ end,
+ task = -- function to format each task line
+ function(task_name, message, percentage)
+ return string.format(
+ "%s%s [%s]",
+ message,
+ percentage and string.format(" (%s%%)", percentage) or "",
+ task_name
+ )
+ end,
+ },
+ sources = {
+ -- Sources to configure
+ ['*'] = { -- Name of source
+ ignore = false, -- Ignore notifications from this source
+ },
+ },
+ debug = {
+ logging = false, -- whether to enable logging, for debugging
+ strict = false, -- whether to interpret LSP strictly
},
- },
- debug = {
- logging = false, -- whether to enable logging, for debugging
- strict = false, -- whether to interpret LSP strictly
- },
})
diff --git a/nix-conf/home-manager/base/darwin-spotlight.nix b/nix-conf/home-manager/base/darwin-spotlight.nix
index 4101528..c538e66 100644
--- a/nix-conf/home-manager/base/darwin-spotlight.nix
+++ b/nix-conf/home-manager/base/darwin-spotlight.nix
@@ -15,7 +15,9 @@
# Install MacOS applications to the user environment.
HM_APPS="$HOME/Applications/Home Manager Apps"
# Reset current state
- [ -e "$HM_APPS" ] && $DRY_RUN_CMD rm -r "$HM_APPS"
+ if [ -e "$HM_APPS" ]; then
+ $DRY_RUN_CMD rm -r "$HM_APPS"
+ fi
$DRY_RUN_CMD mkdir -p "$HM_APPS"
# .app dirs need to be actual directories for Finder to detect them as Apps.
# In the env of Apps we build, the .apps are symlinks. We pass all of them as
diff --git a/nix-conf/home-manager/flake.lock b/nix-conf/home-manager/flake.lock
index bcc7d08..e4d9579 100644
--- a/nix-conf/home-manager/flake.lock
+++ b/nix-conf/home-manager/flake.lock
@@ -803,11 +803,11 @@
]
},
"locked": {
- "lastModified": 1685885003,
- "narHash": "sha256-+OB0EvZBfGvnlTGg6mtyUCqkMnUp9DkmRUU4d7BZBVE=",
+ "lastModified": 1685999310,
+ "narHash": "sha256-gaRMZhc7z4KeU/xS3IWv3kC+WhVcAXOLXXGKLe5zn1Y=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "607d8fad96436b134424b9935166a7cd0884003e",
+ "rev": "28614ed7a1e3ace824c122237bdc0e5e0b62c5c3",
"type": "github"
},
"original": {
@@ -938,11 +938,11 @@
"topiary": "topiary"
},
"locked": {
- "lastModified": 1685719780,
- "narHash": "sha256-igcKtuS1p63O3JDo3qIH4T53hK66K+QQNe+bo+D9qZI=",
+ "lastModified": 1685962675,
+ "narHash": "sha256-S4UEX+H/j3tmz+202ODtPuK7WWoPbSIbk0y5GXaHJPY=",
"owner": "tweag",
"repo": "nickel",
- "rev": "651ffdbc76e0314d693f4818812be3e2b100f626",
+ "rev": "43bc8fee6a5f69455cd49be75b10d2d4219553e0",
"type": "github"
},
"original": {
@@ -1182,11 +1182,11 @@
},
"nixpkgs_12": {
"locked": {
- "lastModified": 1685836261,
- "narHash": "sha256-rpxEPGeW4JZJcH58SQApJUtJ7w78VPtkF6Cut/Pq6Kg=",
+ "lastModified": 1685931219,
+ "narHash": "sha256-8EWeOZ6LKQfgAjB/USffUSELPRjw88A+xTcXnOUvO5M=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "dd4982554e18b936790da07c4ea2db7c7600f283",
+ "rev": "7409480d5c8584a1a83c422530419efe4afb0d19",
"type": "github"
},
"original": {
@@ -1753,11 +1753,11 @@
"nixpkgs": "nixpkgs_13"
},
"locked": {
- "lastModified": 1685932304,
- "narHash": "sha256-HUrE7Al6Rp9GeOjUycXz25TYhXXf1vtZLf/FFPVFRNw=",
+ "lastModified": 1686105195,
+ "narHash": "sha256-tBTKW+oqfT86Mvq/nm8Tkk3pzhJFXJWXJrj71cTF7lE=",
"owner": "oxalica",
"repo": "rust-overlay",
- "rev": "08b06ab2046bce2c3b5f53ec599a6550ab9a9485",
+ "rev": "1279a72003f5e4b08c8eca1101d8f57452a539f9",
"type": "github"
},
"original": {