From f0c0e311c003057f24d8045509a627ad2acab978 Mon Sep 17 00:00:00 2001 From: adikro Date: Fri, 13 Mar 2026 23:41:17 +0100 Subject: removing obsolete stuff --- os/core/audio.nix | 15 ++++++++++----- os/core/drivers.nix | 37 ++++++++++++++++++++++++------------- os/core/security.nix | 18 ++++++++++++++---- 3 files changed, 48 insertions(+), 22 deletions(-) (limited to 'os/core') diff --git a/os/core/audio.nix b/os/core/audio.nix index e677a90..7527501 100644 --- a/os/core/audio.nix +++ b/os/core/audio.nix @@ -2,11 +2,19 @@ config, lib, pkgs, - username, ... }: let cfg = config.os.core.audio; + toggleMuteNotify = pkgs.writeShellScriptBin "toggle-mute-notify" '' + IS_MUTED=$(${pkgs.wireplumber}/bin/wpctl get-volume @DEFAULT_AUDIO_SOURCE@ | grep -c "MUTED") + + if [ "$IS_MUTED" -eq 1 ]; then + ${pkgs.libnotify}/bin/notify-send -a "MuteIndicator" -t 0 -u critical "Microphone Muted" "Mic is currently OFF" + else + ${pkgs.mako}/bin/makoctl dismiss -a "MuteIndicator" + fi + ''; in { options.os.core.audio = { @@ -30,12 +38,9 @@ in spotifyd.enable = true; }; - users.users.${username}.linger = true; - security.rtkit.enable = true; - hardware.enableAllFirmware = true; - environment.systemPackages = with pkgs; [ + toggleMuteNotify crosspipe alsa-utils ]; diff --git a/os/core/drivers.nix b/os/core/drivers.nix index da9d83a..77ea721 100644 --- a/os/core/drivers.nix +++ b/os/core/drivers.nix @@ -2,16 +2,21 @@ config, lib, pkgs, - inputs, ... -}: let +}: +let cfg = config.os.core.drivers; -in { +in +{ options.os.core.drivers = { enable = lib.mkEnableOption "enables hardware drivers"; cpu = lib.mkOption { - type = lib.types.enum ["intel" "amd" "none"]; + type = lib.types.enum [ + "intel" + "amd" + "none" + ]; default = "none"; description = "cpu manufacturer for microcode and platform-specific drivers"; }; @@ -40,7 +45,7 @@ in { smartd.enable = true; fwupd.enable = true; }; - environment.systemPackages = [pkgs.rivalcfg]; + environment.systemPackages = [ pkgs.rivalcfg ]; } (lib.mkIf (cfg.cpu == "amd") { @@ -57,6 +62,9 @@ in { hardware.graphics = { enable = true; enable32Bit = true; + extraPackages = with pkgs; [ + libva + ]; }; hardware.sensor.iio.enable = true; }) @@ -69,17 +77,20 @@ in { }; hardware.graphics.extraPackages = with pkgs; [ rocmPackages.clr.icd + libva + libva-utils ]; }) { - boot.kernelPackages = let - kernels = { - "stable" = pkgs.linuxPackages_latest; - "zen" = pkgs.linuxPackages_zen; - "hardened" = pkgs.linuxPackages_hardened; - "unstable" = inputs.kernelv.legacyPackages.x86_64-linux.linuxPackages_6_17; - }; - in + boot.kernelPackages = + let + kernels = { + "stable" = pkgs.linuxPackages_latest; + "zen" = pkgs.linuxPackages_zen; + "hardened" = pkgs.linuxPackages_hardened; + # "unstable" = pkgs.linuxPackages.; + }; + in kernels.${cfg.kernel} or kernels."stable"; } ] diff --git a/os/core/security.nix b/os/core/security.nix index f1c41c2..afd2b2a 100644 --- a/os/core/security.nix +++ b/os/core/security.nix @@ -2,6 +2,7 @@ config, lib, pkgs, + username, ... }: let @@ -13,6 +14,17 @@ in services.gnome.gnome-keyring.enable = true; security = { + doas = { + enable = true; + extraRules = [ + { + users = [ username ]; + keepEnv = true; + persist = true; + } + ]; + }; + # sudo.enable = false; pam.services = { swaylock = { }; login.enableGnomeKeyring = true; @@ -22,13 +34,11 @@ in }; environment.systemPackages = with pkgs; [ - veracrypt + doas-sudo-shim + veracrypt bitwarden-desktop - keyguard - keepassxc - keepassxc-go git-credential-keepassxc ]; }; -- cgit v1.3