aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.lock107
-rw-r--r--flake.nix4
-rw-r--r--home.nix2
-rw-r--r--hosts/olive/configuration.nix1
-rw-r--r--programs/default.nix1
-rw-r--r--programs/neovim.nix3
-rw-r--r--scripts/webcam.nix5
-rw-r--r--services/dunst.nix1
8 files changed, 99 insertions, 25 deletions
diff --git a/flake.lock b/flake.lock
index 83e07d2..2eecc91 100644
--- a/flake.lock
+++ b/flake.lock
@@ -38,11 +38,11 @@
38 ] 38 ]
39 }, 39 },
40 "locked": { 40 "locked": {
41 "lastModified": 1631573611, 41 "lastModified": 1634544068,
42 "narHash": "sha256-u2E/wstadWNcn6vOIoK1xY86QPOzzBZQfT1FbePfdaI=", 42 "narHash": "sha256-RlRQBaAHfdWqfRyHdWuDPMkplBTYwuyDQqDcNbP/Sog=",
43 "owner": "nix-community", 43 "owner": "nix-community",
44 "repo": "home-manager", 44 "repo": "home-manager",
45 "rev": "7d9ba15214004c979d2c8733f8be12ce6502cf8a", 45 "rev": "ff2bed9dac84fb202bbb3c49fdcfe30c29d0b12f",
46 "type": "github" 46 "type": "github"
47 }, 47 },
48 "original": { 48 "original": {
@@ -52,6 +52,37 @@
52 "type": "github" 52 "type": "github"
53 } 53 }
54 }, 54 },
55 "import-cargo": {
56 "locked": {
57 "lastModified": 1594305518,
58 "narHash": "sha256-frtArgN42rSaEcEOYWg8sVPMUK+Zgch3c+wejcpX3DY=",
59 "owner": "edolstra",
60 "repo": "import-cargo",
61 "rev": "25d40be4a73d40a2572e0cc233b83253554f06c5",
62 "type": "github"
63 },
64 "original": {
65 "owner": "edolstra",
66 "repo": "import-cargo",
67 "type": "github"
68 }
69 },
70 "mozillapkgs": {
71 "flake": false,
72 "locked": {
73 "lastModified": 1629225446,
74 "narHash": "sha256-HJX4Pc5ZUAg4apxB/XHuJ+6ukzvRQqeZMjscOBst2bA=",
75 "owner": "mozilla",
76 "repo": "nixpkgs-mozilla",
77 "rev": "0510159186dd2ef46e5464484fbdf119393afa58",
78 "type": "github"
79 },
80 "original": {
81 "owner": "mozilla",
82 "repo": "nixpkgs-mozilla",
83 "type": "github"
84 }
85 },
55 "neovim": { 86 "neovim": {
56 "inputs": { 87 "inputs": {
57 "flake-compat": "flake-compat", 88 "flake-compat": "flake-compat",
@@ -59,11 +90,11 @@
59 "nixpkgs": "nixpkgs" 90 "nixpkgs": "nixpkgs"
60 }, 91 },
61 "locked": { 92 "locked": {
62 "lastModified": 1632643930, 93 "lastModified": 1635322515,
63 "narHash": "sha256-7MGPPBLI/E8D+wLBBA+9AmZQ6O2JqMuCR9SDIEHHm7g=", 94 "narHash": "sha256-PdD6Q+Fo+0uahqj5uYDZ2T8s647W1WDx6HgQ5LDDp5Q=",
64 "owner": "nix-community", 95 "owner": "nix-community",
65 "repo": "neovim-nightly-overlay", 96 "repo": "neovim-nightly-overlay",
66 "rev": "2abb3014b87c0b63bb30be4e199c7bf280d05807", 97 "rev": "fe10413485850c15c53744644721fd0c8a351d70",
67 "type": "github" 98 "type": "github"
68 }, 99 },
69 "original": { 100 "original": {
@@ -82,11 +113,11 @@
82 }, 113 },
83 "locked": { 114 "locked": {
84 "dir": "contrib", 115 "dir": "contrib",
85 "lastModified": 1632620331, 116 "lastModified": 1635277393,
86 "narHash": "sha256-6KqtlHdteNmeaPez9egvYebcytvT7PcGkIQ2giSNOEQ=", 117 "narHash": "sha256-pFFB7267CdwMXK/rrWpmLFYzA3e7+2AD8MAh2EX1+PI=",
87 "owner": "neovim", 118 "owner": "neovim",
88 "repo": "neovim", 119 "repo": "neovim",
89 "rev": "b3b02eb52943fdc8ba74af3b485e9d11655bc9c9", 120 "rev": "a5d6f36fc7e67aa008b4ae8a72b1367a765660b8",
90 "type": "github" 121 "type": "github"
91 }, 122 },
92 "original": { 123 "original": {
@@ -98,11 +129,11 @@
98 }, 129 },
99 "nixos-hardware": { 130 "nixos-hardware": {
100 "locked": { 131 "locked": {
101 "lastModified": 1632267580, 132 "lastModified": 1635319124,
102 "narHash": "sha256-AvNXdmaPHYs6idbfgu1H40vEw4Wq15xLAgCnpCN1l1A=", 133 "narHash": "sha256-Ldh40imhLYF8kGy9wSI2NWW6qiB/9lJ0C6CT2Yr1L6E=",
103 "owner": "nixos", 134 "owner": "nixos",
104 "repo": "nixos-hardware", 135 "repo": "nixos-hardware",
105 "rev": "3cc8c47af31798040ea62499090540413279f832", 136 "rev": "0bb7b0906c353703c2eea36bd73134f0216f3e62",
106 "type": "github" 137 "type": "github"
107 }, 138 },
108 "original": { 139 "original": {
@@ -113,11 +144,11 @@
113 }, 144 },
114 "nixpkgs": { 145 "nixpkgs": {
115 "locked": { 146 "locked": {
116 "lastModified": 1632411313, 147 "lastModified": 1634782485,
117 "narHash": "sha256-lekODc44lVo9/0EwGiX6LoEt2KhiPdcfNopealMJ7n4=", 148 "narHash": "sha256-psfh4OQSokGXG0lpq3zKFbhOo3QfoeudRcaUnwMRkQo=",
118 "owner": "nixos", 149 "owner": "nixos",
119 "repo": "nixpkgs", 150 "repo": "nixpkgs",
120 "rev": "51bcdc4cdaac48535dabf0ad4642a66774c609ed", 151 "rev": "34ad3ffe08adfca17fcb4e4a47bb5f3b113687be",
121 "type": "github" 152 "type": "github"
122 }, 153 },
123 "original": { 154 "original": {
@@ -129,11 +160,11 @@
129 }, 160 },
130 "nixpkgs_2": { 161 "nixpkgs_2": {
131 "locked": { 162 "locked": {
132 "lastModified": 1632639184, 163 "lastModified": 1635280654,
133 "narHash": "sha256-fRLxre+gPxIkjFVj17O68pyAWU1cxT20XFOiulIWzRw=", 164 "narHash": "sha256-n0DKD1rG4gLZx6vDnalrQ5obZA9Y7uaOShTDSaOWGhM=",
134 "owner": "NixOS", 165 "owner": "NixOS",
135 "repo": "nixpkgs", 166 "repo": "nixpkgs",
136 "rev": "fd8a7fd07da0f3fc0e27575891f45c2f88e5dd44", 167 "rev": "5ebb1dca9bb056649cbd023f953c0c4e7970bb72",
137 "type": "github" 168 "type": "github"
138 }, 169 },
139 "original": { 170 "original": {
@@ -143,12 +174,50 @@
143 "type": "github" 174 "type": "github"
144 } 175 }
145 }, 176 },
177 "nixpkgs_3": {
178 "locked": {
179 "lastModified": 1633422745,
180 "narHash": "sha256-gA6Ok64nPbkjHk3Oanq4641EeYkjcKhisDF9wBjLxEk=",
181 "owner": "nixos",
182 "repo": "nixpkgs",
183 "rev": "8e1eab9eae4278c9bb1dcae426848a581943db5a",
184 "type": "github"
185 },
186 "original": {
187 "owner": "nixos",
188 "ref": "nixpkgs-unstable",
189 "repo": "nixpkgs",
190 "type": "github"
191 }
192 },
146 "root": { 193 "root": {
147 "inputs": { 194 "inputs": {
148 "home-manager": "home-manager", 195 "home-manager": "home-manager",
149 "neovim": "neovim", 196 "neovim": "neovim",
150 "nixos-hardware": "nixos-hardware", 197 "nixos-hardware": "nixos-hardware",
151 "nixpkgs": "nixpkgs_2" 198 "nixpkgs": "nixpkgs_2",
199 "statix": "statix"
200 }
201 },
202 "statix": {
203 "inputs": {
204 "import-cargo": "import-cargo",
205 "mozillapkgs": "mozillapkgs",
206 "nixpkgs": "nixpkgs_3"
207 },
208 "locked": {
209 "lastModified": 1635334468,
210 "narHash": "sha256-75TMc5K/lhnUuejvtFMJjnNHU9gElZG1+YIV765terM=",
211 "owner": "nerdypepper",
212 "repo": "statix",
213 "rev": "463577d2375df83854ae2dbe3359808c011a773a",
214 "type": "github"
215 },
216 "original": {
217 "owner": "nerdypepper",
218 "ref": "vim-plugin",
219 "repo": "statix",
220 "type": "github"
152 } 221 }
153 } 222 }
154 }, 223 },
diff --git a/flake.nix b/flake.nix
index 330ca03..b454cc9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -9,6 +9,7 @@
9 inputs.nixpkgs.follows = "nixpkgs"; 9 inputs.nixpkgs.follows = "nixpkgs";
10 }; 10 };
11 neovim.url = "github:nix-community/neovim-nightly-overlay"; 11 neovim.url = "github:nix-community/neovim-nightly-overlay";
12 statix.url = "github:nerdypepper/statix";
12 }; 13 };
13 14
14 outputs = 15 outputs =
@@ -17,11 +18,13 @@
17 , nixos-hardware 18 , nixos-hardware
18 , home-manager 19 , home-manager
19 , neovim 20 , neovim
21 , statix
20 , ... 22 , ...
21 } @ inputs: { 23 } @ inputs: {
22 24
23 overlays = { 25 overlays = {
24 nvim-nightly = neovim.overlay; 26 nvim-nightly = neovim.overlay;
27 statix = statix.overlay;
25 }; 28 };
26 29
27 nixosConfigurations = { 30 nixosConfigurations = {
@@ -46,7 +49,6 @@
46 ]; 49 ];
47 }; 50 };
48 }; 51 };
49
50 }; 52 };
51 53
52} 54}
diff --git a/home.nix b/home.nix
index 3e52d11..11b5eb7 100644
--- a/home.nix
+++ b/home.nix
@@ -1,6 +1,7 @@
1{ config 1{ config
2, pkgs 2, pkgs
3, theme 3, theme
4, self
4, ... 5, ...
5}: 6}:
6 7
@@ -62,6 +63,7 @@
62 nixpkgs-review 63 nixpkgs-review
63 nixpkgs-fmt 64 nixpkgs-fmt
64 nix-prefetch-scripts 65 nix-prefetch-scripts
66 statix
65 67
66 ] ++ (import ./scripts { inherit pkgs; }); 68 ] ++ (import ./scripts { inherit pkgs; });
67 69
diff --git a/hosts/olive/configuration.nix b/hosts/olive/configuration.nix
index 3c15f74..f36bc3f 100644
--- a/hosts/olive/configuration.nix
+++ b/hosts/olive/configuration.nix
@@ -65,6 +65,7 @@
65 65
66 nixpkgs.overlays = with self.overlays; [ 66 nixpkgs.overlays = with self.overlays; [
67 nvim-nightly 67 nvim-nightly
68 statix
68 ]; 69 ];
69 70
70 environment.systemPackages = with pkgs; [ 71 environment.systemPackages = with pkgs; [
diff --git a/programs/default.nix b/programs/default.nix
index 8efcdf9..74a6ad2 100644
--- a/programs/default.nix
+++ b/programs/default.nix
@@ -1,6 +1,7 @@
1{ config 1{ config
2, pkgs 2, pkgs
3, theme 3, theme
4, self
4, ... 5, ...
5}: 6}:
6 7
diff --git a/programs/neovim.nix b/programs/neovim.nix
index e163d48..40f3998 100644
--- a/programs/neovim.nix
+++ b/programs/neovim.nix
@@ -1,5 +1,6 @@
1{ config 1{ config
2, pkgs 2, pkgs
3, self
3, ... 4, ...
4}: 5}:
5 6
@@ -23,6 +24,8 @@
23 (nvim-treesitter.withPlugins (_: pkgs.tree-sitter.allGrammars)) 24 (nvim-treesitter.withPlugins (_: pkgs.tree-sitter.allGrammars))
24 completion-nvim 25 completion-nvim
25 26
27 pkgs.statix-vim
28
26 # tpope 29 # tpope
27 vim-surround 30 vim-surround
28 vim-unimpaired 31 vim-unimpaired
diff --git a/scripts/webcam.nix b/scripts/webcam.nix
deleted file mode 100644
index 0658dab..0000000
--- a/scripts/webcam.nix
+++ /dev/null
@@ -1,5 +0,0 @@
1#! /usr/bin/env bash
2
3mpv av://v4l2:/dev/video0 \
4 --profile=low-latency \
5 --untimed \
diff --git a/services/dunst.nix b/services/dunst.nix
index 8882ade..41cbc2a 100644
--- a/services/dunst.nix
+++ b/services/dunst.nix
@@ -28,6 +28,7 @@ with theme;
28 follow = "mouse"; 28 follow = "mouse";
29 sticky_history = "yes"; 29 sticky_history = "yes";
30 history_length = "20"; 30 history_length = "20";
31 icon_folders = "/usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/";
31 show_indicators = "yes"; 32 show_indicators = "yes";
32 line_height = "0"; 33 line_height = "0";
33 separator_height = "0"; 34 separator_height = "0";