From 3ed184c48a1154a2548df807c8aaae7888e4792c Mon Sep 17 00:00:00 2001 From: adikro Date: Wed, 8 Apr 2026 16:21:24 +0200 Subject: flake update --- os/core/drivers.nix | 17 ++++++++++------- os/core/security.nix | 1 + os/core/users.nix | 7 +++++-- os/srv/gaming.nix | 1 + os/srv/tor.nix | 21 +++++++++++++++++---- 5 files changed, 34 insertions(+), 13 deletions(-) (limited to 'os') diff --git a/os/core/drivers.nix b/os/core/drivers.nix index 9b373db..3764937 100644 --- a/os/core/drivers.nix +++ b/os/core/drivers.nix @@ -77,14 +77,17 @@ in }) (lib.mkIf (cfg.graphics.enable && cfg.graphics.amdgpu.enable) { - services.lact.enable = true; - hardware.amdgpu = { - initrd.enable = true; - overdrive.enable = true; + services = { + lact.enable = true; + hardware.openrgb.enable = true; + }; + hardware = { + amdgpu = { + initrd.enable = true; + overdrive.enable = true; + }; + graphics.extraPackages = [ pkgs.rocmPackages.clr.icd ]; }; - hardware.graphics.extraPackages = with pkgs; [ - rocmPackages.clr.icd - ]; }) (lib.mkIf (cfg.graphics.enable && cfg.graphics.version == "git") { nixpkgs.overlays = [ inputs.nix-gaming-edge.overlays.mesa-git ]; diff --git a/os/core/security.nix b/os/core/security.nix index afd6297..fd518c0 100644 --- a/os/core/security.nix +++ b/os/core/security.nix @@ -100,6 +100,7 @@ in environment.systemPackages = with pkgs; [ veracrypt + gocryptfs keepassxc ]; } diff --git a/os/core/users.nix b/os/core/users.nix index 86c015c..4bd0221 100644 --- a/os/core/users.nix +++ b/os/core/users.nix @@ -21,7 +21,11 @@ in hashedPasswordFile = config.sops.secrets.user_password.path; shell = pkgs.fish; extraGroups = lib.mkMerge [ - [ "wheel" ] + [ + "wheel" + "input" + "uinput" + ] (lib.mkIf (config.os.core.drivers.graphics.enable or false) [ "video" @@ -30,7 +34,6 @@ in (lib.mkIf (config.os.core.network.enable or false) [ "networkmanager" ]) (lib.mkIf (config.os.srv.virtualization.enable or false) [ "libvirtd" ]) (lib.mkIf (config.os.srv.docker.enable or false) [ "docker" ]) - (lib.mkIf (config.os.srv.autoclicker.enable or false) [ "input" ]) ]; }; root.hashedPasswordFile = config.sops.secrets.root_password.path; diff --git a/os/srv/gaming.nix b/os/srv/gaming.nix index a8bba78..5de2e26 100644 --- a/os/srv/gaming.nix +++ b/os/srv/gaming.nix @@ -40,6 +40,7 @@ in home-manager.users.${username}.hm.soft.mangohud.enable = true; environment.systemPackages = with pkgs; [ + theclicker ludusavi protonplus ]; diff --git a/os/srv/tor.nix b/os/srv/tor.nix index a33f486..08c8152 100644 --- a/os/srv/tor.nix +++ b/os/srv/tor.nix @@ -1,15 +1,28 @@ { config, lib, + pkgs, ... }: let cfg = config.os.srv.tor; in { - options.os.srv.tor.enable = lib.mkEnableOption "enables tor services and browser"; - - config = lib.mkIf cfg.enable { - + options.os.srv.tor = { + enable = lib.mkEnableOption "enables tor services"; + enableBrowser = lib.mkEnableOption "enables the tor browser"; }; + + config = lib.mkMerge [ + (lib.mkIf cfg.enable { + services.tor = { + enable = true; + }; + }) + (lib.mkIf cfg.enableBrowser { + environment.systemPackages = with pkgs; [ + tor-browser + ]; + }) + ]; } -- cgit v1.3