summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--accounts/gkleen@sif/default.nix7
-rw-r--r--accounts/gkleen@sif/hyprland.nix5
-rw-r--r--accounts/gkleen@sif/systemd.nix7
-rw-r--r--hosts/sif/default.nix11
4 files changed, 23 insertions, 7 deletions
diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index a4f1689a..8332b38a 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -90,7 +90,7 @@ in {
90 ]; 90 ];
91 91
92 config = { 92 config = {
93 services.displayManager.defaultSession = "none+xmonad"; 93 services.displayManager.defaultSession = "Hyprland"; # "none+xmonad";
94 services.xserver = { 94 services.xserver = {
95 windowManager.session = [{ 95 windowManager.session = [{
96 name = "xmonad"; 96 name = "xmonad";
@@ -315,7 +315,7 @@ in {
315 }; 315 };
316 clock = { 316 clock = {
317 interval = 1; 317 interval = 1;
318 timezone = "Europe/Berlin"; 318 # timezone = "Europe/Berlin";
319 format = "W{:%V-%u %F %H:%M:%S%Ez}"; 319 format = "W{:%V-%u %F %H:%M:%S%Ez}";
320 tooltip-format = "<tt><small>{calendar}</small></tt>"; 320 tooltip-format = "<tt><small>{calendar}</small></tt>";
321 calendar = { 321 calendar = {
@@ -376,7 +376,7 @@ in {
376 }; 376 };
377 clock = { 377 clock = {
378 interval = 1; 378 interval = 1;
379 timezone = "Europe/Berlin"; 379 # timezone = "Europe/Berlin";
380 format = "{:%H:%M}"; 380 format = "{:%H:%M}";
381 tooltip-format = "W{:%V-%u %F %H:%M:%S%Ez}"; 381 tooltip-format = "W{:%V-%u %F %H:%M:%S%Ez}";
382 }; 382 };
@@ -633,6 +633,7 @@ in {
633 { timeout = 330; command = "${lib.getExe pkgs.gtklock} -d"; } 633 { timeout = 330; command = "${lib.getExe pkgs.gtklock} -d"; }
634 ]; 634 ];
635 }; 635 };
636 poweralertd.enable = true;
636 }; 637 };
637 638
638 home.pointerCursor = { 639 home.pointerCursor = {
diff --git a/accounts/gkleen@sif/hyprland.nix b/accounts/gkleen@sif/hyprland.nix
index 076a04a1..4e4eb091 100644
--- a/accounts/gkleen@sif/hyprland.nix
+++ b/accounts/gkleen@sif/hyprland.nix
@@ -217,11 +217,10 @@
217 ]; 217 ];
218 218
219 windowrulev2 = [ 219 windowrulev2 = [
220 "suppressevent maximize, class:.*" 220 "suppressevent maximize fullscreen, class:.*"
221 "suppressevent fullscreen, class:.*"
222 221
223 # "maximize, class:^(Element|thunderbird)$" 222 # "maximize, class:^(Element|thunderbird)$"
224 "workspace special:keepass, class:^org\.keepassxc\.KeePassXC$" 223 "workspace special:keepass, class:^org\.keepassxc\.KeePassXC$, title:^(?!KeePassXC - Access Request)$"
225 # "group set always lock invade, class:^Element$" 224 # "group set always lock invade, class:^Element$"
226 "workspace 4, class:^evince$" 225 "workspace 4, class:^evince$"
227 "workspace 10, class:^mpv$" 226 "workspace 10, class:^mpv$"
diff --git a/accounts/gkleen@sif/systemd.nix b/accounts/gkleen@sif/systemd.nix
index 1397ca62..30fd2d72 100644
--- a/accounts/gkleen@sif/systemd.nix
+++ b/accounts/gkleen@sif/systemd.nix
@@ -126,6 +126,13 @@ in {
126 Environment = with pkgs; "PATH=${worktime}/bin:${systemd}/bin"; 126 Environment = with pkgs; "PATH=${worktime}/bin:${systemd}/bin";
127 }; 127 };
128 }; 128 };
129 waybar = {
130 Service = {
131 Environment = [
132 "TZ=:/etc/localtime"
133 ];
134 };
135 };
129 dunst = { 136 dunst = {
130 Service = { 137 Service = {
131 ExecStart = lib.mkForce "${cfg.services.dunst.package}/bin/dunst"; 138 ExecStart = lib.mkForce "${cfg.services.dunst.package}/bin/dunst";
diff --git a/hosts/sif/default.nix b/hosts/sif/default.nix
index 16b9f65a..40f87117 100644
--- a/hosts/sif/default.nix
+++ b/hosts/sif/default.nix
@@ -715,10 +715,19 @@ in {
715 { directory = "/var/spool/uucp"; user = "uucp"; group = "uucp"; mode = "0750"; } 715 { directory = "/var/spool/uucp"; user = "uucp"; group = "uucp"; mode = "0750"; }
716 ]; 716 ];
717 files = [ 717 files = [
718 "/etc/localtime"
719 ]; 718 ];
720 }; 719 };
721 720
721 systemd.services.timezone = {
722 wantedBy = [ "multi-user.target" ];
723 serviceConfig = {
724 Type = "oneshot";
725 RemainAfterExit = true;
726 ExecStart = "${pkgs.coreutils}/bin/cp -vP /.bcachefs/etc/localtime /etc/localtime";
727 ExecStop = "${pkgs.coreutils}/bin/cp -vP /etc/localtime /.bcachefs/etc/localtime";
728 };
729 };
730
722 security.pam.services.gtklock = {}; 731 security.pam.services.gtklock = {};
723 732
724 system.stateVersion = "24.11"; 733 system.stateVersion = "24.11";