summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorozpv <39195175+ozpv@users.noreply.github.com>2024-12-24 05:03:09 -0600
committerozpv <39195175+ozpv@users.noreply.github.com>2024-12-24 05:03:09 -0600
commit388e1d0fc309a4eba58ea8277fdac556000790e4 (patch)
treecae27037054dbd2014592b232b09e0f43e50b7af
parent3d59c48118f94db200006ba2a8faf2a7973b67cd (diff)
update nvim
-rw-r--r--.gitignore2
-rw-r--r--apps/nixvim.nix18
-rw-r--r--configuration.nix8
3 files changed, 20 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..65e9fef
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+hardware-configuration.nix
+flake.lock
diff --git a/apps/nixvim.nix b/apps/nixvim.nix
index 291dd8a..5ca2738 100644
--- a/apps/nixvim.nix
+++ b/apps/nixvim.nix
@@ -25,9 +25,10 @@
# Etc...
];
- # We can set the leader key:
globals.mapleader = " ";
+ clipboard.register = "unnamedplus";
+
# We can also set options:
opts = {
tabstop = 4;
@@ -42,6 +43,8 @@
plugins = {
lazy.enable = true;
+ todo-comments.enable = true;
+
telescope = {
enable = true;
keymaps = {
@@ -65,12 +68,12 @@
html.enable = true;
pyright.enable = true;
jsonls.enable = true;
- java-language-server.enable = true;
+ # java-language-server.enable = true;
cmake.enable = true;
sqls.enable = true;
nixd.enable = true;
tailwindcss.enable = true;
- svelte.enable = true;
+ # svelte.enable = true;
rust-analyzer = {
enable = true;
installRustc = true;
@@ -116,7 +119,14 @@
lualine.enable = true;
};
- colorschemes.gruvbox.enable = true;
+ colorschemes.catppuccin = {
+ enable = true;
+ settings.flavor = "mocha";
+ integrations = {
+ cmp = true;
+ treesitter = true;
+ };
+ };
extraPlugins = with pkgs.vimPlugins; [ vim-toml ];
};
diff --git a/configuration.nix b/configuration.nix
index d14922e..3b7814a 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -117,7 +117,7 @@
windowManager.dwm.package = pkgs.dwm.overrideAttrs {
src = fetchGit {
url = "https://github.com/ozpv/dwm.git";
- rev = "5d98b0dc24040979851c8e70bec5605bbc54a3e1";
+ rev = "cba75698f40079c07a1560a3ac760a46d52609ad";
};
};
xkb.layout = "us";
@@ -162,19 +162,19 @@
(st.overrideAttrs {
src = fetchGit {
url = "https://github.com/ozpv/st.git";
- rev = "3a3cb60a329fc9dd139cd7a38e73307be791b480";
+ rev = "fb009d1cb85bb2e19cf267fe794cf9ab626c9792";
};
})
(dmenu.overrideAttrs {
src = fetchGit {
url = "https://github.com/ozpv/dmenu.git";
- rev = "d22280f3dc99dd71b5c86c1a6ce584bdee7cd8eb";
+ rev = "8a6dfa7db55749c9bc48ee6bdd6f65c43095e123";
};
})
(slstatus.overrideAttrs {
src = fetchGit {
url = "https://github.com/ozpv/slstatus.git";
- rev = "d8a6d891cba4217d52e325b4107072473c174e45";
+ rev = "8ee4bd60785b6a0078e15b80b27136f8536448e1";
};
})
(callPackage ./apps/powermenu.nix {})