moderate corrections

This commit is contained in:
Serenity-F 2024-04-05 12:16:39 +10:00
parent 4257958024
commit 410258dd6a
2 changed files with 29 additions and 15 deletions

View file

@ -3,7 +3,7 @@
{ {
imports = [ imports = [
# Include the results of the hardware scan. # 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 ./disko-config.nix
./network-configuration.nix ./network-configuration.nix
./hardware-configuration.nix ./hardware-configuration.nix

View file

@ -1,4 +1,4 @@
{ pkgs, inputs, osConfig, ... }: { pkgs, inputs, outputs, config, osConfig, ... }:
{ {
@ -6,10 +6,28 @@
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
]; ];
users = {
defaultUserShell = pkgs.fish;
users.serenity = {
description = "Serenity";
isNormalUser = true;
shell = pkgs.fish;
extraGroups = [
"networkmanager"
"wheel"
];
};
};
home-manager = { home-manager = {
useUserPackages = true; useUserPackages = true;
useGlobalPackages = true; useGlobalPackages = true;
# extraSpecialArgs = { inherit inputs; }; # extraSpecialArgs = { inherit inputs; };
users.serenity = { users.serenity = {
imports = [ (import ./../home) ]; imports = [ (import ./../home) ];
home = { home = {
@ -17,6 +35,7 @@
homeDirectory = "/home/serenity/"; homeDirectory = "/home/serenity/";
stateVersion = "23.11"; stateVersion = "23.11";
}; };
programs = { programs = {
home-manager.enable = true; home-manager.enable = true;
direnv = { direnv = {
@ -25,19 +44,16 @@
config.load_dotenv = false; 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 # Copy some files to where they go
# home.file.scripts = { # home.file.scripts = {
# source = ./scripts; # source = ./scripts;
@ -61,5 +77,3 @@
# vscodium # vscodium
# gitui # gitui
# ]; # ];
}