diff options
-rw-r--r-- | home.nix | 1 | ||||
-rw-r--r-- | hosts/olive/configuration.nix | 9 | ||||
-rw-r--r-- | scripts/battery.nix | 5 |
3 files changed, 8 insertions, 7 deletions
@@ -57,6 +57,7 @@ | |||
57 | stylish-haskell | 57 | stylish-haskell |
58 | libnotify | 58 | libnotify |
59 | inotify-tools | 59 | inotify-tools |
60 | rtorrent | ||
60 | 61 | ||
61 | # meta | 62 | # meta |
62 | nixpkgs-review | 63 | nixpkgs-review |
diff --git a/hosts/olive/configuration.nix b/hosts/olive/configuration.nix index 9ad0e09..91d7b1c 100644 --- a/hosts/olive/configuration.nix +++ b/hosts/olive/configuration.nix | |||
@@ -22,11 +22,12 @@ | |||
22 | interfaces = [ | 22 | interfaces = [ |
23 | "wlp2s0" | 23 | "wlp2s0" |
24 | ]; | 24 | ]; |
25 | environmentFile = "/run/secrets/wireless.env"; | ||
25 | networks = { | 26 | networks = { |
26 | Sanic.pskRaw = "03fbbe8c6b400af40c64ea475be59812ca1d13f40beaf0bf188c50a1e959c8fd"; | 27 | Sanic.pskRaw = "@PSK_SANI@"; |
27 | Gopalan.pskRaw = "52f7f6548fa6f7f24965aae2bd7aa1a34d22a650cdc319d9d6a8567f91be85c8"; | 28 | Gopalan.pskRaw = "@PSK_GOPA@"; |
28 | Srividhya.pskRaw = "f4302c17d20d0ac8791960495bb3ca4e790677d87d16a7d8c414350dd67c9713"; | 29 | Srividhya.pskRaw = "@PSK_SRIV@"; |
29 | sage.pskRaw = "576e51f80e4a6c2c6928f5655b9a75db0dac80aba30626a96b93b67c7c66c761"; | 30 | sage.pskRaw = "@PSK_SAGE@"; |
30 | }; | 31 | }; |
31 | extraConfig = '' | 32 | extraConfig = '' |
32 | ctrl_interface=/run/wpa_supplicant | 33 | ctrl_interface=/run/wpa_supplicant |
diff --git a/scripts/battery.nix b/scripts/battery.nix index e75116b..e89ad46 100644 --- a/scripts/battery.nix +++ b/scripts/battery.nix | |||
@@ -1,10 +1,9 @@ | |||
1 | 1 | { pkgs, ... }: | |
2 | { pkgs, ...}: | ||
3 | 2 | ||
4 | let | 3 | let |
5 | name = "bat"; | 4 | name = "bat"; |
6 | in | 5 | in |
7 | pkgs.writeScriptBin name | 6 | pkgs.writeScriptBin name |
8 | '' | 7 | '' |
9 | red="\e[31m" | 8 | red="\e[31m" |
10 | grn="\e[32m" | 9 | grn="\e[32m" |