From 9181fc8c32cef7a85eb780da095ac7cc5db729ce Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Mon, 20 Jan 2025 08:41:33 +0100 Subject: ... --- accounts/gkleen@sif/default.nix | 11 ++++++----- accounts/gkleen@sif/systemd.nix | 4 ++-- hosts/sif/default.nix | 6 +++++- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix index 7d5a9c25..10180eca 100644 --- a/accounts/gkleen@sif/default.nix +++ b/accounts/gkleen@sif/default.nix @@ -416,11 +416,12 @@ in { fira fira-code pwvucontrol wrappedKeepassxc wl-clipboard-rs mumble pulseaudio-ctl pamixer libnotify screen-message wrappedYTMDesktop libsForQt5.qt5ct playerctl evince - thunderbird zoom-us steam steam-run wireshark virt-manager - rclone cached-nix-shell worktime fira-code-symbols - libreoffice xournalpp google-chrome nixos-shell virt-viewer - freerdp gnome-icon-theme paper-icon-theme sshpassSecret - weechat element-desktop matrix-synapse-tools.synadm + thunderbird zoom-us xdg-desktop-portal steam steam-run + wireshark virt-manager rclone cached-nix-shell worktime + fira-code-symbols libreoffice xournalpp google-chrome + nixos-shell virt-viewer freerdp gnome-icon-theme + paper-icon-theme sshpassSecret weechat element-desktop + matrix-synapse-tools.synadm flakeInputs.deploy-rs.packages.${config.nixpkgs.system}.deploy-rs sieve-connect gimp inkscape udiskie glab nitrokey-app pynitrokey gtklock wlrctl remmina openscad spice-record diff --git a/accounts/gkleen@sif/systemd.nix b/accounts/gkleen@sif/systemd.nix index cefcf4ea..34f52172 100644 --- a/accounts/gkleen@sif/systemd.nix +++ b/accounts/gkleen@sif/systemd.nix @@ -224,7 +224,7 @@ in { fi monitors+=([$monitor]="$blurred_path") done < <(wpaperctl all-wallpapers -j | jq -c ".[]") - wait + # wait cp --no-preserve=mode ${pkgs.writeText "gtklock.css" '' #window-box { @@ -250,7 +250,7 @@ in { ]; NotifyAccess = "all"; ExecStart = ''${lib.getExe pkgs.gtklock} -s "''${RUNTIME_DIRECTORY}/style.css" -L ${pkgs.writeShellScript "after-lock" '' - ${cfg.wayland.windowManager.hyprland.package}/bin/hyprctl dispatch dpms off + ${lib.getExe cfg.programs.niri.package} msg action power-off-monitors ${config.systemd.package}/bin/systemd-notify --ready ''}''; }; diff --git a/hosts/sif/default.nix b/hosts/sif/default.nix index 5a8fd59a..36760f52 100644 --- a/hosts/sif/default.nix +++ b/hosts/sif/default.nix @@ -729,7 +729,7 @@ in { environment.sessionVariables."GTK_USE_PORTAL" = "1"; xdg.portal = { enable = true; - extraPortals = with pkgs; [xdg-desktop-portal-gtk]; + extraPortals = with pkgs; [xdg-desktop-portal-gtk xdg-desktop-portal-kde]; config.niri = { default = ["gnome" "gtk"]; "org.freedesktop.impl.portal.FileChooser" = ["gtk"]; @@ -779,6 +779,10 @@ in { home-manager.sharedModules = [ flakeInputs.nixVirt.homeModules.default ]; + environment.pathsToLink = [ + "share/zsh" + ]; + system.stateVersion = "24.11"; }; } -- cgit v1.2.3