aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.lock8
-rw-r--r--flake.nix2
-rw-r--r--home.nix1
-rw-r--r--hosts/myrtle/configuration.nix27
-rw-r--r--services/default.nix2
-rw-r--r--theme/default.nix2
-rw-r--r--x/2bwm.nix4
7 files changed, 31 insertions, 15 deletions
diff --git a/flake.lock b/flake.lock
index 3e2da29..95b0fe7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -79,16 +79,16 @@
79 }, 79 },
80 "nixpkgs": { 80 "nixpkgs": {
81 "locked": { 81 "locked": {
82 "lastModified": 1681753173, 82 "lastModified": 1688868408,
83 "narHash": "sha256-MrGmzZWLUqh2VstoikKLFFIELXm/lsf/G9U9zR96VD4=", 83 "narHash": "sha256-RR9N5XTAxSBhK8MCvLq9uxfdkd7etC//seVXldy0k48=",
84 "owner": "NixOS", 84 "owner": "NixOS",
85 "repo": "nixpkgs", 85 "repo": "nixpkgs",
86 "rev": "0a4206a51b386e5cda731e8ac78d76ad924c7125", 86 "rev": "510d721ce097150ae3b80f84b04b13b039186571",
87 "type": "github" 87 "type": "github"
88 }, 88 },
89 "original": { 89 "original": {
90 "owner": "NixOS", 90 "owner": "NixOS",
91 "ref": "nixpkgs-unstable", 91 "ref": "nixos-23.05",
92 "repo": "nixpkgs", 92 "repo": "nixpkgs",
93 "type": "github" 93 "type": "github"
94 } 94 }
diff --git a/flake.nix b/flake.nix
index 3ee2f7c..d1f39f6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,7 @@
2 description = "nerdypepper's nixos config"; 2 description = "nerdypepper's nixos config";
3 3
4 inputs = { 4 inputs = {
5 nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; 5 nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
6 6
7 nixos-hardware.url = "github:nixos/nixos-hardware"; 7 nixos-hardware.url = "github:nixos/nixos-hardware";
8 8
diff --git a/home.nix b/home.nix
index f183947..7a51f63 100644
--- a/home.nix
+++ b/home.nix
@@ -121,6 +121,7 @@
121 initExtra = '' 121 initExtra = ''
122 ${pkgs.hsetroot}/bin/hsetroot -solid "${theme.base00}" 122 ${pkgs.hsetroot}/bin/hsetroot -solid "${theme.base00}"
123 xrdb -load $HOME/.Xresources 123 xrdb -load $HOME/.Xresources
124 ${pkgs.picom}/bin/picom &
124 xrandr --setprovideroutputsource modesetting NVIDIA-0 125 xrandr --setprovideroutputsource modesetting NVIDIA-0
125 xrandr --auto 126 xrandr --auto
126 ''; 127 '';
diff --git a/hosts/myrtle/configuration.nix b/hosts/myrtle/configuration.nix
index be9852e..27b16ce 100644
--- a/hosts/myrtle/configuration.nix
+++ b/hosts/myrtle/configuration.nix
@@ -14,6 +14,7 @@
14 boot.kernelParams = [ 14 boot.kernelParams = [
15 # "i915.modeset=0" 15 # "i915.modeset=0"
16 # "intel_pstate=disable" 16 # "intel_pstate=disable"
17 "ibt=off"
17 ]; 18 ];
18 19
19 networking = { 20 networking = {
@@ -104,10 +105,6 @@
104 105
105 hardware = { 106 hardware = {
106 opengl.driSupport = true; 107 opengl.driSupport = true;
107 # pulseaudio = {
108 # enable = true;
109 # package = pkgs.pulseaudioFull;
110 # };
111 bluetooth = { 108 bluetooth = {
112 enable = true; 109 enable = true;
113 powerOnBoot = true; 110 powerOnBoot = true;
@@ -126,7 +123,7 @@
126 }; 123 };
127 sensor.iio.enable = true; # enable screen autorotate 124 sensor.iio.enable = true; # enable screen autorotate
128 asus.battery = { 125 asus.battery = {
129 chargeUpto = 80; 126 chargeUpto = 100;
130 }; 127 };
131 }; 128 };
132 129
@@ -187,16 +184,34 @@
187 pulse.enable = true; 184 pulse.enable = true;
188 }; 185 };
189 186
187 signald = {
188 enable = true;
189 group = "signald";
190 };
191
192 bitlbee = {
193 enable = true;
194 libpurple_plugins = [
195 pkgs.purple-signald
196 ];
197 portNumber = 8888;
198 };
190 }; 199 };
191 200
192 systemd.sleep.extraConfig = '' 201 systemd.sleep.extraConfig = ''
193 HibernateMode=shutdown 202 HibernateMode=suspend
194 ''; 203 '';
195 204
196 virtualisation.docker.enable = true; 205 virtualisation.docker.enable = true;
197 virtualisation.virtualbox.host.enable = true; 206 virtualisation.virtualbox.host.enable = true;
198 users.extraGroups.vboxusers.members = [ "np" ]; 207 users.extraGroups.vboxusers.members = [ "np" ];
199 208
209 security.sudo.extraRules = [
210 {
211 users = [ "np" ];
212 commands = map (cmd: "${pkgs.systemd}/bin/systemctl ${cmd}") [ "poweroff" "suspend" "reboot" ];
213 }
214 ];
200 215
201 users.users.np = { 216 users.users.np = {
202 isNormalUser = true; 217 isNormalUser = true;
diff --git a/services/default.nix b/services/default.nix
index 2bce0e4..b2a39bb 100644
--- a/services/default.nix
+++ b/services/default.nix
@@ -8,7 +8,7 @@
8 8
9 imports = [ 9 imports = [
10 ./dunst.nix 10 ./dunst.nix
11 # ./picom.nix 11 ./picom.nix
12 ./redshift.nix 12 ./redshift.nix
13 ./sxhkd.nix 13 ./sxhkd.nix
14 # ./mbsync.nix 14 # ./mbsync.nix
diff --git a/theme/default.nix b/theme/default.nix
index b3af086..7c67057 100644
--- a/theme/default.nix
+++ b/theme/default.nix
@@ -3,4 +3,4 @@ let
3 night = import ./night.nix; 3 night = import ./night.nix;
4 gruvbox = import ./gruvbox.nix; 4 gruvbox = import ./gruvbox.nix;
5in 5in
6night 6day
diff --git a/x/2bwm.nix b/x/2bwm.nix
index af66b7a..4000850 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" = 12; 10 "twobwm.border_width" = 22;
11 "twobwm.outer_border" = 10; 11 "twobwm.outer_border" = 20;
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;