Nickiel/nicks-nix-config
1
0
Fork 0
mirror of https://github.com/Nickiel12/nicks-nix-config.git synced 2024-11-24 13:45:29 -08:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: Nickiel:b622457551085e4e28621951e67fae2458169005
Branches Tags
Nickiel:main
Nickiel:awesome-dev
..
compare: Nickiel:7cd64e546574288b83bee752b1278f63110d6f0d
Branches Tags
Nickiel:main
Nickiel:awesome-dev

No commits in common. "b622457551085e4e28621951e67fae2458169005" and "7cd64e546574288b83bee752b1278f63110d6f0d" have entirely different histories.
b622457551 ... 7cd64e5465

4 changed files with 28 additions and 36 deletions
Show stats Expand all files Collapse all files

36
flake.lock
View file

@ -136,11 +136,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1691672736, "lastModified": 1691225770,
"narHash": "sha256-HNPA/dKHerA0p4OsToEcW/DtTSXBcK5gFRsy/yPgV/Y=", "narHash": "sha256-O5slH8nW8msTAqVAS5rkvdHSkjmrO+JauuSDzZCmv2M=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "6e1eff9aac0e8d84bda7f2d60ba6108eea9b7e79", "rev": "0a014a729cdd54d9919ff36b714d047909d7a4c8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -155,11 +155,11 @@
}, },
"locked": { "locked": {
"dir": "nix", "dir": "nix",
"lastModified": 1691302749, "lastModified": 1690358150,
"narHash": "sha256-mak2sOtyT4LOcn6zPPMdaWH92tm9qC7Hta7+IaMmTGk=", "narHash": "sha256-pphRp5UIbbKfRJl9MLny3CMUI+SDMISim3Ol2Wh73Bg=",
"owner": "kmonad", "owner": "kmonad",
"repo": "kmonad", "repo": "kmonad",
"rev": "ad69e1be793e61dce2d586481c0f6dda7d978c25", "rev": "5bdd05a9415eaf35b163d6ee8feaa7f64ad9b73d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -233,11 +233,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1691654369, "lastModified": 1691186842,
"narHash": "sha256-gSILTEx1jRaJjwZxRlnu3ZwMn1FVNk80qlwiCX8kmpo=", "narHash": "sha256-wxBVCvZUwq+XS4N4t9NqsHV4E64cPVqQ2fdDISpjcw0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ce5e4a6ef2e59d89a971bc434ca8ca222b9c7f5e", "rev": "18036c0be90f4e308ae3ebcab0e14aae0336fe42",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -249,11 +249,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1691186842, "lastModified": 1690031011,
"narHash": "sha256-wxBVCvZUwq+XS4N4t9NqsHV4E64cPVqQ2fdDISpjcw0=", "narHash": "sha256-kzK0P4Smt7CL53YCdZCBbt9uBFFhE0iNvCki20etAf4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "18036c0be90f4e308ae3ebcab0e14aae0336fe42", "rev": "12303c652b881435065a98729eb7278313041e49",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -286,11 +286,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1691674049, "lastModified": 1690107839,
"narHash": "sha256-M9SA4MZ3IuFCP4XI2IGAepvEYp3stmTwltUcnGu3Ml8=", "narHash": "sha256-ll3j+g3qz239sfLHYhHynKRWhMkxFXsJ9MOAXzSqQMc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "36a6ab4ba7403dca50b2ca2de5fd5fd57fb19335", "rev": "4c25722d73694245e767839b462026ab2296542b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -338,11 +338,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1691256628, "lastModified": 1689668210,
"narHash": "sha256-M0YXHemR3zbyhM7PvJa5lzGhWVf6kM/fpZ4cWe/VIhI=", "narHash": "sha256-XAATwDkaUxH958yXLs1lcEOmU6pSEIkatY3qjqk8X0E=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "3139c4d1f7732cab89f06492bdd4677b877e3785", "rev": "eb433bff05b285258be76513add6f6c57b441775",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
hosts/laptop/default.nix
View file

@ -11,7 +11,6 @@
"10.0.0.183" = [ "headscale.nickiel.net" ]; "10.0.0.183" = [ "headscale.nickiel.net" ];
"100.64.0.1" = ["files.nickiel.net" "git.nickiel.net" "nickiel.net" "jellyfin.nickiel.net" ]; "100.64.0.1" = ["files.nickiel.net" "git.nickiel.net" "nickiel.net" "jellyfin.nickiel.net" ];
}; };
# tailscale set --exit-node <SEVERNAME> to route through an exit node
services.tailscale.enable = true; services.tailscale.enable = true;
networking.firewall = { networking.firewall = {
checkReversePath = "loose"; checkReversePath = "loose";

18
modules/neovim.nix
View file

@ -32,16 +32,11 @@ in
maps.normal = { maps.normal = {
"<leader>ot" = "<cmd>vs | te<cr>"; "<leader>ot" = "<cmd>vs | te<cr>";
"<leader>o." = "<cmd>Telescope file_browser<cr>"; "<leader>o." = "<cmd>Telescope file_browser<cr>";
"<leader>." = "<cmd>Telescope find_files<cr>"; # cwd full sub-dir fuzzy find
"<leader>of" = "<cmd>Telescope live_grep<cr>"; # cwd search file
"<leader>op" = "<cmd>NvimTreeToggle<cr>"; "<leader>op" = "<cmd>NvimTreeToggle<cr>";
"<leader>am" = "<cmd>lua require(\"harpoon.mark\").add_file()<cr>"; # leader + add + mark
"<leader>m" = "<cmd>Telescope harpoon marks<cr>"; # open harpoon marks in telescope
}; };
plugins = { plugins = {
telescope = {
harpoon = {
enable = true; enable = true;
}; };
@ -50,9 +45,8 @@ in
openOnSetup = true; openOnSetup = true;
}; };
nvim-autopairs = { presence-nvim = {
enable = true; enable = true;
checkTs = true;
}; };
treesitter = { treesitter = {
@ -65,7 +59,9 @@ in
"lua" "lua"
]; ];
}; };
treesitter-rainbow.enable = true; treesitter-rainbow = {
enable = true;
};
treesitter-refactor = { treesitter-refactor = {
enable = true; enable = true;
#highlightCurrentScope.enable = true; #highlightCurrentScope.enable = true;
@ -89,7 +85,6 @@ in
}; };
}; };
telescope.enable = true;
rust-tools.enable = true; rust-tools.enable = true;
nvim-cmp.enable = true; nvim-cmp.enable = true;
@ -97,13 +92,13 @@ in
# Read settings here: https://github.com/mfussenegger/nvim-dap#Usage # Read settings here: https://github.com/mfussenegger/nvim-dap#Usage
# See :help dap.txt, :help dap-mapping and :help dap-api. # See :help dap.txt, :help dap-mapping and :help dap-api.
cmp-dap.enable = true; cmp-dap.enable = true;
cmp-vsnip.enable = true; cmp-vsnip.enable = true;
cmp-buffer.enable = true; cmp-buffer.enable = true;
cmp-nvim-lsp-signature-help.enable = true; cmp-nvim-lsp-signature-help.enable = true;
cmp-nvim-lua.enable = true; cmp-nvim-lua.enable = true;
cmp-path.enable = true; cmp-path.enable = true;
presence-nvim.enable = true;
nix.enable = true; nix.enable = true;
airline = { airline = {
enable = true; enable = true;
@ -116,7 +111,6 @@ in
telescope-file-browser-nvim telescope-file-browser-nvim
monokai-pro-nvim monokai-pro-nvim
nvim-lspconfig nvim-lspconfig
vim-vsnip
hop-nvim hop-nvim
]; ];
}; };

