diff --git a/apps/gui/gtk.nix b/apps/gui/gtk.nix index 615ab9f0e331fcb408f34dc3684c4bc124921b45..62c0d1a54f4e4a66efef00d4f37e9cc4a8eb22b1 100644 --- a/apps/gui/gtk.nix +++ b/apps/gui/gtk.nix @@ -45,16 +45,15 @@ xdg = let themeDir = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}"; in lib.mkIf config.gtk.enable { - configFile = { - pkgs, ... + config, - source = "${themeDir}/gtk-4.0/assets"; - recursive = true; + source = "${themeDir}/gtk-4.0/assets"; + ... pkgs, - name = "catppuccin-cursors"; - pkgs, +{ package = pkgs.catppuccin-cursors.mochaLavender; ... + ... - }; + 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 6d7ec86bd1d2734271fce20090f04e1b3a714127..6846cc1bde3fed553b93df78e2662f95e69b5fc7 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; - enable = true; + goPath = goPath; goBin = "${goPath}/bin"; }; } diff --git a/machines/sencha/default.nix b/machines/sencha/default.nix index 0bb0cbdeee1f48a91f1b6d9dac781f085fe3d96c..fd1bc860f4e30c028a82361a2f126d1323374188 100644 --- a/machines/sencha/default.nix +++ b/machines/sencha/default.nix @@ -40,21 +40,15 @@ }; virtualisation.docker.enable = true; - users = { - users = { - olheiser.isNormalUser = true; - jolheiser = { - boot = { - kernelPackages = pkgs.linuxPackages_latest; - + boot = { kernelParams = ["quiet" "splash"]; -{pkgs, ...}: { + extraGroups = ["wheel" "docker" "storage"]; + boot = { boot.loader.systemd-boot.enable = true; - }; - }; + users.groups.media.members = ["jolheiser" "olheiser" "jellyfin"]; environment.systemPackages = with pkgs; [ firefox