summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.lock30
-rw-r--r--home/neovim/init.lua12
-rw-r--r--system/default.nix1
-rw-r--r--system/unfree.nix9
4 files changed, 36 insertions, 16 deletions
diff --git a/flake.lock b/flake.lock
index 3de8438..f9f4685 100644
--- a/flake.lock
+++ b/flake.lock
@@ -186,11 +186,11 @@
]
},
"locked": {
- "lastModified": 1777476904,
- "narHash": "sha256-EeLoE8n4+QCbteyAsYXxhfr97RFfWL1ga0xwfL6lpKw=",
+ "lastModified": 1777988791,
+ "narHash": "sha256-DtbtSW5+Hls7z+D9BfsAXvFuivt5iZ0OzUXjQ8d8lB8=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "8c8e5389e75a36bee53920de8ee24f017b3ae03e",
+ "rev": "d987617879f613053f6fdf4491fe28ce0283d543",
"type": "github"
},
"original": {
@@ -576,11 +576,11 @@
},
"nixos-hardware": {
"locked": {
- "lastModified": 1776983936,
- "narHash": "sha256-ZOQyNqSvJ8UdrrqU1p7vaFcdL53idK+LOM8oRWEWh6o=",
+ "lastModified": 1777917524,
+ "narHash": "sha256-k+LVe9YaO2BEPB9AaCtTtOMCeGi4dxDo6gt4Un3qoPY=",
"owner": "nixos",
"repo": "nixos-hardware",
- "rev": "2096f3f411ce46e88a79ae4eafcfc9df8ed41c61",
+ "rev": "df7783100babf59001340a7a874ba3824e441ecb",
"type": "github"
},
"original": {
@@ -598,11 +598,11 @@
]
},
"locked": {
- "lastModified": 1777394230,
- "narHash": "sha256-So0O9VEARU3xTRIFkBtvfzpRDxx4W2WPZPgucxdKBm8=",
+ "lastModified": 1777732699,
+ "narHash": "sha256-2uX/XtOWZ/oy2rerRynVhqVA//ZXZ3Fo60PikLHEPQc=",
"owner": "nix-community",
"repo": "nixos-wsl",
- "rev": "d2e09229638f08f6d5c99060573f6fa4b1dde852",
+ "rev": "5482f113fd31ebac131d1ebeb2ae90bf0d5e41f5",
"type": "github"
},
"original": {
@@ -613,11 +613,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1777268161,
- "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=",
+ "lastModified": 1777578337,
+ "narHash": "sha256-Ad49moKWeXtKBJNy2ebiTQUEgdLyvGmTeykAQ9xM+Z4=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76",
+ "rev": "15f4ee454b1dce334612fa6843b3e05cf546efab",
"type": "github"
},
"original": {
@@ -789,11 +789,11 @@
]
},
"locked": {
- "lastModified": 1777338324,
- "narHash": "sha256-bc+ZZCmOTNq86/svGnw0tVpH7vJaLYvGLLKFYP08Q8E=",
+ "lastModified": 1777944972,
+ "narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=",
"owner": "Mic92",
"repo": "sops-nix",
- "rev": "8eaee5c45428b28b8c47a83e4c09dccec5f279b5",
+ "rev": "c591bf665727040c6cc5cb409079acb22dcce33c",
"type": "github"
},
"original": {
diff --git a/home/neovim/init.lua b/home/neovim/init.lua
index e66e523..8bacfe7 100644
--- a/home/neovim/init.lua
+++ b/home/neovim/init.lua
@@ -12,6 +12,12 @@ local function bind(key, action, opts)
vim.keymap.set('n', key, action, opts)
end
+local function alias(name, vimFn)
+ vim.api.nvim_create_user_command(name, function ()
+ vim.cmd(vimFn)
+ end, {})
+end
+
--[[ VIM ]]--
vim.opt.tabstop = config.tabwidth
@@ -221,7 +227,7 @@ bind(config.keys.menus.undo, vim.cmd.UndotreeToggle)
--[[ ERROR MENU ]]--
-bind(config.keys.menus.error, function() require('trouble').toggle() end)
+bind(config.keys.menus.error, function() require('trouble').toggle("diagnostics") end)
--[[ TELESCOPE ]]--
@@ -329,6 +335,10 @@ vim.diagnostic.config({
virtual_text = true,
})
+-- bring back old Lsp commands (muscle memory)
+alias("LspRestart", "lsp restart")
+alias("LspInfo", "checkhealth vim.lsp")
+
--[[ NOTIFICATIONS ]]--
require('fidget').setup {
diff --git a/system/default.nix b/system/default.nix
index 3296c75..62c8306 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -21,6 +21,7 @@ in {
./nvidia.nix
./sshd.nix
./tpm.nix
+ ./unfree.nix
];
# allow flakes
diff --git a/system/unfree.nix b/system/unfree.nix
new file mode 100644
index 0000000..fd26d3a
--- /dev/null
+++ b/system/unfree.nix
@@ -0,0 +1,9 @@
+_: {
+ # list of unfree packages used in
+ # the home module, since "unfreePackages"
+ # does not work in home when using `rs`
+ unfreePackages = [
+ "vim-table-mode"
+ "nvim-highlight-colors"
+ ];
+}