9
rsrcs/nvim.lua
View file

@ -8,7 +8,7 @@ rt.setup({
-- Hover actions -- Hover actions
vim.keymap.set("n", "<C-space>", rt.hover_actions.hover_actions, { buffer = bufnr }) vim.keymap.set("n", "<C-space>", rt.hover_actions.hover_actions, { buffer = bufnr })
-- Code action groups -- Code action groups
vim.keymap.set("n", "<leader>a", rt.code_action_group.code_action_group, { buffer = bufnr }) vim.keymap.set("n", "<Leader>a", rt.code_action_group.code_action_group, { buffer = bufnr })
end, end,
}, },
}) })
@ -130,10 +130,6 @@ vim.keymap.set('', '<leader>ff', function()
end, {remap=true}) end, {remap=true})
require("telescope").load_extension "file_browser"
require("telescope").load_extension("harpoon")
-- Themeing
require("monokai-pro").setup({ require("monokai-pro").setup({
transparent_background = true, transparent_background = true,
terminal_colors = true, terminal_colors = true,
@ -182,3 +178,6 @@ require("monokai-pro").setup({
}) })
vim.cmd.colorscheme "monokai-pro-spectrum" vim.cmd.colorscheme "monokai-pro-spectrum"
require("telescope").load_extension "file_browser"