aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.nix1
-rw-r--r--font.nix3
-rw-r--r--home.nix4
-rw-r--r--hosts/myrtle/configuration.nix9
-rw-r--r--programs/rofi.nix3
-rw-r--r--programs/zathura.nix3
-rw-r--r--services/dunst.nix3
-rw-r--r--services/sxhkd.nix9
-rw-r--r--x/rxvt.nix13
9 files changed, 23 insertions, 25 deletions
diff --git a/flake.nix b/flake.nix
index 3782459..d659c3f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -96,6 +96,7 @@
96 _module.args.self = self; 96 _module.args.self = self;
97 _module.args.inputs = inputs; 97 _module.args.inputs = inputs;
98 _module.args.theme = import ./theme; 98 _module.args.theme = import ./theme;
99 _module.args.font = import ./font.nix;
99 }; 100 };
100 } 101 }
101 nixos-hardware.nixosModules.asus-battery 102 nixos-hardware.nixosModules.asus-battery
diff --git a/font.nix b/font.nix
new file mode 100644
index 0000000..74afcdd
--- /dev/null
+++ b/font.nix
@@ -0,0 +1,3 @@
1{
2 name = "Nerd Input";
3}
diff --git a/home.nix b/home.nix
index 838a4c3..933336c 100644
--- a/home.nix
+++ b/home.nix
@@ -52,6 +52,10 @@
52 httpie 52 httpie
53 thunderbird 53 thunderbird
54 54
55 # gaming
56 mgba
57 yuzu
58
55 # sync 59 # sync
56 rtorrent 60 rtorrent
57 lftp 61 lftp
diff --git a/hosts/myrtle/configuration.nix b/hosts/myrtle/configuration.nix
index f554069..82eb763 100644
--- a/hosts/myrtle/configuration.nix
+++ b/hosts/myrtle/configuration.nix
@@ -103,8 +103,6 @@
103 gamemode.enable = true; 103 gamemode.enable = true;
104 }; 104 };
105 105
106 # sound.enable = true;
107
108 hardware = { 106 hardware = {
109 opengl.driSupport = true; 107 opengl.driSupport = true;
110 bluetooth = { 108 bluetooth = {
@@ -192,13 +190,6 @@
192 group = "signald"; 190 group = "signald";
193 }; 191 };
194 192
195 bitlbee = {
196 enable = true;
197 libpurple_plugins = [
198 pkgs.purple-signald
199 ];
200 portNumber = 8888;
201 };
202 }; 193 };
203 194
204 systemd.sleep.extraConfig = '' 195 systemd.sleep.extraConfig = ''
diff --git a/programs/rofi.nix b/programs/rofi.nix
index bdf5898..8ce77bf 100644
--- a/programs/rofi.nix
+++ b/programs/rofi.nix
@@ -1,6 +1,7 @@
1{ config 1{ config
2, pkgs 2, pkgs
3, theme 3, theme
4, font
4, ... 5, ...
5}: 6}:
6 7
@@ -53,7 +54,7 @@ in
53{ 54{
54 programs.rofi = { 55 programs.rofi = {
55 enable = true; 56 enable = true;
56 font = "Fira Code 21"; 57 font = "${font.name} 21";
57 location = "top-left"; 58 location = "top-left";
58 xoffset = 20; 59 xoffset = 20;
59 yoffset = 20; 60 yoffset = 20;
diff --git a/programs/zathura.nix b/programs/zathura.nix
index 9758c7a..6179781 100644
--- a/programs/zathura.nix
+++ b/programs/zathura.nix
@@ -1,6 +1,7 @@
1{ config 1{ config
2, pkgs 2, pkgs
3, theme 3, theme
4, font
4, ... 5, ...
5}: 6}:
6 7
@@ -31,7 +32,7 @@ with theme;
31 statusbar-h-padding = "50"; 32 statusbar-h-padding = "50";
32 statusbar-v-padding = "50"; 33 statusbar-v-padding = "50";
33 guioptions = "s"; 34 guioptions = "s";
34 font = "Nerd Input 10"; 35 font = "${font.name} 10";
35 }; 36 };
36 }; 37 };
37} 38}
diff --git a/services/dunst.nix b/services/dunst.nix
index 407820f..b0b1e67 100644
--- a/services/dunst.nix
+++ b/services/dunst.nix
@@ -1,6 +1,7 @@
1{ config 1{ config
2, pkgs 2, pkgs
3, theme 3, theme
4, font
4, ... 5, ...
5}: 6}:
6 7
@@ -10,7 +11,7 @@ with theme;
10 enable = true; 11 enable = true;
11 settings = { 12 settings = {
12 global = { 13 global = {
13 font = "Nerd Input 10"; 14 font = "${font.name} 10";
14 allow_markup = "no"; 15 allow_markup = "no";
15 format = ''%s\n%b''; 16 format = ''%s\n%b'';
16 sort = "yes"; 17 sort = "yes";
diff --git a/services/sxhkd.nix b/services/sxhkd.nix
index 3bb3da8..d8678af 100644
--- a/services/sxhkd.nix
+++ b/services/sxhkd.nix
@@ -9,11 +9,6 @@ let
9 '' 9 ''
10 ${pkgs.libnotify}/bin/notify-send ${text} -h int:value:${value} -h string:synchronous:volume -h string:hlcolor:"${theme.base0C}" 10 ${pkgs.libnotify}/bin/notify-send ${text} -h int:value:${value} -h string:synchronous:volume -h string:hlcolor:"${theme.base0C}"
11 ''; 11 '';
12 brightness = pkgs.writeScriptBin "brightness" ''
13 ${pkgs.light}/bin/light $@
14 v=$(${pkgs.light}/bin/light -G)
15 ${progress "brightness" "$v"}
16 '';
17 volume = pkgs.writeScriptBin "volume" '' 12 volume = pkgs.writeScriptBin "volume" ''
18 ${pkgs.alsaUtils}/bin/amixer $@ 13 ${pkgs.alsaUtils}/bin/amixer $@
19 v=$(${pkgs.alsaUtils}/bin/amixer sget Master | ${pkgs.gawk}/bin/awk -F"[][%]" '/Left:/ {print $2}') 14 v=$(${pkgs.alsaUtils}/bin/amixer sget Master | ${pkgs.gawk}/bin/awk -F"[][%]" '/Left:/ {print $2}')
@@ -25,8 +20,8 @@ in
25 services.sxhkd = { 20 services.sxhkd = {
26 enable = true; 21 enable = true;
27 keybindings = { 22 keybindings = {
28 "super + slash" = "${brightness}/bin/brightness -A 2"; 23 "super + slash" = "${pkgs.light}/bin/light -A 2";
29 "super + shift + slash" = "${brightness}/bin/brightness -U 2"; 24 "super + shift + slash" = "${pkgs.light}/bin/light -U 2";
30 "super + semicolon" = "${volume}/bin/volume sset Master 2%+"; 25 "super + semicolon" = "${volume}/bin/volume sset Master 2%+";
31 "super + shift + semicolon" = "${volume}/bin/volume sset Master 2%-"; 26 "super + shift + semicolon" = "${volume}/bin/volume sset Master 2%-";
32 "super + ctrl + space" = "${pkgs.dunst}/bin/dunstctl close"; 27 "super + ctrl + space" = "${pkgs.dunst}/bin/dunstctl close";
diff --git a/x/rxvt.nix b/x/rxvt.nix
index a7970a6..b5401ab 100644
--- a/x/rxvt.nix
+++ b/x/rxvt.nix
@@ -1,6 +1,7 @@
1{ config 1{ config
2, pkgs 2, pkgs
3, theme 3, theme
4, font
4, ... 5, ...
5}: 6}:
6 7
@@ -30,12 +31,12 @@ with theme;
30 "*color15" = base07; 31 "*color15" = base07;
31 32
32 "*.cursorBlink" = "on"; 33 "*.cursorBlink" = "on";
33 "URxvt.font" = "xft:Nerd Input:size=11:style=Medium"; 34 "URxvt.font" = "xft:${font.name}:size=11:style=Medium";
34 "URxvt.italicFont" = "xft:Nerd Input:size=11:style=Medium"; 35 "URxvt.italicFont" = "xft:${font.name}:size=11:style=Medium";
35 "URxvt.boldFont" = "xft:Nerd Input:size=11:style=Medium"; 36 "URxvt.boldFont" = "xft:${font.name}:size=11:style=Medium";
36 "*font" = "Fira Code:size=11:style=Regular"; 37 "*font" = "${font.name}:size=11:style=Regular";
37 "*italicFont" = "Fira Code:size=11:style=Italic"; 38 "*italicFont" = "${font.name}:size=11:style=Italic";
38 "*boldFont" = "Fira Code:size=11:style=Bold"; 39 "*boldFont" = "${font.name}:size=11:style=Bold";
39 40
40 "URxvt.lineSpace" = 0; 41 "URxvt.lineSpace" = 0;
41 "URxvt.letterSpace" = 0; 42 "URxvt.letterSpace" = 0;