From 1227cb3f82096ff3d4ae8c8469f4e3a896716b4c Mon Sep 17 00:00:00 2001 From: jolheiser Date: Tue, 16 Jul 2024 09:08:16 -0500 Subject: [PATCH] chore: fix some statix findings Signed-off-by: jolheiser --- apps/gui/gtk.nix | 12 +++++++----- apps/nogui/go.nix | 2 +- machines/sencha/default.nix | 14 +++++++++----- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/apps/gui/gtk.nix b/apps/gui/gtk.nix index 62c0d1a..615ab9f 100644 --- a/apps/gui/gtk.nix +++ b/apps/gui/gtk.nix @@ -45,11 +45,13 @@ themeDir = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}"; in lib.mkIf config.gtk.enable { - configFile."gtk-4.0/assets" = { - source = "${themeDir}/gtk-4.0/assets"; - recursive = true; + configFile = { + "gtk-4.0/assets" = { + source = "${themeDir}/gtk-4.0/assets"; + recursive = true; + }; + "gtk-4.0/gtk.css".source = "${themeDir}/gtk-4.0/gtk.css"; + "gtk-4.0/gtk-dark.css".source = "${themeDir}/gtk-4.0/gtk-dark.css"; }; - configFile."gtk-4.0/gtk.css".source = "${themeDir}/gtk-4.0/gtk.css"; - configFile."gtk-4.0/gtk-dark.css".source = "${themeDir}/gtk-4.0/gtk-dark.css"; }; } diff --git a/apps/nogui/go.nix b/apps/nogui/go.nix index 6846cc1..6d7ec86 100644 --- a/apps/nogui/go.nix +++ b/apps/nogui/go.nix @@ -2,8 +2,8 @@ let goPath = ".local/share/go"; in { programs.go = { + inherit goPath; enable = true; - goPath = goPath; goBin = "${goPath}/bin"; }; } diff --git a/machines/sencha/default.nix b/machines/sencha/default.nix index fd1bc86..0bb0cbd 100644 --- a/machines/sencha/default.nix +++ b/machines/sencha/default.nix @@ -40,12 +40,16 @@ virtualisation.docker.enable = true; - users.users.olheiser.isNormalUser = true; - users.users.jolheiser = { - extraGroups = ["wheel" "docker" "storage"]; - isNormalUser = true; + users = { + users = { + olheiser.isNormalUser = true; + jolheiser = { + extraGroups = ["wheel" "docker" "storage"]; + isNormalUser = true; + }; + }; + groups.media.members = ["jolheiser" "olheiser" "jellyfin"]; }; - users.groups.media.members = ["jolheiser" "olheiser" "jellyfin"]; environment.systemPackages = with pkgs; [ firefox