From 77601c69dacd882d02c9c1225dd2b52931dcb1e8 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Sat, 23 May 2026 15:25:27 -0400 Subject: [PATCH] clean up of printer stuff & flatpaks --- hosts/fwbook.nix | 31 ------------------------------ modules/nixos/desktop/default.nix | 10 ++++++++++ modules/nixos/desktop/packages.nix | 6 ++++++ modules/nixos/desktop/printers.nix | 12 ++++++++++-- 4 files changed, 26 insertions(+), 33 deletions(-) diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index d411e98..5906990 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -49,15 +49,6 @@ in ]; }; }; - users.users.ari.extraGroups = [ - "input" - "disk" - "wheel" - "tty" - "dialout" - "plugdev" - "uucp" - ]; virtualisation.waydroid.enable = true; # Tailscale services.tailscale.enable = true; @@ -121,7 +112,6 @@ in # Work postgresql - dvc-with-remotes google-cloud-sdk awscli openfortivpn @@ -154,10 +144,6 @@ in gifski jq - # Browser - chromium - brave - # Photo/video Editing krita gimp-with-plugins @@ -219,14 +205,10 @@ in ]); services.usbmuxd.enable = true; services.flatpak.packages = [ - "org.chromium.Chromium" - "io.github.kolunmi.Bazaar" - "com.spotify.Client" "com.cassidyjames.butler" "io.dbeaver.DBeaverCommunity" "com.google.Chrome" "dev.deedles.Trayscale" - "org.pipewire.Helvum" ]; # Phone programs.kdeconnect.enable = true; @@ -243,16 +225,6 @@ in enable = true; capSysNice = true; }; - # Chrome - programs.chromium = { - enable = true; - enablePlasmaBrowserIntegration = true; - extensions = [ - "nngceckbapebfimnlniiiahkandclblb" # bitwarden - "gcbommkclmclpchllfjekcdonpmejbdp" # https everywhere - "cjpalhdlnbpafiamejdnhcphjbkeiagm" # ublock origin - ]; - }; # Ollama services.ollama = { enable = true; @@ -260,10 +232,7 @@ in port = 11434; acceleration = "rocm"; rocmOverrideGfx = "11.0.2"; - # package = unstablePkgs.ollama-rocm; }; - # # Brother Printer - hardware.sane.brscan5.enable = true; # # Display Managers services.xserver.videoDrivers = [ "modesetting" diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix index 77d18f0..7a4f51f 100644 --- a/modules/nixos/desktop/default.nix +++ b/modules/nixos/desktop/default.nix @@ -5,6 +5,7 @@ }: let cfg = config.skyg.nixos; + skygUser = config.skyg.user; in { imports = [ @@ -26,6 +27,15 @@ in }; }; config = lib.mkIf cfg.desktop.enable { + users.users.${skygUser.name}.extraGroups = [ + "input" + "disk" + "wheel" + "tty" + "dialout" + "plugdev" + "uucp" + ]; services.dbus.enable = true; services.displayManager.enable = true; services.libinput.enable = true; diff --git a/modules/nixos/desktop/packages.nix b/modules/nixos/desktop/packages.nix index e81d1ae..b9d8ef0 100644 --- a/modules/nixos/desktop/packages.nix +++ b/modules/nixos/desktop/packages.nix @@ -6,6 +6,12 @@ in config = lib.mkIf cfg.enable { # Flatpak services.flatpak.enable = true; + services.flatpak.packages = [ + "org.chromium.Chromium" + "io.github.kolunmi.Bazaar" + "com.spotify.Client" + "org.pipewire.Helvum" + ]; environment.systemPackages = (with pkgs; [ # General utils busybox diff --git a/modules/nixos/desktop/printers.nix b/modules/nixos/desktop/printers.nix index 62fe451..b2f5d89 100644 --- a/modules/nixos/desktop/printers.nix +++ b/modules/nixos/desktop/printers.nix @@ -1,7 +1,15 @@ { pkgs, lib, config, ... }: { - config = { - services.printing = lib.mkIf config.skyg.nixos.desktop.enable { + config = lib.mkIf config.skyg.nixos.desktop.enable { + + services.flatpak.overrides = { + "org.chromium.Chromium" = { + Context = { + sockets = [ "cups" ]; + }; + }; + }; + services.printing = { enable = true; drivers = with pkgs; [ gutenprint