moritz
/
dotfiles
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: moritz:c121eae7a1cf83f5cedf4c3463164d5614de113c
Branches Tags
moritz:nixos
...
compare: moritz:b945255e596c7b42fb07842f51799720b25a40ba
Branches Tags
moritz:nixos

11 Commits
c121eae7a1 ... b945255e59

Author SHA1 Message Date
Moritz Böhme b945255e59
build: bump inputs 2023-09-06 17:50:50 +02:00
Moritz Böhme d3f5d2e9bd
feat(nvim): better next/prev tab keybinds 2023-09-06 17:50:49 +02:00
Moritz Böhme 6ae954d3c6
feat(nvim): add lsp signature plugin 2023-09-06 17:50:48 +02:00
Moritz Böhme 4322977115
feat(nvim): make modes a list for lazy keybinds 2023-09-06 17:50:47 +02:00
Moritz Böhme abdb620c83
feat(nvim)!: remove org mode 2023-09-06 17:50:46 +02:00
Moritz Böhme 7f336c2a90
feat(nvim): add codeium completion 2023-09-06 17:50:45 +02:00
Moritz Böhme dfa93f98df
Revert "feat(nvim): add coq-nvim" 
This reverts commit e2aff57d72.
 2023-09-06 17:50:44 +02:00
Moritz Böhme c0112661ad
feat: update vimPlugins 2023-09-06 17:50:43 +02:00
Moritz Böhme 736249a74d
feat(nvim): add actions-preview.nvim 2023-09-06 17:50:42 +02:00
Moritz Böhme 97320fbec1
feat: set nixpkgs env variable 2023-09-06 17:50:41 +02:00
Moritz Böhme 5596c21e7f
feat!: remove unused comma 2023-09-06 17:50:40 +02:00
15 changed files with 298 additions and 131 deletions
Show Stats Expand all files Collapse all files

204
flake.lock
View File

