From 3aece1b9fb229c21e65f52ee15466cc59adbe3bc Mon Sep 17 00:00:00 2001 From: Michael Thomson Date: Mon, 10 Mar 2025 16:49:25 -0400 Subject: [PATCH] update --- modules/nixos/docker.nix | 1 + modules/nixos/hyprland.nix | 13 +++++++++---- modules/nixos/user.nix | 3 ++- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/modules/nixos/docker.nix b/modules/nixos/docker.nix index a878015..2a2e6e8 100644 --- a/modules/nixos/docker.nix +++ b/modules/nixos/docker.nix @@ -1,3 +1,4 @@ { virtualisation.docker.enable = true; + users.users.mthomson.extraGroups = [ "docker" ]; } diff --git a/modules/nixos/hyprland.nix b/modules/nixos/hyprland.nix index 9227db2..66af18a 100644 --- a/modules/nixos/hyprland.nix +++ b/modules/nixos/hyprland.nix @@ -1,10 +1,15 @@ { pkgs, inputs, ... }: { - programs.hyprland = { - enable = true; - package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; - portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland; + programs = { + hyprland = { + enable = true; + package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland; + portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland; + }; + thunar = { + enable = true; + }; }; environment.sessionVariables.NIXOS_OZONE_WL = "1"; } diff --git a/modules/nixos/user.nix b/modules/nixos/user.nix index 7ac2ba4..7408092 100644 --- a/modules/nixos/user.nix +++ b/modules/nixos/user.nix @@ -1,6 +1,7 @@ {pkgs, ...}: { + programs.zsh.enable = true; users.users.mthomson = { - #shell = pkgs.zsh; + shell = pkgs.zsh; isNormalUser = true; description = "Michael Thomson"; extraGroups = ["networkmanager" "wheel"];