kenji/nixovim
1
0
Fork 0
forked from Shinonome/fred-neovim
Code Pull Requests Activity

Compare commits

base: kenji/nixovim:master
Branches Tags
kenji/nixovim:master
..
compare: kenji/nixovim:fdf447cae9035c6a8930dcd49113f1fc5aadf80d
Branches Tags
kenji/nixovim:master Shinonome/fred-neovim:master

5 Commits
master .. fdf447cae9

Author SHA1 Message Date
lsoriano-mcm fdf447cae9 Revert "added jetbrains" 
This reverts commit 41f3594f31.
 2025-07-05 09:03:55 -05:00
lsoriano-mcm 828cad933f Revert "added sh" 
This reverts commit 432c2aabf2.

reverted
 2025-07-05 09:02:45 -05:00
lsoriano-mcm 31d89a7cb5 harpoon 2025-07-05 08:58:46 -05:00
lsoriano-mcm 97af0cfac1 added bash, removed harpoon 2025-07-05 08:55:19 -05:00
lsoriano-mcm 432c2aabf2 added sh 2025-07-05 08:37:10 -05:00
7 changed files with 331 additions and 273 deletions
Expand all files Collapse all files
config/dashboard.nix
+174 -176
View File
@@ -2,182 +2,180 @@
plugins = { plugins = {
alpha = { alpha = {
enable = true; enable = true;
settings = { layout = [
layout = [ {
{ type = "padding";
type = "padding"; val = 2;
val = 2; }
} {
{ type = "text";
type = "text"; val = [
val = [ "███╗ ██╗██╗██╗ ██╗ ██████╗ ██╗ ██╗██╗███╗ ███╗"
"███╗ ██╗██╗██╗ ██╗ ██████╗ ██╗ ██╗██╗███╗ ███╗" "████╗ ██║██║╚██╗██╔╝██╔═══██╗██║ ██║██║████╗ ████║"
"████╗ ██║██║╚██╗██╔╝██╔═══██╗██║ ██║██║████╗ ████║" "██╔██╗ ██║██║ ╚███╔╝ ██║ ██║██║ ██║██║██╔████╔██║"
"██╔██╗ ██║██║ ╚███╔╝ ██║ ██║██║ ██║██║██╔████╔██║" "██║╚██╗██║██║ ██╔██╗ ██║ ██║╚██╗ ██╔╝██║██║╚██╔╝██║"
"██║╚██╗██║██║ ██╔██╗ ██║ ██║╚██╗ ██╔╝██║██║╚██╔╝██║" "██║ ╚████║██║██╔╝ ██╗╚██████╔╝ ╚████╔╝ ██║██║ ╚═╝ ██║"
"██║ ╚████║██║██╔╝ ██╗╚██████╔╝ ╚████╔╝ ██║██║ ╚═╝ ██║" "╚═╝ ╚═══╝╚═╝╚═╝ ╚═╝ ╚═════╝ ╚═══╝ ╚═╝╚═╝ ╚═╝"
"╚═╝ ╚═══╝╚═╝╚═╝ ╚═╝ ╚═════╝ ╚═══╝ ╚═╝╚═╝ ╚═╝" ];
]; opts = {
opts = { position = "center";
position = "center"; hl = "Type";
hl = "Type"; };
}; }
} {
{ type = "text";
type = "text"; val = [" "];
val = [" "]; }
} {
{ type = "padding";
type = "padding"; val = 1;
val = 1; }
} {
{ type = "text";
type = "text"; val = [
val = [ "╔════════════════════════════╗"
"╔════════════════════════════╗" "║ ...better than most IDEs! ║"
"║ ...better than most IDEs! ║" "╚════════════════════════════╝"
"╚════════════════════════════╝" ];
]; opts = {
opts = { position = "center";
position = "center"; };
}; }
} {
{ type = "padding";
type = "padding"; val = 4;
val = 4; }
} {
{ type = "group";
type = "group"; val = [
val = [ {
{ type = "button";
type = "button"; val = " New File ";
val = " New File "; on_press.__raw = "function() vim.cmd[[ene]] end";
on_press.__raw = "function() vim.cmd[[ene]] end"; opts = {
opts = { shortcut = "n";
shortcut = "n"; keymap = [
keymap = [ "n"
"n" "n"
"n" "<cmd>ene<CR>"
"<cmd>ene<CR>" {
{ noremap = true;
noremap = true; silent = true;
silent = true; nowait = true;
nowait = true; }
} ];
]; position = "center";
position = "center"; width = 50;
width = 50; align_shortcut = "right";
align_shortcut = "right"; hl_shortcut = "Keyword";
hl_shortcut = "Keyword"; };
}; }
} {
{ type = "padding";
type = "padding"; val = 1;
val = 1; }
} {
{ type = "button";
type = "button"; val = " Find File ";
val = " Find File "; opts = {
opts = { shortcut = "f";
shortcut = "f"; keymap = [
keymap = [ "n"
"n" "f"
"f" "<cmd>lua require('fzf-lua').files({ cwd = vim.loop.cwd() })<CR>"
"<cmd>lua require('fzf-lua').files({ cwd = vim.loop.cwd() })<CR>" {
{ noremap = true;
noremap = true; silent = true;
silent = true; nowait = true;
nowait = true; }
} ];
]; position = "center";
position = "center"; width = 50;
width = 50; align_shortcut = "right";
align_shortcut = "right"; hl_shortcut = "Keyword";
hl_shortcut = "Keyword"; };
}; }
} {
{ type = "padding";
type = "padding"; val = 1;
val = 1; }
} {
{ type = "button";
type = "button"; val = " Recent Files ";
val = " Recent Files "; on_press.__raw = "function() require('telescope.builtin').oldfiles() end";
on_press.__raw = "function() require('telescope.builtin').oldfiles() end"; opts = {
opts = { shortcut = "r";
shortcut = "r"; keymap = [
keymap = [ "n"
"n" "r"
"r" "<cmd>lua require('fzf-lua').oldfiles({ cwd = vim.loop.cwd() })<CR>"
"<cmd>lua require('fzf-lua').oldfiles({ cwd = vim.loop.cwd() })<CR>" {
{ noremap = true;
noremap = true; silent = true;
silent = true; nowait = true;
nowait = true; }
} ];
]; position = "center";
position = "center"; width = 50;
width = 50; align_shortcut = "right";
align_shortcut = "right"; hl_shortcut = "Keyword";
hl_shortcut = "Keyword"; };
}; }
} {
{ type = "padding";
type = "padding"; val = 1;
val = 1; }
} {
{ type = "button";
type = "button"; val = " Find Text ";
val = " Find Text "; on_press.__raw = "function() require('telescope.builtin').live_grep() end";
on_press.__raw = "function() require('telescope.builtin').live_grep() end"; opts = {
opts = { shortcut = "g";
shortcut = "g"; keymap = [
keymap = [ "n"
"n" "g"
"g" "<cmd>lua require('fzf-lua').live_grep()<CR>"
"<cmd>lua require('fzf-lua').live_grep()<CR>" {
{ noremap = true;
noremap = true; silent = true;
silent = true; nowait = true;
nowait = true; }
} ];
]; position = "center";
position = "center"; width = 50;
width = 50; align_shortcut = "right";
align_shortcut = "right"; hl_shortcut = "Keyword";
hl_shortcut = "Keyword"; };
}; }
} {
{ type = "padding";
type = "padding"; val = 1;
val = 1; }
} {
{ type = "button";
type = "button"; val = " Quit Neovim ";
val = " Quit Neovim "; on_press.__raw = "function() vim.cmd[[qa]] end";
on_press.__raw = "function() vim.cmd[[qa]] end"; opts = {
opts = { shortcut = "q";
shortcut = "q"; keymap = [
keymap = [ "n"
"n" "q"
"q" "<cmd>qa<CR>"
"<cmd>qa<CR>" {
{ noremap = true;
noremap = true; silent = true;
silent = true; nowait = true;
nowait = true; }
} ];
]; position = "center";
position = "center"; width = 50;
width = 50; align_shortcut = "right";
align_shortcut = "right"; hl_shortcut = "Keyword";
hl_shortcut = "Keyword"; };
}; }
} ];
]; }
} ];
];
};
}; };
}; };
} }
config/iac/language.nix
+1 -4
View File
@@ -6,18 +6,15 @@
formatters_by_ft = { formatters_by_ft = {
terraform = ["tofu_fmt"]; terraform = ["tofu_fmt"];
tf = ["tofu_fmt"]; tf = ["tofu_fmt"];
sh = ["shfmt"];
bash = ["shfmt"];
}; };
}; };
}; };
lsp.servers = { lsp.servers = {
ansiblels.enable = false; # they stopped updating it... ansiblels.enable = true;
dockerls.enable = true; dockerls.enable = true;
helm_ls.enable = true; helm_ls.enable = true;
nginx_language_server.enable = true; nginx_language_server.enable = true;
terraformls.enable = true; terraformls.enable = true;
bashls.enable = true;
}; };
}; };
config/plugins.nix
+1
View File
@@ -30,6 +30,7 @@ in {
]; ];
extraConfigLua = '' extraConfigLua = ''
require("telescope").load_extension('harpoon')
require("notify").setup({ require("notify").setup({
background_colour = "#000000", background_colour = "#000000",
config/sets.nix
+12 -20
View File
@@ -33,14 +33,17 @@
watch_gitdir = {follow_files = true;}; watch_gitdir = {follow_files = true;};
}; };
}; };
harpoon = { harpoon = {
enable = false; enable = true;
settings = { settings = {
save_on_toggle = true; saveOnToggle = true;
save_on_change = true; saveOnChange = true;
enter_on_sendcmd = false; enterOnSendcmd = false;
markBranch = true;
}; };
}; };
hop.enable = true; hop.enable = true;
illuminate.enable = true; illuminate.enable = true;
image.enable = true; image.enable = true;
@@ -142,25 +145,14 @@
}; };
render-markdown.enable = true; render-markdown.enable = true;
todo-comments.enable = true; todo-comments.enable = true;
treesitter = { treesitter = {
enable = true; enable = true;
folding.enable = false; # Fixes the folding deprecation warning
settings = { folding = false;
indent.enable = true; settings.indent.enable = true;
auto_install = false; # Disable runtime installation
# ensure_installed = [
# "git_config"
# "git_rebase"
# "gitattributes"
# "gitcommit"
# "gitignore"
# "bash"
# "python"
# "lua"
# "nix"
# ];
};
}; };
vim-surround.enable = true; vim-surround.enable = true;
web-devicons.enable = true; web-devicons.enable = true;
}; };
flake.lock
Generated
+128 -26
View File
@@ -5,11 +5,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1738453229, "lastModified": 1751413152,
"narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -26,11 +26,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1778716662, "lastModified": 1749398372,
"narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -39,13 +39,59 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"ixx": {
"inputs": {
"flake-utils": [
"nixvim",
"nuschtosSearch",
"flake-utils"
],
"nixpkgs": [
"nixvim",
"nuschtosSearch",
"nixpkgs"
]
},
"locked": {
"lastModified": 1748294338,
"narHash": "sha256-FVO01jdmUNArzBS7NmaktLdGA5qA3lUMJ4B7a05Iynw=",
"owner": "NuschtOS",
"repo": "ixx",
"rev": "cc5f390f7caf265461d4aab37e98d2292ebbdb85",
"type": "github"
},
"original": {
"owner": "NuschtOS",
"ref": "v0.0.8",
"repo": "ixx",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1778869304, "lastModified": 1751271578,
"narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", "narHash": "sha256-P/SQmKDu06x8yv7i0s8bvnnuJYkxVGBWLWHaU+tt4YY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d233902339c02a9c334e7e593de68855ad26c4cb", "rev": "3016b4b15d13f3089db8a41ef937b13a9e33a8df",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -57,17 +103,36 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1738452942, "lastModified": 1751159883,
"narHash": "sha256-vJzFZGaCpnmo7I6i416HaBLpC+hvcURh/BQwROcGIp8=", "narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=",
"type": "tarball", "owner": "nix-community",
"url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz" "repo": "nixpkgs.lib",
"rev": "14a40a1d7fb9afa4739275ac642ed7301a9ba1ab",
"type": "github"
}, },
"original": { "original": {
"type": "tarball", "owner": "nix-community",
"url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz" "repo": "nixpkgs.lib",
"type": "github"
} }
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": {
"lastModified": 1750811787,
"narHash": "sha256-rD/978c35JXz6JLAzciTIOCMenPumF6zrQOj4rVZeHE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "992f916556fcfaa94451ebc7fc6e396134bbf5b1",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1744536153, "lastModified": 1744536153,
"narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=",
@@ -86,17 +151,16 @@
"nixvim": { "nixvim": {
"inputs": { "inputs": {
"flake-parts": "flake-parts_2", "flake-parts": "flake-parts_2",
"nixpkgs": [ "nixpkgs": "nixpkgs_2",
"nixpkgs" "nuschtosSearch": "nuschtosSearch",
], "systems": "systems_2"
"systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1779023681, "lastModified": 1751492444,
"narHash": "sha256-K7RLGyiK3J6wHr/JDxXdlGF0+0DEsdBf1w9mXjSyL8I=", "narHash": "sha256-26NgRXwhNM2x4hrok0C3CqSf2v0vi9byONNON5PzbHQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "0d05726bfb060f6559f6d64c1d427f3663dba178", "rev": "239d331bb48673dfd00d7187654892471cd60d44",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -105,6 +169,29 @@
"type": "github" "type": "github"
} }
}, },
"nuschtosSearch": {
"inputs": {
"flake-utils": "flake-utils",
"ixx": "ixx",
"nixpkgs": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1749730855,
"narHash": "sha256-L3x2nSlFkXkM6tQPLJP3oCBMIsRifhIDPMQQdHO5xWo=",
"owner": "NuschtOS",
"repo": "search",
"rev": "8dfe5879dd009ff4742b668d9c699bc4b9761742",
"type": "github"
},
"original": {
"owner": "NuschtOS",
"repo": "search",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
@@ -115,14 +202,14 @@
}, },
"rust-overlay": { "rust-overlay": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1766544144, "lastModified": 1751683029,
"narHash": "sha256-5ppfEyZqX6FMluZHty7Dvw4xN10vLq1yQosp7dGG/28=", "narHash": "sha256-dYO5X5jK8bpQOeRAo8R5aUt6M/+Ji1cZgstZI7SQ2IA=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "5359a4fdc3fa9baa2edcf49758d404dfeeca7743", "rev": "9e5e62a33a929a67a5427fb7324a6f583dced0b2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -145,6 +232,21 @@
"repo": "default", "repo": "default",
"type": "github" "type": "github"
} }
},
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",
flake.nix
+15 -40
View File
@@ -2,10 +2,7 @@
description = "A nixvim configuration"; description = "A nixvim configuration";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
nixvim = { nixvim.url = "github:nix-community/nixvim";
url = "github:nix-community/nixvim";
inputs.nixpkgs.follows = "nixpkgs";
};
flake-parts.url = "github:hercules-ci/flake-parts"; flake-parts.url = "github:hercules-ci/flake-parts";
rust-overlay.url = "github:oxalica/rust-overlay"; rust-overlay.url = "github:oxalica/rust-overlay";
}; };
@@ -33,42 +30,11 @@
overlays = [(import rust-overlay)]; overlays = [(import rust-overlay)];
nixvimLib = nixvim.lib.${system}; nixvimLib = nixvim.lib.${system};
nixvim' = nixvim.legacyPackages.${system}; nixvim' = nixvim.legacyPackages.${system};
pkgs = import inputs.nixpkgs {
inherit system overlays;
config.allowUnfree = true;
};
deps = with pkgs; [
sops
lazygit
nerd-fonts.jetbrains-mono
rust-bin.stable.latest.default # From rust-overlay
ansible-lint
beautysh
shellcheck
shfmt
];
fullNixvimModule = {
inherit pkgs;
module = {pkgs, ...}: {
imports = [
./config
./config/rust
./config/csharp
./config/golang
./config/python
./config/javascript
./config/iac
];
extraPackages = deps;
};
extraSpecialArgs = specialArgs; # Keep specialArgs for self-reference
};
baseNixvimModule = { baseNixvimModule = {
inherit pkgs; inherit pkgs;
module = {pkgs, ...}: { module = {pkgs, ...}: {
imports = [./config]; imports = [./config];
extraPackages = deps; extraPackages = with pkgs; [sops lazygit];
}; };
extraSpecialArgs = specialArgs; extraSpecialArgs = specialArgs;
}; };
@@ -141,8 +107,10 @@
}; };
extraSpecialArgs = {}; extraSpecialArgs = {};
}; };
pkgs = import inputs.nixpkgs {
fullNvim = nixvim'.makeNixvimWithModule fullNixvimModule; inherit system overlays;
config.allowUnfree = true;
};
baseNvim = nixvim'.makeNixvimWithModule baseNixvimModule; baseNvim = nixvim'.makeNixvimWithModule baseNixvimModule;
rustNvim = nixvim'.makeNixvimWithModule rustNixvimModule; rustNvim = nixvim'.makeNixvimWithModule rustNixvimModule;
csharpNvim = nixvim'.makeNixvimWithModule csharpNixvimModule; csharpNvim = nixvim'.makeNixvimWithModule csharpNixvimModule;
@@ -152,16 +120,23 @@
iacNvim = nixvim'.makeNixvimWithModule iacNixvimModule; iacNvim = nixvim'.makeNixvimWithModule iacNixvimModule;
in { in {
checks = { checks = {
# Run `nix flake check .` to verify that your config is not broken
default = nixvimLib.check.mkTestDerivationFromNixvimModule baseNixvimModule; default = nixvimLib.check.mkTestDerivationFromNixvimModule baseNixvimModule;
}; };
packages = { packages = {
# Lets you run `nix run .` to start nixvim
default = baseNvim; default = baseNvim;
full = fullNvim; # Lets you run `nix run .#rust` to start nixvim with Rust configuration
rust = rustNvim; rust = rustNvim;
# Lets you run `nix run .#csharp` to start nixvim with C# configuration
csharp = csharpNvim; csharp = csharpNvim;
# Lets you run `nix run .#golang` to start nixvim with Go configuration
golang = goNvim; golang = goNvim;
# Lets you run `nix run .#python` to start nixvim with Python configuration
python = pythonNvim; python = pythonNvim;
javascript = javascriptNvim; # This should be javascriptNvim not javascriptNixvimModule # Lets you run `nix run .#javascript` to start nixvim with JS/TS configuration
javascript = javascriptNvim;
# Lets you run `nix run .#javascript` to start nixvim with IaC configuration
iac = iacNvim; iac = iacNvim;
}; };
}; };
test.sh
-7
View File
@@ -1,7 +0,0 @@
#!/bin/bash
function hello() {
echo "Hello World
}
hello