From 410258dd6a3b8c41fcac8cf8bf06ac0fbd5f32f4 Mon Sep 17 00:00:00 2001 From: Serenity-F Date: Fri, 5 Apr 2024 12:16:39 +1000 Subject: [PATCH] moderate corrections --- hosts/proserpina/configuration.nix | 2 +- modules/core/home.nix | 42 ++++++++++++++++++++---------- 2 files changed, 29 insertions(+), 15 deletions(-) diff --git a/hosts/proserpina/configuration.nix b/hosts/proserpina/configuration.nix index 05d9821..7e00610 100644 --- a/hosts/proserpina/configuration.nix +++ b/hosts/proserpina/configuration.nix @@ -3,7 +3,7 @@ { imports = [ # Include the results of the hardware scan. - "${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix" + "${builtins.fetchTarball 'https://github.com/nix-community/disko/archive/master.tar.gz'}/module.nix" ./disko-config.nix ./network-configuration.nix ./hardware-configuration.nix diff --git a/modules/core/home.nix b/modules/core/home.nix index 093def5..24f27e3 100755 --- a/modules/core/home.nix +++ b/modules/core/home.nix @@ -1,4 +1,4 @@ -{ pkgs, inputs, osConfig, ... }: +{ pkgs, inputs, outputs, config, osConfig, ... }: { @@ -6,10 +6,28 @@ inputs.home-manager.nixosModules.home-manager ]; + + users = { + + defaultUserShell = pkgs.fish; + + users.serenity = { + description = "Serenity"; + isNormalUser = true; + shell = pkgs.fish; + extraGroups = [ + "networkmanager" + "wheel" + ]; + }; + + }; + home-manager = { useUserPackages = true; useGlobalPackages = true; # extraSpecialArgs = { inherit inputs; }; + users.serenity = { imports = [ (import ./../home) ]; home = { @@ -17,6 +35,7 @@ homeDirectory = "/home/serenity/"; stateVersion = "23.11"; }; + programs = { home-manager.enable = true; direnv = { @@ -25,19 +44,16 @@ config.load_dotenv = false; }; }; - # programs.home-manager.enable = true; - }; + + }; + }; - users.users.serenity = { - isNormalUser = true; - description = "Serenity"; - extraGroups = [ - "networkmanager" - "wheel" - ]; - shell = pkgs.fish; - }; + + system.stateVersion = "23.11"; + +} + # Copy some files to where they go # home.file.scripts = { # source = ./scripts; @@ -61,5 +77,3 @@ # vscodium # gitui # ]; - -}