aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.lock78
-rw-r--r--programs/neovim.nix3
-rw-r--r--x/2bwm.nix4
3 files changed, 44 insertions, 41 deletions
diff --git a/flake.lock b/flake.lock
index df6b66f..f38f7a5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -6,11 +6,11 @@
6 "rust-analyzer-src": "rust-analyzer-src" 6 "rust-analyzer-src": "rust-analyzer-src"
7 }, 7 },
8 "locked": { 8 "locked": {
9 "lastModified": 1638080655, 9 "lastModified": 1642141613,
10 "narHash": "sha256-ZPx8e8CukEBx31IcgivAWnN9Jg0r+LTBPHV7fREf+QI=", 10 "narHash": "sha256-WFS7T5oOLD8anu/77iz7EPz7zQsJZtP5qVa5485k3dI=",
11 "owner": "nix-community", 11 "owner": "nix-community",
12 "repo": "fenix", 12 "repo": "fenix",
13 "rev": "78a0c55b6f9d8bb6f3b89eb995fa5bbdd73e9475", 13 "rev": "d75ffc9f1d3b60bb597e48ae01f486a6de27d30e",
14 "type": "github" 14 "type": "github"
15 }, 15 },
16 "original": { 16 "original": {
@@ -22,11 +22,11 @@
22 "flake-compat": { 22 "flake-compat": {
23 "flake": false, 23 "flake": false,
24 "locked": { 24 "locked": {
25 "lastModified": 1627913399, 25 "lastModified": 1641205782,
26 "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=", 26 "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=",
27 "owner": "edolstra", 27 "owner": "edolstra",
28 "repo": "flake-compat", 28 "repo": "flake-compat",
29 "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2", 29 "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7",
30 "type": "github" 30 "type": "github"
31 }, 31 },
32 "original": { 32 "original": {
@@ -96,11 +96,11 @@
96 "nixpkgs": "nixpkgs_2" 96 "nixpkgs": "nixpkgs_2"
97 }, 97 },
98 "locked": { 98 "locked": {
99 "lastModified": 1639901638, 99 "lastModified": 1642320861,
100 "narHash": "sha256-ZMP2xjjo3tHlWfgCd3Odn6qKNpNbvbawjcVpww54A1U=", 100 "narHash": "sha256-gj68dBwDH0LjeBnt+03nbYiCwz97l7Ouz8/Ghbry4aY=",
101 "owner": "nix-community", 101 "owner": "nix-community",
102 "repo": "neovim-nightly-overlay", 102 "repo": "neovim-nightly-overlay",
103 "rev": "8f7a0bbc9080f55c000344658a071994aa9c6b4b", 103 "rev": "41934fe7e0c6b2b338f6e3bcd6b756638b556319",
104 "type": "github" 104 "type": "github"
105 }, 105 },
106 "original": { 106 "original": {
@@ -116,11 +116,11 @@
116 }, 116 },
117 "locked": { 117 "locked": {
118 "dir": "contrib", 118 "dir": "contrib",
119 "lastModified": 1639886342, 119 "lastModified": 1642316915,
120 "narHash": "sha256-OkI09enAc4ID1zrxLkHR5b+WgUL2r2C9BIG4+gwVDFU=", 120 "narHash": "sha256-6afFNKsYHSOAupMUmFKKZ9l1YD2pAGKVoZZfJHzUia4=",
121 "owner": "neovim", 121 "owner": "neovim",
122 "repo": "neovim", 122 "repo": "neovim",
123 "rev": "abdf3a8128b78fb98ee944bc5d3086c680d779ed", 123 "rev": "7085e5b0c8588618e643c87802afc515f67812d9",
124 "type": "github" 124 "type": "github"
125 }, 125 },
126 "original": { 126 "original": {
@@ -132,11 +132,11 @@
132 }, 132 },
133 "nixos-hardware": { 133 "nixos-hardware": {
134 "locked": { 134 "locked": {
135 "lastModified": 1639240632, 135 "lastModified": 1641965797,
136 "narHash": "sha256-BAXhgnPOW1COIfZ9EOOFTdolalYS73MFHSRajgrSdZw=", 136 "narHash": "sha256-AfxfIzAZbt9aAzpVBn0Bwhd/M4Wix7G91kEjm9H6FPo=",
137 "owner": "nixos", 137 "owner": "nixos",
138 "repo": "nixos-hardware", 138 "repo": "nixos-hardware",
139 "rev": "2a7063461c3751d83869a2a0a8ebc59e34bec5b2", 139 "rev": "87a35a0d58f546dc23f37b4f6af575d0e4be6a7a",
140 "type": "github" 140 "type": "github"
141 }, 141 },
142 "original": { 142 "original": {
@@ -147,11 +147,11 @@
147 }, 147 },
148 "nixpkgs": { 148 "nixpkgs": {
149 "locked": { 149 "locked": {
150 "lastModified": 1640319671, 150 "lastModified": 1642104392,
151 "narHash": "sha256-ZkKmakwaOaLiZOpIZWbeJZwap5CzJ30s4UJTfydYIYc=", 151 "narHash": "sha256-m71b7MgMh9FDv4MnI5sg9MiBVW6DhE1zq+d/KlLWSC8=",
152 "owner": "nixos", 152 "owner": "nixos",
153 "repo": "nixpkgs", 153 "repo": "nixpkgs",
154 "rev": "eac07edbd20ed4908b98790ba299250b5527ecdf", 154 "rev": "5aaed40d22f0d9376330b6fa413223435ad6fee5",
155 "type": "github" 155 "type": "github"
156 }, 156 },
157 "original": { 157 "original": {
@@ -163,11 +163,11 @@
163 }, 163 },
164 "nixpkgs_2": { 164 "nixpkgs_2": {
165 "locked": { 165 "locked": {
166 "lastModified": 1639699734, 166 "lastModified": 1642104392,
167 "narHash": "sha256-tlX6WebGmiHb2Hmniff+ltYp+7dRfdsBxw9YczLsP60=", 167 "narHash": "sha256-m71b7MgMh9FDv4MnI5sg9MiBVW6DhE1zq+d/KlLWSC8=",
168 "owner": "nixos", 168 "owner": "nixos",
169 "repo": "nixpkgs", 169 "repo": "nixpkgs",
170 "rev": "03ec468b14067729a285c2c7cfa7b9434a04816c", 170 "rev": "5aaed40d22f0d9376330b6fa413223435ad6fee5",
171 "type": "github" 171 "type": "github"
172 }, 172 },
173 "original": { 173 "original": {
@@ -179,11 +179,11 @@
179 }, 179 },
180 "nixpkgs_3": { 180 "nixpkgs_3": {
181 "locked": { 181 "locked": {
182 "lastModified": 1640443850, 182 "lastModified": 1642190797,
183 "narHash": "sha256-s3EhD+iNjyIE/gZkV5vES6d0eI4dJ2WBlaXyUsEmaek=", 183 "narHash": "sha256-cxeEEAtfIACnm8sV1oz0xlNp9IVk10Fxcc09ggoEZuo=",
184 "owner": "NixOS", 184 "owner": "NixOS",
185 "repo": "nixpkgs", 185 "repo": "nixpkgs",
186 "rev": "6979c0e49bb491e18dd4870abb104cc7375aa7e8", 186 "rev": "3ddd960a3b575bf3230d0e59f42614b71f9e0db9",
187 "type": "github" 187 "type": "github"
188 }, 188 },
189 "original": { 189 "original": {
@@ -195,11 +195,11 @@
195 }, 195 },
196 "nixpkgs_4": { 196 "nixpkgs_4": {
197 "locked": { 197 "locked": {
198 "lastModified": 1640319671, 198 "lastModified": 1642104392,
199 "narHash": "sha256-ZkKmakwaOaLiZOpIZWbeJZwap5CzJ30s4UJTfydYIYc=", 199 "narHash": "sha256-m71b7MgMh9FDv4MnI5sg9MiBVW6DhE1zq+d/KlLWSC8=",
200 "owner": "nixos", 200 "owner": "nixos",
201 "repo": "nixpkgs", 201 "repo": "nixpkgs",
202 "rev": "eac07edbd20ed4908b98790ba299250b5527ecdf", 202 "rev": "5aaed40d22f0d9376330b6fa413223435ad6fee5",
203 "type": "github" 203 "type": "github"
204 }, 204 },
205 "original": { 205 "original": {
@@ -211,11 +211,11 @@
211 }, 211 },
212 "nixpkgs_5": { 212 "nixpkgs_5": {
213 "locked": { 213 "locked": {
214 "lastModified": 1640418986, 214 "lastModified": 1642069818,
215 "narHash": "sha256-a8GGtxn2iL3WAkY5H+4E0s3Q7XJt6bTOvos9qqxT5OQ=", 215 "narHash": "sha256-666w6j8wl/bojfgpp0k58/UJ5rbrdYFbI2RFT2BXbSQ=",
216 "owner": "NixOS", 216 "owner": "NixOS",
217 "repo": "nixpkgs", 217 "repo": "nixpkgs",
218 "rev": "5c37ad87222cfc1ec36d6cd1364514a9efc2f7f2", 218 "rev": "46821ea01c8f54d2a20f5a503809abfc605269d7",
219 "type": "github" 219 "type": "github"
220 }, 220 },
221 "original": { 221 "original": {
@@ -225,11 +225,11 @@
225 }, 225 },
226 "nixpkgs_6": { 226 "nixpkgs_6": {
227 "locked": { 227 "locked": {
228 "lastModified": 1638036523, 228 "lastModified": 1642069818,
229 "narHash": "sha256-ZL6gogsuBmhBvIro+YwRKrypYhwVPCOOO7FmhOV/xyE=", 229 "narHash": "sha256-666w6j8wl/bojfgpp0k58/UJ5rbrdYFbI2RFT2BXbSQ=",
230 "owner": "nixos", 230 "owner": "nixos",
231 "repo": "nixpkgs", 231 "repo": "nixpkgs",
232 "rev": "9c191ebcdfe917043195c54ab6ae8e934434fe7b", 232 "rev": "46821ea01c8f54d2a20f5a503809abfc605269d7",
233 "type": "github" 233 "type": "github"
234 }, 234 },
235 "original": { 235 "original": {
@@ -251,11 +251,11 @@
251 "rust-analyzer-src": { 251 "rust-analyzer-src": {
252 "flake": false, 252 "flake": false,
253 "locked": { 253 "locked": {
254 "lastModified": 1638036899, 254 "lastModified": 1642101527,
255 "narHash": "sha256-vh7z8jupVxXPOko3sWUsOB7eji/7lKfwJ/CE3iw97Sw=", 255 "narHash": "sha256-C4zcaWULWlrirpEt/pA85CCMBt+7SWZweMaMJ7EvrXw=",
256 "owner": "rust-analyzer", 256 "owner": "rust-analyzer",
257 "repo": "rust-analyzer", 257 "repo": "rust-analyzer",
258 "rev": "d9b2291f546abc77d24499339a72a89127464b95", 258 "rev": "b4c31481a554d0132003228ba319bd9476fe85ae",
259 "type": "github" 259 "type": "github"
260 }, 260 },
261 "original": { 261 "original": {
@@ -272,11 +272,11 @@
272 "nixpkgs": "nixpkgs_6" 272 "nixpkgs": "nixpkgs_6"
273 }, 273 },
274 "locked": { 274 "locked": {
275 "lastModified": 1639455627, 275 "lastModified": 1642238855,
276 "narHash": "sha256-vqGwh1AndJAG4lpHtRhfkvu+yAoo0Qxym0c6Imr7StA=", 276 "narHash": "sha256-K+J3KeUnjoqMpL67sX7pQodCCCDTrfXSrd8sn/TnZEw=",
277 "owner": "nerdypepper", 277 "owner": "nerdypepper",
278 "repo": "statix", 278 "repo": "statix",
279 "rev": "94a2edf57340ac3f3a2276c88a221ba3125172af", 279 "rev": "23892b034d710bfbfa1f82c48fbfecb68f791f13",
280 "type": "github" 280 "type": "github"
281 }, 281 },
282 "original": { 282 "original": {
diff --git a/programs/neovim.nix b/programs/neovim.nix
index fc3cc85..f108993 100644
--- a/programs/neovim.nix
+++ b/programs/neovim.nix
@@ -24,6 +24,9 @@
24 (nvim-treesitter.withPlugins (_: pkgs.tree-sitter.allGrammars)) 24 (nvim-treesitter.withPlugins (_: pkgs.tree-sitter.allGrammars))
25 nvim-cmp 25 nvim-cmp
26 26
27 # tree-sitter dev
28 playground
29
27 # completion sources 30 # completion sources
28 cmp-nvim-lsp 31 cmp-nvim-lsp
29 cmp-buffer 32 cmp-buffer
diff --git a/x/2bwm.nix b/x/2bwm.nix
index 76c2a52..af66b7a 100644
--- a/x/2bwm.nix
+++ b/x/2bwm.nix
@@ -7,8 +7,8 @@
7with theme; 7with theme;
8{ 8{
9 xresources.properties = { 9 xresources.properties = {
10 "twobwm.border_width" = 8; 10 "twobwm.border_width" = 12;
11 "twobwm.outer_border" = 2; 11 "twobwm.outer_border" = 10;
12 "twobwm.focus_color" = base01; 12 "twobwm.focus_color" = base01;
13 "twobwm.unfocus_color" = base01; 13 "twobwm.unfocus_color" = base01;
14 "twobwm.fixed_color" = base0D; 14 "twobwm.fixed_color" = base0D;