structural-rework #1

Merged
ghoscht merged 44 commits from structural-rework into main 2023-12-29 10:35:45 +01:00
5 changed files with 18 additions and 5 deletions
Showing only changes of commit d446d04ad7 - Show all commits

View file

@ -38,6 +38,7 @@
# This is a function that generates an attribute by calling a function you
# pass to it, with each system as an argument
forAllSystems = nixpkgs.lib.genAttrs systems;
vars = import ./vars.nix;
in {
# Your custom packages
# Accessible through 'nix build', 'nix shell', etc
@ -59,7 +60,7 @@
# Available through 'nixos-rebuild --flake .#your-hostname'
nixosConfigurations = {
adalbert = nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs outputs;};
specialArgs = {inherit inputs outputs vars;};
modules = [
./hosts/adalbert
];
@ -71,7 +72,7 @@
homeConfigurations = {
"ghoscht@adalbert" = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance
extraSpecialArgs = {inherit inputs outputs;};
extraSpecialArgs = {inherit inputs outputs vars;};
modules = [
./home/ghoscht/adalbert.nix
];

View file

@ -25,7 +25,6 @@
./hardware-configuration.nix
../common/global
../common/users/ghoscht
../common/optional/desktop/awesome.nix
../common/optional/systemd-boot.nix

View file

@ -2,11 +2,13 @@
{
inputs,
outputs,
config,
...
}: {
imports =
[
inputs.home-manager.nixosModules.home-manager
./user.nix
./fish.nix
./locale.nix
./nix.nix

View file

@ -1,11 +1,15 @@
{
inputs,
outputs,
pkgs,
config,
vars,
...
}: let
ifTheyExist = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups;
in {
users.users.ghoscht = {
imports = builtins.attrValues outputs.nixosModules; #propagates imports downwards
users.users.${vars.user} = {
isNormalUser = true;
shell = pkgs.fish;
extraGroups =
@ -38,5 +42,5 @@ in {
packages = [pkgs.home-manager];
};
home-manager.users.ghoscht = import ../../../../home/ghoscht/${config.networking.hostName}.nix;
home-manager.users.${vars.user} = import ../../../home/${vars.user}/${config.networking.hostName}.nix;
}

7
vars.nix Normal file
View file

@ -0,0 +1,7 @@
{
# Global variables used in NixOS and HomeManager which will probably never change
user = "ghoscht";
location = "$HOME/.setup";
terminal = "alacritty";
editor = "nvim";
}