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

Compare commits

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

3 commits
7cd64e5465 ... b622457551

Author SHA1 Message Date
Nickiel12
b622457551 Added missing vsnip plugin 2023-08-11 10:12:15 -07:00
Nickiel12
d57f856709 nix flake update 2023-08-11 09:23:07 -07:00
Nickiel12
34422c5256 added harpoon and a few keybinds 2023-08-11 09:08:09 -07:00
4 changed files with 36 additions and 28 deletions
Show stats Expand all files Collapse all files

36
flake.lock
View file

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

1
hosts/laptop/default.nix
View file

@ -11,6 +11,7 @@
"10.0.0.183" = [ "headscale.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;
networking.firewall = {
checkReversePath = "loose";

18
modules/neovim.nix
View file

@ -32,11 +32,16 @@ in
maps.normal = {
"<leader>ot" = "<cmd>vs | te<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>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 = {
telescope = {
harpoon = {
enable = true;
};
@ -45,8 +50,9 @@ in
openOnSetup = true;
};
presence-nvim = {
nvim-autopairs = {
enable = true;
checkTs = true;
};
treesitter = {
@ -59,9 +65,7 @@ in
"lua"
];
};
treesitter-rainbow = {
enable = true;
};
treesitter-rainbow.enable = true;
treesitter-refactor = {
enable = true;
#highlightCurrentScope.enable = true;
@ -85,6 +89,7 @@ in
};
};
telescope.enable = true;
rust-tools.enable = true;
nvim-cmp.enable = true;
@ -92,13 +97,13 @@ in
# Read settings here: https://github.com/mfussenegger/nvim-dap#Usage
# See :help dap.txt, :help dap-mapping and :help dap-api.
cmp-dap.enable = true;
cmp-vsnip.enable = true;
cmp-buffer.enable = true;
cmp-nvim-lsp-signature-help.enable = true;
cmp-nvim-lua.enable = true;
cmp-path.enable = true;
presence-nvim.enable = true;
nix.enable = true;
airline = {
enable = true;
@ -111,6 +116,7 @@ in
telescope-file-browser-nvim
monokai-pro-nvim
nvim-lspconfig
vim-vsnip
hop-nvim
];
};

9
rsrcs/nvim.lua
View file

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