aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.lock71
-rw-r--r--home.nix1
-rw-r--r--hosts/olive/configuration.nix20
-rw-r--r--programs/default.nix1
-rw-r--r--programs/fzf.nix2
-rw-r--r--programs/readline.nix2
-rw-r--r--services/dunst.nix8
-rw-r--r--x/default.nix1
-rw-r--r--x/rofi.nix30
9 files changed, 73 insertions, 63 deletions
diff --git a/flake.lock b/flake.lock
index 300d0af..df6b66f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,10 +2,7 @@
2 "nodes": { 2 "nodes": {
3 "fenix": { 3 "fenix": {
4 "inputs": { 4 "inputs": {
5 "nixpkgs": [ 5 "nixpkgs": "nixpkgs_4",
6 "statix",
7 "nixpkgs"
8 ],
9 "rust-analyzer-src": "rust-analyzer-src" 6 "rust-analyzer-src": "rust-analyzer-src"
10 }, 7 },
11 "locked": { 8 "locked": {
@@ -55,10 +52,7 @@
55 }, 52 },
56 "gitignore": { 53 "gitignore": {
57 "inputs": { 54 "inputs": {
58 "nixpkgs": [ 55 "nixpkgs": "nixpkgs_5"
59 "statix",
60 "nixpkgs"
61 ]
62 }, 56 },
63 "locked": { 57 "locked": {
64 "lastModified": 1635165013, 58 "lastModified": 1635165013,
@@ -99,7 +93,7 @@
99 "inputs": { 93 "inputs": {
100 "flake-compat": "flake-compat", 94 "flake-compat": "flake-compat",
101 "neovim-flake": "neovim-flake", 95 "neovim-flake": "neovim-flake",
102 "nixpkgs": "nixpkgs" 96 "nixpkgs": "nixpkgs_2"
103 }, 97 },
104 "locked": { 98 "locked": {
105 "lastModified": 1639901638, 99 "lastModified": 1639901638,
@@ -118,10 +112,7 @@
118 "neovim-flake": { 112 "neovim-flake": {
119 "inputs": { 113 "inputs": {
120 "flake-utils": "flake-utils", 114 "flake-utils": "flake-utils",
121 "nixpkgs": [ 115 "nixpkgs": "nixpkgs"
122 "neovim",
123 "nixpkgs"
124 ]
125 }, 116 },
126 "locked": { 117 "locked": {
127 "dir": "contrib", 118 "dir": "contrib",
@@ -156,6 +147,22 @@
156 }, 147 },
157 "nixpkgs": { 148 "nixpkgs": {
158 "locked": { 149 "locked": {
150 "lastModified": 1640319671,
151 "narHash": "sha256-ZkKmakwaOaLiZOpIZWbeJZwap5CzJ30s4UJTfydYIYc=",
152 "owner": "nixos",
153 "repo": "nixpkgs",
154 "rev": "eac07edbd20ed4908b98790ba299250b5527ecdf",
155 "type": "github"
156 },
157 "original": {
158 "owner": "nixos",
159 "ref": "nixos-unstable",
160 "repo": "nixpkgs",
161 "type": "github"
162 }
163 },
164 "nixpkgs_2": {
165 "locked": {
159 "lastModified": 1639699734, 166 "lastModified": 1639699734,
160 "narHash": "sha256-tlX6WebGmiHb2Hmniff+ltYp+7dRfdsBxw9YczLsP60=", 167 "narHash": "sha256-tlX6WebGmiHb2Hmniff+ltYp+7dRfdsBxw9YczLsP60=",
161 "owner": "nixos", 168 "owner": "nixos",
@@ -170,7 +177,7 @@
170 "type": "github" 177 "type": "github"
171 } 178 }
172 }, 179 },
173 "nixpkgs_2": { 180 "nixpkgs_3": {
174 "locked": { 181 "locked": {
175 "lastModified": 1640443850, 182 "lastModified": 1640443850,
176 "narHash": "sha256-s3EhD+iNjyIE/gZkV5vES6d0eI4dJ2WBlaXyUsEmaek=", 183 "narHash": "sha256-s3EhD+iNjyIE/gZkV5vES6d0eI4dJ2WBlaXyUsEmaek=",
@@ -186,7 +193,37 @@
186 "type": "github" 193 "type": "github"
187 } 194 }
188 }, 195 },
189 "nixpkgs_3": { 196 "nixpkgs_4": {
197 "locked": {
198 "lastModified": 1640319671,
199 "narHash": "sha256-ZkKmakwaOaLiZOpIZWbeJZwap5CzJ30s4UJTfydYIYc=",
200 "owner": "nixos",
201 "repo": "nixpkgs",
202 "rev": "eac07edbd20ed4908b98790ba299250b5527ecdf",
203 "type": "github"
204 },
205 "original": {
206 "owner": "nixos",
207 "ref": "nixos-unstable",
208 "repo": "nixpkgs",
209 "type": "github"
210 }
211 },
212 "nixpkgs_5": {
213 "locked": {
214 "lastModified": 1640418986,
215 "narHash": "sha256-a8GGtxn2iL3WAkY5H+4E0s3Q7XJt6bTOvos9qqxT5OQ=",
216 "owner": "NixOS",
217 "repo": "nixpkgs",
218 "rev": "5c37ad87222cfc1ec36d6cd1364514a9efc2f7f2",
219 "type": "github"
220 },
221 "original": {
222 "id": "nixpkgs",
223 "type": "indirect"
224 }
225 },
226 "nixpkgs_6": {
190 "locked": { 227 "locked": {
191 "lastModified": 1638036523, 228 "lastModified": 1638036523,
192 "narHash": "sha256-ZL6gogsuBmhBvIro+YwRKrypYhwVPCOOO7FmhOV/xyE=", 229 "narHash": "sha256-ZL6gogsuBmhBvIro+YwRKrypYhwVPCOOO7FmhOV/xyE=",
@@ -207,7 +244,7 @@
207 "home-manager": "home-manager", 244 "home-manager": "home-manager",
208 "neovim": "neovim", 245 "neovim": "neovim",
209 "nixos-hardware": "nixos-hardware", 246 "nixos-hardware": "nixos-hardware",
210 "nixpkgs": "nixpkgs_2", 247 "nixpkgs": "nixpkgs_3",
211 "statix": "statix" 248 "statix": "statix"
212 } 249 }
213 }, 250 },
@@ -232,7 +269,7 @@
232 "inputs": { 269 "inputs": {
233 "fenix": "fenix", 270 "fenix": "fenix",
234 "gitignore": "gitignore", 271 "gitignore": "gitignore",
235 "nixpkgs": "nixpkgs_3" 272 "nixpkgs": "nixpkgs_6"
236 }, 273 },
237 "locked": { 274 "locked": {
238 "lastModified": 1639455627, 275 "lastModified": 1639455627,
diff --git a/home.nix b/home.nix
index 2341bc5..a51f12f 100644
--- a/home.nix
+++ b/home.nix
@@ -25,7 +25,6 @@
25 curl 25 curl
26 tmux 26 tmux
27 weechat 27 weechat
28 rofi
29 firefox 28 firefox
30 xclip 29 xclip
31 ripgrep 30 ripgrep
diff --git a/hosts/olive/configuration.nix b/hosts/olive/configuration.nix
index f25e6e4..9ad0e09 100644
--- a/hosts/olive/configuration.nix
+++ b/hosts/olive/configuration.nix
@@ -88,14 +88,18 @@
88 }; 88 };
89 89
90 sound.enable = true; 90 sound.enable = true;
91 hardware.pulseaudio = {
92 enable = true;
93 package = pkgs.pulseaudioFull;
94 extraConfig = "load-module module-switch-on-connect";
95 };
96 91
97 hardware.bluetooth.enable = true; 92 hardware = {
98 hardware.bluetooth.powerOnBoot = true; 93 pulseaudio = {
94 enable = true;
95 package = pkgs.pulseaudioFull;
96 extraConfig = "load-module module-switch-on-connect";
97 };
98 bluetooth = {
99 enable = true;
100 powerOnBoot = true;
101 };
102 };
99 103
100 # Enable the X11 windowing system. 104 # Enable the X11 windowing system.
101 services.xserver = { 105 services.xserver = {
@@ -121,7 +125,7 @@
121 nix = { 125 nix = {
122 package = pkgs.nixUnstable; 126 package = pkgs.nixUnstable;
123 extraOptions = '' 127 extraOptions = ''
124 experimental-features = nix-command flakes ca-references ca-derivations 128 experimental-features = nix-command flakes ca-derivations
125 warn-dirty = false 129 warn-dirty = false
126 keep-outputs = true 130 keep-outputs = true
127 keep-derivations = true 131 keep-derivations = true
diff --git a/programs/default.nix b/programs/default.nix
index 3175c64..8157c8a 100644
--- a/programs/default.nix
+++ b/programs/default.nix
@@ -49,5 +49,6 @@
49 enableBashIntegration = true; 49 enableBashIntegration = true;
50 }; 50 };
51 gpg.enable = true; 51 gpg.enable = true;
52 info.enable = true;
52 }; 53 };
53} 54}
diff --git a/programs/fzf.nix b/programs/fzf.nix
index 92614f6..f6b7f55 100644
--- a/programs/fzf.nix
+++ b/programs/fzf.nix
@@ -2,7 +2,7 @@
2 programs.fzf = { 2 programs.fzf = {
3 enable = true; 3 enable = true;
4 enableBashIntegration = true; 4 enableBashIntegration = true;
5 defaultOptions = [ "--height 40%" "--layout=reverse" "--color=bw" ]; 5 defaultOptions = [ "--height 40%" "--layout reverse" "--color bw" ];
6 defaultCommand = "rg -L --files"; 6 defaultCommand = "rg -L --files";
7 changeDirWidgetCommand = "fd --type d"; 7 changeDirWidgetCommand = "fd --type d";
8 }; 8 };
diff --git a/programs/readline.nix b/programs/readline.nix
index e7b7b33..8afdd82 100644
--- a/programs/readline.nix
+++ b/programs/readline.nix
@@ -7,7 +7,7 @@
7 programs.readline = { 7 programs.readline = {
8 enable = true; 8 enable = true;
9 bindings = { 9 bindings = {
10 "\\C-o" = ''tmux-fzf\n''; 10 "\\C-o" = ''"tmux-fzf\n"'';
11 "\\t" = "menu-complete"; 11 "\\t" = "menu-complete";
12 "\\e[Z" = "menu-complete-backward"; 12 "\\e[Z" = "menu-complete-backward";
13 }; 13 };
diff --git a/services/dunst.nix b/services/dunst.nix
index 41cbc2a..6037d67 100644
--- a/services/dunst.nix
+++ b/services/dunst.nix
@@ -12,7 +12,7 @@ with theme;
12 global = { 12 global = {
13 font = "Input 9"; 13 font = "Input 9";
14 allow_markup = "no"; 14 allow_markup = "no";
15 format = "%s\n%b"; 15 format = ''%s\n%b'';
16 sort = "yes"; 16 sort = "yes";
17 indicate_hidden = "yes"; 17 indicate_hidden = "yes";
18 alignment = "right"; 18 alignment = "right";
@@ -35,7 +35,7 @@ with theme;
35 padding = "20"; 35 padding = "20";
36 horizontal_padding = "20"; 36 horizontal_padding = "20";
37 separator_color = "auto"; 37 separator_color = "auto";
38 startup_notification = "true"; 38 startup_notification = "false";
39 }; 39 };
40 40
41 urgency_normal = { 41 urgency_normal = {
@@ -57,8 +57,8 @@ with theme;
57 }; 57 };
58 58
59 frame = { 59 frame = {
60 width = 2; 60 width = 0;
61 color = base01; 61 color = base00;
62 }; 62 };
63 63
64 shortcuts = { 64 shortcuts = {
diff --git a/x/default.nix b/x/default.nix
index cd64f61..01adb7a 100644
--- a/x/default.nix
+++ b/x/default.nix
@@ -8,7 +8,6 @@
8 imports = [ 8 imports = [
9 ./2bwm.nix 9 ./2bwm.nix
10 ./xft.nix 10 ./xft.nix
11 ./rofi.nix
12 ./rxvt.nix 11 ./rxvt.nix
13 ]; 12 ];
14} 13}
diff --git a/x/rofi.nix b/x/rofi.nix
deleted file mode 100644
index ff80b05..0000000
--- a/x/rofi.nix
+++ /dev/null
@@ -1,30 +0,0 @@
1{ config
2, pkgs
3, theme
4, ...
5}:
6
7with theme;
8{
9 xresources.properties = {
10 "rofi.color-enabled" = true;
11
12 "rofi.color-window" = "${base00}, ${base00}, ${base00}, ${base00}, ${base03}";
13 "rofi.color-normal" = "${base00}, ${base03}, ${base00}, ${base00}, ${base07}";
14 "rofi.color-active" = "${base03}, ${base0E}, ${base00}, ${base0B}, ${base00}";
15 "rofi.color-urgent" = "${base00}, ${base03}, ${base00}, ${base00}, ${base03}";
16
17 "rofi.fake-transparency" = true;
18 "rofi.font" = "Input 13";
19 "rofi.columns" = 1;
20 "rofi.separator-style" = "none";
21 "rofi.hide-scrollbar" = true;
22 "rofi.location" = 1;
23 "rofi.yoffset" = 20;
24 "rofi.xoffset" = 20;
25 "rofi.padding" = 32;
26 "rofi.fullscreen" = false;
27 "rofi.width" = 300;
28 "rofi.lines" = 6;
29 };
30}