From 00d9145f7e1c2e60ed17dbff77d9e93b0a691aed Mon Sep 17 00:00:00 2001 From: tristan Date: Fri, 5 May 2023 08:51:39 +0100 Subject: [PATCH] polkit and tidy sessions --- system/global/home.nix | 2 ++ system/global/system.nix | 23 +++++++++++++++++++++-- system/work/system.nix | 4 ---- system/zenix/home.nix | 8 ++++++-- system/zenix/system.nix | 4 ++-- 5 files changed, 31 insertions(+), 10 deletions(-) diff --git a/system/global/home.nix b/system/global/home.nix index ae467fa..dafe16d 100644 --- a/system/global/home.nix +++ b/system/global/home.nix @@ -103,6 +103,7 @@ in lf-sixel yt-dlp playerctl + swww inkscape pavucontrol @@ -924,6 +925,7 @@ color body red default "([a-z][a-z0-9+-]*://(((([a-z0-9_.!~*'();:&=+$,-]|%[0-9a- w = "https://en.wikipedia.org/wiki/Special:Search?search={}&go=Go&ns0=1"; aw = "https://wiki.archlinux.org/?search={}"; nw = "https://nixos.wiki/index.php?search={}"; + nixpkgs = "https://search.nixos.org/packages?channel=unstable&query={}"; }; settings = { colors = { diff --git a/system/global/system.nix b/system/global/system.nix index 5e3cf92..6574767 100644 --- a/system/global/system.nix +++ b/system/global/system.nix @@ -45,6 +45,21 @@ services.avahi.enable = true; security.pam.services.swaylock = { }; + security.polkit.enable = true; + systemd.user.services.polkit-gnome-authentication-agent-1 = { + description = "polkit-gnome-authentication-agent-1"; + wantedBy = [ "graphical-session.target" ]; + wants = [ "graphical-session.target" ]; + after = [ "graphical-session.target" ]; + serviceConfig = { + Type = "simple"; + ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1"; + Restart = "on-failure"; + RestartSec = 1; + TimeoutStopSec = 10; + }; + }; + i18n.defaultLocale = "en_GB.UTF-8"; @@ -53,11 +68,15 @@ services.greetd = { enable = true; settings = rec { - initial_session = { + hypr_session = { command = "Hyprland"; user = "tristan"; }; - default_session = initial_session; + sway_session = { + command = "sway"; + user = "tristan"; + }; + default_session = hypr_session; }; }; diff --git a/system/work/system.nix b/system/work/system.nix index e900628..3cf576e 100644 --- a/system/work/system.nix +++ b/system/work/system.nix @@ -81,10 +81,6 @@ services.greetd = { settings = rec { - sway_session = { - command = "sway"; - user = "tristan"; - }; # default_session = lib.mkForce sway_session; }; }; diff --git a/system/zenix/home.nix b/system/zenix/home.nix index cdde5dd..3bdbb41 100644 --- a/system/zenix/home.nix +++ b/system/zenix/home.nix @@ -1,4 +1,4 @@ -{ config, pkgs, user, name, ... }: +{ config, pkgs, user, name, lib, ... }: # https://nix-community.github.io/home-manager/options.html { # don't change @@ -15,6 +15,11 @@ handbrake monero-gui xmrig + + #gamer + airshipper + minetest + (pkgs.writeShellScriptBin "my-editor" '' codium $@ '') @@ -84,5 +89,4 @@ bind = SUPER, E, exec, foot -e aerc ''; }; - } diff --git a/system/zenix/system.nix b/system/zenix/system.nix index 568f6e1..bd0db68 100644 --- a/system/zenix/system.nix +++ b/system/zenix/system.nix @@ -15,7 +15,7 @@ networking.firewall.checkReversePath = "loose"; system.stateVersion = "22.11"; # do not change - + virtualisation = { podman = { enable = true; @@ -28,7 +28,7 @@ "steam-run" "steam-original" ]; - + programs.steam = { enable = true; remotePlay.openFirewall = true;