From b35d6bbc34756d16eadc14acd6518fa197a802e3 Mon Sep 17 00:00:00 2001 From: alisceon Date: Thu, 9 Apr 2026 11:40:36 +0200 Subject: [PATCH] adding patches for all config changes in unstable --- home/modules/programs/git.nix | 1 + home/modules/programs/waybar.nix | 2 +- home/modules/services/swayidle.nix | 24 ++++++------------------ home/profiles/workstation.nix | 5 ++++- home/users/root/default.nix | 1 + nixos/modules/profiles/workstation.nix | 2 +- 6 files changed, 14 insertions(+), 21 deletions(-) diff --git a/home/modules/programs/git.nix b/home/modules/programs/git.nix index 9a107b1..fe7c50c 100644 --- a/home/modules/programs/git.nix +++ b/home/modules/programs/git.nix @@ -2,6 +2,7 @@ { programs.git = { enable = true; + signing.format = "openpgp"; settings = { user = { name = "alisceon"; diff --git a/home/modules/programs/waybar.nix b/home/modules/programs/waybar.nix index b0e7363..f36729d 100644 --- a/home/modules/programs/waybar.nix +++ b/home/modules/programs/waybar.nix @@ -9,7 +9,7 @@ in enable = true; systemd = { enable = true; - target = "graphical-session.target"; + targets = [ "graphical-session.target" ]; }; settings.mainBar = { layer = "bottom"; diff --git a/home/modules/services/swayidle.nix b/home/modules/services/swayidle.nix index 6ec612c..f3c5fd0 100644 --- a/home/modules/services/swayidle.nix +++ b/home/modules/services/swayidle.nix @@ -25,23 +25,11 @@ in command = "${pkgs.systemd}/bin/systemctl suspend"; } ]; - events = [ - { - event = "before-sleep"; - command = "display off; systemctl --user stop libinput-gestures; ${lock}"; - } - { - event = "after-resume"; - command = "display on; systemctl --user start libinput-gestures"; - } - { - event = "lock"; - command = (display "off") + "; " + lock; - } - { - event = "unlock"; - command = display "on"; - } - ]; + events = { + before-sleep = "display off; systemctl --user stop libinput-gestures; ${lock}"; + after-resume = "display on; systemctl --user start libinput-gestures"; + lock = (display "off") + "; " + lock; + unlock = display "on"; + }; }; } diff --git a/home/profiles/workstation.nix b/home/profiles/workstation.nix index fb22096..7af8426 100644 --- a/home/profiles/workstation.nix +++ b/home/profiles/workstation.nix @@ -13,7 +13,10 @@ xdg = { enable = true; - userDirs.enable = true; + userDirs = { + enable = true; + setSessionVariables = true; + }; mime.enable = true; autostart = { enable = true; diff --git a/home/users/root/default.nix b/home/users/root/default.nix index cfce8d4..80e4bbb 100644 --- a/home/users/root/default.nix +++ b/home/users/root/default.nix @@ -6,6 +6,7 @@ programs.git = { enable = true; + signing.format = "openpgp"; settings.safe.directory = repoLocalPath; }; } diff --git a/nixos/modules/profiles/workstation.nix b/nixos/modules/profiles/workstation.nix index a290c7a..7b2ba0b 100644 --- a/nixos/modules/profiles/workstation.nix +++ b/nixos/modules/profiles/workstation.nix @@ -64,7 +64,7 @@ pkgs.vlc pkgs.via pkgs.plymouth - pkgs.xorg.xhost + pkgs.xhost (pkgs.bottles.override { removeWarningPopup = true; }) ]; sessionVariables.NIXOS_OZONE_WL = "1";