@ -1,5 +1,21 @@
{ {
"nodes": { "nodes": {
"actions-preview-nvim": {
"flake": false,
"locked": {
"lastModified": 1692778077,
"narHash": "sha256-5HzyrYWGTdorG4JXMv0iQNj9EM702+8g7E18Oct1JiY=",
"owner": "aznhe21",
"repo": "actions-preview.nvim",
"rev": "5650c76abfb84d6498330dd045657ba630ecdbba",
"type": "github"
},
"original": {
"owner": "aznhe21",
"repo": "actions-preview.nvim",
"type": "github"
}
},
"agenix": { "agenix": {
"inputs": { "inputs": {
"darwin": "darwin", "darwin": "darwin",
@ -25,11 +41,11 @@
"arkenfox-userjs": { "arkenfox-userjs": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1691983650, "lastModified": 1693196107,
"narHash": "sha256-oA1bIpPc27Kk89n3JGpni7RkcIDRVAsTjUfjRHbKS24=", "narHash": "sha256-t6qvPFJIF+De2KqMfCI5DEA40BwWeu4AFRWOzKeEVE0=",
"owner": "arkenfox", "owner": "arkenfox",
"repo": "user.js", "repo": "user.js",
"rev": "915f39959c7e077f00477e6ce34a0f9f9e3e7c6b", "rev": "ba173d49205ee927ed62e81e606569d98f531d38",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -55,6 +71,27 @@
"type": "github" "type": "github"
} }
}, },
"codeium-nvim": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1693966170,
"narHash": "sha256-maRkkUCzjSXK04ts+Io0WFBV1MxR7dCw8I6TV03Dpbs=",
"owner": "jcdickinson",
"repo": "codeium.nvim",
"rev": "6a8cbce54c41e0c305b5f77721f61b2ddd4b6c6d",
"type": "github"
},
"original": {
"owner": "jcdickinson",
"repo": "codeium.nvim",
"type": "github"
}
},
"darwin": { "darwin": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -133,11 +170,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1690933134, "lastModified": 1693611461,
"narHash": "sha256-ab989mN63fQZBFrkk4Q8bYxQCktuHmBIBqUG1jl6/FQ=", "narHash": "sha256-aPODl8vAgGQ0ZYFIRisxYG5MOGSkIczvu2Cd8Gb9+1Y=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "59cf3f1447cfc75087e7273b04b31e689a8599fb", "rev": "7f53fdb7bdc5bb237da7fefef12d099e4fd611ca",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -187,6 +224,21 @@
} }
}, },
"flake-utils": { "flake-utils": {
"locked": {
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_2": {
"inputs": { "inputs": {
"systems": "systems" "systems": "systems"
}, },
@ -204,7 +256,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_2": { "flake-utils_3": {
"inputs": { "inputs": {
"systems": "systems_3" "systems": "systems_3"
}, },
@ -222,7 +274,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_3": { "flake-utils_4": {
"inputs": { "inputs": {
"systems": "systems_4" "systems": "systems_4"
}, },
@ -322,11 +374,11 @@
"hmts-nvim": { "hmts-nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1692743873, "lastModified": 1693226725,
"narHash": "sha256-lfqJVj1HbFJ5H4mo6rKYrexaosqSh17+PQ9BWpcuxZI=", "narHash": "sha256-jUuztOqNBltC3axa7s3CPJz9Cmukfwkf846+Z/gAxCU=",
"owner": "calops", "owner": "calops",
"repo": "hmts.nvim", "repo": "hmts.nvim",
"rev": "34b825bd1c9ec1b6e2952c111753e2eb286c9e07", "rev": "14fd941d7ec2bb98314a1aacaa2573d97f1629ab",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -363,11 +415,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1692763155, "lastModified": 1693972774,
"narHash": "sha256-qMrGKZ8c/q/mHO3ZdrcBPwiVVXPLLgXjY98Ejqb5kAA=", "narHash": "sha256-Dt9UZs0/DaIex598quYRYFuGabUbvFdNrHuvGc6HjBc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "6a20e40acaebf067da682661aa67da8b36812606", "rev": "b22d7bab30076bbb73744867d6c5bf7d6380570c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -381,11 +433,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1690635289, "lastModified": 1693839821,
"narHash": "sha256-ec77Yf7mqusmGkxrmYXEG4D0DqEcNRA3vFextWVQOVA=", "narHash": "sha256-ha9Cxqb81Yni217SoM/zFxE0nNz8IMtreTw4SlXw/D4=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "contrib", "repo": "contrib",
"rev": "bef073cff65917ba2d888aa4dc39bd9868e2b0a4", "rev": "74aa6b02ff4bd48aaee4da461a16c4cbaaa0ca7e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -403,11 +455,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1692871050, "lastModified": 1693944974,
"narHash": "sha256-OJ/OkOLFn546rcXmj/3VEGlsPYjdXWAhEmjqdc6re6k=", "narHash": "sha256-kWa86ahIQvQIgo3GYFJShlBuKTXfggVbrZjkbdjct7U=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "90c03e5bd2204ba6d1a0167c68f65b7a9231bef4", "rev": "c3a83daa1e61285a418c39a1d9f29427c2c9a2c3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -477,11 +529,11 @@
}, },
"master": { "master": {
"locked": { "locked": {
"lastModified": 1692893187, "lastModified": 1693980916,
"narHash": "sha256-Hbbp6bWQykkLsvzi7yo2KQme0oXCZkCdz9bBorcSKH4=", "narHash": "sha256-J7JJCpNiHbXb3D7pb1JkeOTUEpJJXiGI6BngfbnhiIM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d240553dcc2180fe486155bea8a846d5941e168c", "rev": "6485865ec300c7baf9e51ad5d64c30355ee511e7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -514,7 +566,7 @@
}, },
"neovim-flake": { "neovim-flake": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_3",
"nixpkgs": [ "nixpkgs": [
"neovim-nightly-overlay", "neovim-nightly-overlay",
"nixpkgs" "nixpkgs"
@ -522,11 +574,11 @@
}, },
"locked": { "locked": {
"dir": "contrib", "dir": "contrib",
"lastModified": 1692744130, "lastModified": 1693954768,
"narHash": "sha256-Iod6+KGeWnX1SV4owXpSoC17iImCJjTq2iqEp6IRBZc=", "narHash": "sha256-DIyHgdfhmftTN2aHVEmJ1q/W2o0Slild0McAf4sEa8U=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "6462ee1c10f9f1aa66ffc4d4fe1b7b3d9f0f91af", "rev": "2ef7b6a433c61837bcef0fca297a665551835423",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -545,11 +597,11 @@
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_5"
}, },
"locked": { "locked": {
"lastModified": 1692749096, "lastModified": 1693958686,
"narHash": "sha256-XyFSBw3WMf5cTG9ImL6S/v9Aoawr38h/Fr1XIi7peEs=", "narHash": "sha256-UgdB+EXYbi90vm2fam4tYgY9hYGwxSk0sxG96jIyeg4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "83d68ba72f3308b5c90b12fb40044c870903e6ee", "rev": "14defe836200c45acf14f3616d7ba20959028cf8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -569,11 +621,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1691372739, "lastModified": 1693724255,
"narHash": "sha256-fZ8KfBMcIFO/R7xaWtB85SFeuUjb9SCH8fxYBnY8068=", "narHash": "sha256-+Ucv/aBN9wwRE62sUJEBocI+9no7PV4KRDNuFQgygzU=",
"owner": "oxalica", "owner": "oxalica",
"repo": "nil", "repo": "nil",
"rev": "97abe7d3d48721d4e0fcc1876eea83bb4247825b", "rev": "4bdcfcfe38cfcb386142e043392afbfa542665dd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -592,11 +644,11 @@
"nixpkgs-regression": "nixpkgs-regression" "nixpkgs-regression": "nixpkgs-regression"
}, },
"locked": { "locked": {
"lastModified": 1691953666, "lastModified": 1692913762,
"narHash": "sha256-HxgMSgoM19OnDb4h47nrxI2lRGsDo+4Y4JEHeCoWB+Q=", "narHash": "sha256-WIz/rGYBUdRtkZx5BPbE9DXHfUCKlYuKkPzDsP4u77w=",
"owner": "privatevoid-net", "owner": "privatevoid-net",
"repo": "nix-super", "repo": "nix-super",
"rev": "65e8abac80cc06f9f05147b51908a47549e9342e", "rev": "0007178284d0247631af40931b7039d42bfc0da5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -673,11 +725,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1692638711, "lastModified": 1693158576,
"narHash": "sha256-J0LgSFgJVGCC1+j5R2QndadWI1oumusg6hCtYAzLID4=", "narHash": "sha256-aRTTXkYvhXosGx535iAFUaoFboUrZSYb1Ooih/auGp0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "91a22f76cd1716f9d0149e8a5c68424bb691de15", "rev": "a999c1cc0c9eb2095729d5aa03e0d8f7ed256780",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -721,11 +773,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1692557222, "lastModified": 1693844670,
"narHash": "sha256-TCOtZaioLf/jTEgfa+nyg0Nwq5Uc610Z+OFV75yUgGw=", "narHash": "sha256-t69F2nBB8DNQUWHD809oJZJVE+23XBrth4QZuVd6IE0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0b07d4957ee1bd7fd3bdfd12db5f361bd70175a6", "rev": "3c15feef7770eb5500a4b8792623e2d6f598c9c1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -737,11 +789,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1692808169, "lastModified": 1693844670,
"narHash": "sha256-x9Opq06rIiwdwGeK2Ykj69dNc2IvUH1fY55Wm7atwrE=", "narHash": "sha256-t69F2nBB8DNQUWHD809oJZJVE+23XBrth4QZuVd6IE0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9201b5ff357e781bf014d0330d18555695df7ba8", "rev": "3c15feef7770eb5500a4b8792623e2d6f598c9c1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -783,26 +835,27 @@
"type": "github" "type": "github"
} }
}, },
"nvim-treesitter-textsubjects": { "nvim-treesitter": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1691029837, "lastModified": 1691831669,
"narHash": "sha256-O57pMYtDR713ItAeUfdkcl2IfBLQcLEa2sb+AXhaqDs=", "narHash": "sha256-1Iuvq0hVQ7LyBYOkJ5d07NkwbGcR1K61ZZmAAA7ABGs=",
"owner": "RRethy", "owner": "nvim-treesitter",
"repo": "nvim-treesitter-textsubjects", "repo": "nvim-treesitter",
"rev": "df75fcec548014f158cda6498ac38c4622c221e1", "rev": "63260da18bf273c76b8e2ea0db84eb901cab49ce",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "RRethy", "owner": "nvim-treesitter",
"repo": "nvim-treesitter-textsubjects", "ref": "v0.9.1",
"repo": "nvim-treesitter",
"type": "github" "type": "github"
} }
}, },
"pre-commit-hooks": { "pre-commit-hooks": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_3", "flake-compat": "flake-compat_3",
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_4",
"gitignore": "gitignore", "gitignore": "gitignore",
"nixpkgs": "nixpkgs_7", "nixpkgs": "nixpkgs_7",
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
@ -840,10 +893,12 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"actions-preview-nvim": "actions-preview-nvim",
"agenix": "agenix", "agenix": "agenix",
"arkenfox-userjs": "arkenfox-userjs", "arkenfox-userjs": "arkenfox-userjs",
"asus-touchpad-numpad-driver": "asus-touchpad-numpad-driver", "asus-touchpad-numpad-driver": "asus-touchpad-numpad-driver",
"flake-utils": "flake-utils", "codeium-nvim": "codeium-nvim",
"flake-utils": "flake-utils_2",
"hmts-nvim": "hmts-nvim", "hmts-nvim": "hmts-nvim",
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"hypr-contrib": "hypr-contrib", "hypr-contrib": "hypr-contrib",
@ -854,12 +909,13 @@
"nil": "nil", "nil": "nil",
"nix-super": "nix-super", "nix-super": "nix-super",
"nixpkgs": "nixpkgs_6", "nixpkgs": "nixpkgs_6",
"nvim-treesitter-textsubjects": "nvim-treesitter-textsubjects", "nvim-treesitter": "nvim-treesitter",
"pre-commit-hooks": "pre-commit-hooks", "pre-commit-hooks": "pre-commit-hooks",
"rofi-wayland": "rofi-wayland", "rofi-wayland": "rofi-wayland",
"smartcolumn-nvim": "smartcolumn-nvim", "smartcolumn-nvim": "smartcolumn-nvim",
"stable": "stable", "stable": "stable",
"telekasten-nvim": "telekasten-nvim", "telekasten-nvim": "telekasten-nvim",
"telescope-nvim": "telescope-nvim",
"timers": "timers" "timers": "timers"
} }
}, },
@ -891,11 +947,11 @@
"smartcolumn-nvim": { "smartcolumn-nvim": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1692020684, "lastModified": 1693669522,
"narHash": "sha256-lNEsAkKRpMgdO6Og0odpTn/t4qkzO7EuTjC5ABJhvXc=", "narHash": "sha256-SfIbbrAFv/md9EgsJvO0RfDnc6oP5RYz8C5Icual1bU=",
"owner": "m4xshen", "owner": "m4xshen",
"repo": "smartcolumn.nvim", "repo": "smartcolumn.nvim",
"rev": "4aa00ad766f3c0f0e2561e0eb42df3ea3743c135", "rev": "d01b99355c7fab13233f48d0f28dc097e68a03f7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -906,11 +962,11 @@
}, },
"stable": { "stable": {
"locked": { "locked": {
"lastModified": 1692794066, "lastModified": 1693771906,
"narHash": "sha256-H0aG8r16dj0x/Wz6wQhQxc9V7AsObOiHPaKxQgH6Y08=", "narHash": "sha256-32EnPCaVjOiEERZ+o/2Ir7JH9pkfwJZJ27SKHNvt4yk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fc944919f743bb22379dddf18dcb72db6cff84aa", "rev": "da5adce0ffaff10f6d0fee72a02a5ed9d01b52fc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1011,6 +1067,22 @@
"type": "github" "type": "github"
} }
}, },
"telescope-nvim": {
"flake": false,
"locked": {
"lastModified": 1693850759,
"narHash": "sha256-309GezR93SVOD7/B8dDJIEidYziepc1s46CIRkhND1k=",
"owner": "nvim-telescope",
"repo": "telescope.nvim",
"rev": "20a37e43bb43c74c6091f9fea6551af0964ad45a",
"type": "github"
},
"original": {
"owner": "nvim-telescope",
"repo": "telescope.nvim",
"type": "github"
}
},
"timers": { "timers": {
"inputs": { "inputs": {
"naersk": "naersk", "naersk": "naersk",
@ -1053,18 +1125,18 @@
"flake": false, "flake": false,
"locked": { "locked": {
"host": "gitlab.freedesktop.org", "host": "gitlab.freedesktop.org",
"lastModified": 1691073628, "lastModified": 1692976565,
"narHash": "sha256-LlxE3o3UzRY7APYVLGNKM30DBMcDifCRIQiMVSbYLIc=", "narHash": "sha256-eBKkG7tMxg92NskEn8dHRFY245JwjirWRoOZzW6DnUw=",
"owner": "wlroots", "owner": "wlroots",
"repo": "wlroots", "repo": "wlroots",
"rev": "c74f89d4f84bfed0284d3908aee5d207698c70c5", "rev": "717ded9bb0191ea31bf4368be32e7a15fe1b8294",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
"host": "gitlab.freedesktop.org", "host": "gitlab.freedesktop.org",
"owner": "wlroots", "owner": "wlroots",
"repo": "wlroots", "repo": "wlroots",
"rev": "c74f89d4f84bfed0284d3908aee5d207698c70c5", "rev": "717ded9bb0191ea31bf4368be32e7a15fe1b8294",
"type": "gitlab" "type": "gitlab"
} }
}, },

15
flake.nix
View File

@ -35,18 +35,27 @@
# Neovim # Neovim
neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay"; neovim-nightly-overlay.url = "github:nix-community/neovim-nightly-overlay";
nvim-treesitter-textsubjects.flake = false;
nvim-treesitter-textsubjects.url = "github:RRethy/nvim-treesitter-textsubjects";
smartcolumn-nvim.flake = false; smartcolumn-nvim.flake = false;
smartcolumn-nvim.url = "github:m4xshen/smartcolumn.nvim"; smartcolumn-nvim.url = "github:m4xshen/smartcolumn.nvim";
telekasten-nvim.flake = false; telekasten-nvim.flake = false;
telekasten-nvim.url = "github:renerocksai/telekasten.nvim"; telekasten-nvim.url = "github:renerocksai/telekasten.nvim";
telescope-nvim.flake = false;
telescope-nvim.url = "github:nvim-telescope/telescope.nvim";
nvim-treesitter.flake = false;
nvim-treesitter.url = "github:nvim-treesitter/nvim-treesitter/v0.9.1"; # NOTE: to fix weird latest issues
hmts-nvim.flake = false; hmts-nvim.flake = false;
hmts-nvim.url = "github:calops/hmts.nvim"; hmts-nvim.url = "github:calops/hmts.nvim";
actions-preview-nvim.flake = false;
actions-preview-nvim.url = "github:aznhe21/actions-preview.nvim";
codeium-nvim.url = "github:jcdickinson/codeium.nvim";
codeium-nvim.inputs.nixpkgs.follows = "nixpkgs";
# Hyprland # Hyprland
hypr-contrib.url = "github:hyprwm/contrib"; hypr-contrib.url = "github:hyprwm/contrib";
hyprland.url = "github:hyprwm/Hyprland"; hyprland.url = "github:hyprwm/Hyprland";

1
modules/profiles/base.nix
View File

@ -149,7 +149,6 @@ in
# nix # nix
(nom-system-command "nixos-boot" "sudo nixos-rebuild boot --flake ~/.dotfiles") (nom-system-command "nixos-boot" "sudo nixos-rebuild boot --flake ~/.dotfiles")
(nom-system-command "nixos-switch" "sudo nixos-rebuild switch --flake ~/.dotfiles") (nom-system-command "nixos-switch" "sudo nixos-rebuild switch --flake ~/.dotfiles")
comma
manix manix
nix-index nix-index
nix-output-monitor nix-output-monitor

2
modules/programs/nix.nix
View File

@ -24,6 +24,8 @@ in
}; };
config.nix = { config.nix = {
nixPath = [ "nixpkgs=${inputs.nixpkgs}" ];
package = pkgs.nix-super; package = pkgs.nix-super;
extraOptions = "experimental-features = nix-command flakes"; extraOptions = "experimental-features = nix-command flakes";

6
modules/programs/nvim/default.nix
View File

@ -26,7 +26,7 @@ let
); );
descString = optionalString (desc != null) "desc = ${quote desc},"; descString = optionalString (desc != null) "desc = ${quote desc},";
in in
''{ ${quote key}, ${cmdString}, mode = ${quote mode}, ${descString} }''; ''{ ${quote key}, ${cmdString}, mode = ${listToStringOneLine quote mode}, ${descString} }'';
lazySpecFromPlugin = lazySpecFromPlugin =
{ plugin, dependencies, init, conf, lazy, event, enabled, cmd, ft, priority, keys }: { plugin, dependencies, init, conf, lazy, event, enabled, cmd, ft, priority, keys }:
listToStringMultiLine' listToStringMultiLine'
@ -161,8 +161,8 @@ in
''; '';
}; };
mode = mkOption { mode = mkOption {
type = str; type = listOf str;
default = "n"; default = [ "n" ];
description = '' description = ''
Mode to bind the key in. Mode to bind the key in.
''; '';

2
modules/programs/nvim/plugins/codeium-vim.lua
View File

@ -1,2 +0,0 @@
-- dont show ghost text
vim.g.codeium_render = false

6
modules/programs/nvim/plugins/coq-nvim.lua
View File

@ -1,6 +0,0 @@
vim.g.coq_settings = {
auto_start = "shut-up",
keymap = {
jump_to_mark = "<c-n>",
},
}

4
modules/programs/nvim/plugins/coq-thirdparty.lua
View File

@ -1,4 +0,0 @@
require("coq_3p")({
{ src = "orgmode", short_name = "ORG" },
{ src = "codeium", short_name = "COD" },
})

47
modules/programs/nvim/plugins/default.nix
View File

@ -74,6 +74,27 @@ with builtins;
{ plugin = nvim-web-devicons; } { plugin = nvim-web-devicons; }
]; ];
} }
{
plugin = nvim-cmp;
conf = readFile ./nvim-cmp.lua;
event = [ "InsertEnter" ];
dependencies = [
{ plugin = cmp-async-path; }
{ plugin = cmp-buffer; }
{ plugin = cmp-cmdline; }
{ plugin = cmp-nvim-lsp; }
{ plugin = cmp_luasnip; }
{
plugin = codeium-nvim;
conf = /* lua */ ''
require("codeium").setup({})
'';
}
{ plugin = friendly-snippets; }
{ plugin = lspkind-nvim; }
{ plugin = luasnip; }
];
}
{ {
plugin = todo-comments-nvim; plugin = todo-comments-nvim;
event = [ "BufReadPost" "BufNewFile" ]; event = [ "BufReadPost" "BufNewFile" ];
@ -103,10 +124,6 @@ with builtins;
''; '';
dependencies = [ dependencies = [
{ plugin = nvim-ts-context-commentstring; } { plugin = nvim-ts-context-commentstring; }
{
plugin = orgmode;
conf = readFile ./orgmode.lua;
}
]; ];
} }
{ {
@ -114,6 +131,7 @@ with builtins;
event = [ "BufRead" "BufNewFile" ]; event = [ "BufRead" "BufNewFile" ];
conf = readFile ./nvim-lspconfig.lua; conf = readFile ./nvim-lspconfig.lua;
dependencies = [ dependencies = [
{ plugin = lsp_signature-nvim; }
{ {
plugin = null-ls-nvim; plugin = null-ls-nvim;
conf = readFile ./null-ls-nvim.lua; conf = readFile ./null-ls-nvim.lua;
@ -148,6 +166,7 @@ with builtins;
} }
]; ];
} }
{ plugin = actions-preview-nvim; }
]; ];
} }
{ {
@ -240,26 +259,6 @@ with builtins;
plugin = markdown-preview-nvim; plugin = markdown-preview-nvim;
ft = [ "md" ]; ft = [ "md" ];
} }
{
plugin = coq_nvim;
event = [ "BufReadPost" "BufNewFile" ];
init = builtins.readFile ./coq-nvim.lua;
dependencies = [
{
plugin = coq-thirdparty;
conf = builtins.readFile ./coq-thirdparty.lua;
dependencies = [
{
plugin = codeium-vim;
init = builtins.readFile ./codeium-vim.lua;
}
];
}
{
plugin = coq-artifacts;
}
];
}
{ {
plugin = nvim-surround; plugin = nvim-surround;
event = [ "BufReadPost" "BufNewFile" ]; event = [ "BufReadPost" "BufNewFile" ];

79
modules/programs/nvim/plugins/nvim-cmp.lua Normal file
View File

@ -0,0 +1,79 @@
local cmp = require("cmp")
local luasnip = require("luasnip")
require("luasnip.loaders.from_vscode").lazy_load()
cmp.setup({
formatting = {
format = require("lspkind").cmp_format({
mode = "symbol", -- show only symbol annotations
maxwidth = 50, -- prevent the popup from showing more than provided characters
ellipsis_char = "...", -- when popup menu exceed maxwidth, the truncated part would show ellipsis_char instead
symbol_map = {
Codeium = "",
},
}),
},
snippet = {
-- REQUIRED - you must specify a snippet engine
expand = function(args)
require("luasnip").lsp_expand(args.body)
end,
},
mapping = cmp.mapping.preset.insert({
["<C-b>"] = cmp.mapping.scroll_docs(-4),
["<C-f>"] = cmp.mapping.scroll_docs(4),
["<C-Space>"] = cmp.mapping.complete(),
["<C-e>"] = cmp.mapping.abort(),
["<CR>"] = cmp.mapping.confirm({ select = true }),
["<Tab>"] = cmp.mapping(function(fallback)
if cmp.visible() then
cmp.select_next_item()
elseif luasnip.expand_or_jumpable() then
luasnip.expand_or_jump()
else
fallback()
end
end, { "i", "s" }),
["<S-Tab>"] = cmp.mapping(function(fallback)
if cmp.visible() then
cmp.select_prev_item()
elseif luasnip.jumpable(-1) then
luasnip.jump(-1)
else
fallback()
end
end, { "i", "s" }),
}),
sources = {
{ name = "async_path", priority = 1 },
{ name = "buffer", priority = 1 },
{ name = "luasnip", priority = 2 },
{ name = "codeium", priority = 3 },
{ name = "nvim_lsp", priority = 4 },
},
})
-- Set configuration for specific filetype.
cmp.setup.filetype("gitcommit", {
sources = cmp.config.sources({
{ name = "buffer" },
}),
})
-- Use buffer source for `/` and `?` (if you enabled `native_menu`, this won't work anymore).
cmp.setup.cmdline({ "/", "?" }, {
mapping = cmp.mapping.preset.cmdline(),
sources = {
{ name = "buffer" },
},
})
-- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore).
cmp.setup.cmdline(":", {
mapping = cmp.mapping.preset.cmdline(),
sources = cmp.config.sources({
{ name = "async_path" },
}, {
{ name = "cmdline" },
}),
})

22
modules/programs/nvim/plugins/nvim-lspconfig.lua
View File

@ -5,8 +5,9 @@ vim.diagnostic.config({
virtual_text = false, virtual_text = false,
}) })
local capabilities = vim.lsp.protocol.make_client_capabilities() -- The nvim-cmp almost supports LSP's capabilities so You should advertise it to LSP servers..
-- NOTE for nvim-ufo local capabilities = require("cmp_nvim_lsp").default_capabilities()
-- Tell the server the capability of foldingRange, -- Tell the server the capability of foldingRange,
-- Neovim hasn't added foldingRange to default capabilities, users must add it manually -- Neovim hasn't added foldingRange to default capabilities, users must add it manually
capabilities.textDocument.foldingRange = { capabilities.textDocument.foldingRange = {
@ -34,7 +35,7 @@ local on_attach_def = function(client, bufnr)
l = { l = {
name = "lsp", name = "lsp",
d = { vim.diagnostic.open_float, "Open diagnostic window" }, d = { vim.diagnostic.open_float, "Open diagnostic window" },
c = { vim.lsp.buf.code_action, "Code action" }, c = { require("actions-preview").code_actions, "Code action", mode = { "v", "n" } },
r = { r = {
function() function()
return ":IncRename " .. vim.fn.expand("<cword>") return ":IncRename " .. vim.fn.expand("<cword>")
@ -95,11 +96,21 @@ local on_attach_def = function(client, bufnr)
vim.lsp.inlay_hint(bufnr, true) vim.lsp.inlay_hint(bufnr, true)
end, timeout) end, timeout)
end end
require("lsp_signature").on_attach({
bind = true, -- This is mandatory, otherwise border config won't get registered.
handler_opts = {
border = "rounded",
},
}, bufnr)
end end
local lspconfig_default_options = { local lspconfig_default_options = {
on_attach = on_attach_def, on_attach = on_attach_def,
capabilities = capabilities, capabilities = capabilities,
flags = {
debounce_text_changes = 100,
},
} }
---function to add default options to lspconfig ---function to add default options to lspconfig
@ -107,9 +118,8 @@ local lspconfig_default_options = {
---@param options table ---@param options table
---@return nil ---@return nil
local function lspconfig_setup(lsp, options) local function lspconfig_setup(lsp, options)
local coq_options = require("coq").lsp_ensure_capabilities({}) local final_options = vim.tbl_deep_extend("force", lspconfig_default_options, options)
local merged_options = vim.tbl_deep_extend("force", coq_options, lspconfig_default_options, options) lspconfig[lsp].setup(final_options)
lspconfig[lsp].setup(merged_options)
end end
local servers = { local servers = {

5
modules/programs/nvim/plugins/nvim-treesitter.lua
View File

@ -1,13 +1,8 @@
-- Load custom treesitter grammar for org filetype
require("orgmode").setup_ts_grammar()
require("nvim-treesitter.configs").setup({ require("nvim-treesitter.configs").setup({
sync_install = false, sync_install = false,
auto_install = false, auto_install = false,
highlight = { highlight = {
enable = true, enable = true,
-- Required for spellcheck, some LaTex highlights and
-- code block highlights that do not have ts grammar
additional_vim_regex_highlighting = { "org" },
}, },
context_commentstring = { context_commentstring = {
enable = true, enable = true,

4
modules/programs/nvim/plugins/orgmode.lua
View File

@ -1,4 +0,0 @@
require("orgmode").setup({
org_agenda_files = { "~/Notes/org" },
org_default_notes_file = "~/Notes/org/refile.org",
})

10
modules/programs/nvim/plugins/which-key-nvim.lua
View File

@ -34,11 +34,17 @@ require("which-key").register({
["<tab>"] = { ["<tab>"] = {
name = "tab", name = "tab",
["<tab>"] = { "<cmd>tabnew<cr>", "New tab" }, ["<tab>"] = { "<cmd>tabnew<cr>", "New tab" },
n = { "<cmd>tabnext<cr>", "Next tab" },
p = { "<cmd>tabprevious<cr>", "Previous tab" },
d = { "<cmd>tabclose<cr>", "Close tab" }, d = { "<cmd>tabclose<cr>", "Close tab" },
}, },
}, { prefix = "<leader>" }) }, { prefix = "<leader>" })
require("which-key").register({
["["] = {
t = { "<cmd>tabprevious<cr>", "Previous tab" },
},
["]"] = {
t = { "<cmd>tabnext<cr>", "Next tab" },
},
})
-- file -- file
require("which-key").register({ require("which-key").register({

22
overlays/vimPlugins.nix
View File

@ -4,11 +4,7 @@ _: prev:
with lib.my; with lib.my;
{ {
vimPlugins = prev.vimPlugins // { vimPlugins = prev.vimPlugins // {
nvim-treesitter-textsubjects = prev.vimUtils.buildVimPluginFrom2Nix { inherit (inputs.codeium-nvim.packages.${prev.system}.vimPlugins) codeium-nvim;
pname = "nvim-treesitter-textsubjects";
version = mkVersionInput inputs.nvim-treesitter-textsubjects;
src = inputs.nvim-treesitter-textsubjects;
};
smartcolumn-nvim = prev.vimUtils.buildVimPluginFrom2Nix { smartcolumn-nvim = prev.vimUtils.buildVimPluginFrom2Nix {
pname = "smartcolumn-nvim"; pname = "smartcolumn-nvim";
@ -27,5 +23,21 @@ with lib.my;
version = mkVersionInput inputs.hmts-nvim; version = mkVersionInput inputs.hmts-nvim;
src = inputs.hmts-nvim; src = inputs.hmts-nvim;
}; };
actions-preview-nvim = prev.vimUtils.buildVimPluginFrom2Nix {
pname = "actions-preview-nvim";
version = mkVersionInput inputs.actions-preview-nvim;
src = inputs.actions-preview-nvim;
};
telescope-nvim = prev.vimPlugins.telescope-nvim.overrideAttrs (_: {
version = mkVersionInput inputs.telescope-nvim;
src = inputs.telescope-nvim;
});
nvim-treesitter = prev.vimPlugins.nvim-treesitter.overrideAttrs (_: {
version = mkVersionInput inputs.nvim-treesitter;
src = inputs.nvim-treesitter;
});
}; };
} }