christoph/flake-nixinator
1
Fork 0
Code Activity

Switch HomeManager to module

Browse Source
This commit is contained in:
Christoph Urlacher
2022-07-01 15:20:33 +02:00
parent 3ac71088a2
commit 44ef8afeca
3 changed files with 62 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
flake.nix
View File

@ -23,31 +23,34 @@
# Outputs is a function that takes the inputs as arguments.
# To handle extra arguments we use the inputs@ pattern.
# It gives a name to the ... ellipses.
outputs = inputs @ { nixpkgs, home-manager, emacs-overlay, nur, ... }:
outputs = inputs @ { nixpkgs, home-manager, ... }:
# With let you can define local variables
let
# We bring these functions into the scope for the outputs.
inherit (builtins) attrValues; # TODO: What does this do
inherit (nixpkgs.lib) nixosSystem;
inherit (home-manager.lib) homeManagerConfiguration;
# inherit (nixpkgs.lib) nixosSystem;
# inherit (home-manager.lib) homeManagerConfiguration;
# Disabled since HomeManager module inherits these in extraSpecialArgs
# Add overlays from other flakes so we can use them from pkgs.
overlays = {
nur = nur.overlay;
emacs = emacs-overlay.overlay;
nur = inputs.nur.overlay;
emacs = inputs.emacs-overlay.overlay;
};
in
# The rec expression turns a basic set into a set where self-referencing is possible.
# It is a shorthand for recursive and allows to use the values defined in this set from its own scope.
rec {
# System configurations
# System configurations + HomeManager module
# Accessible via 'nixos-rebuild'
nixosConfigurations = {
# We give our configuration a name (the hostname) to choose a configuration when rebuilding.
# This makes it easy to add different configurations later (e.g. for a laptop).
# Usage: sudo nixos-rebuild switch --flake .#nixinator
nixinator = nixosSystem {
nixinator = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
# >> Main NixOS configuration file <<
@ -55,44 +58,61 @@
# TODO: Modularize
./nixos/configuration.nix
# Add the overlays
# { nixpkgs.overlays = attrValues overlays; } # I only really need them for HomeManager
# TODO: Investigate this { ... } module syntax
# Overlays
{
# Since HomeManager uses global pkgs we can set the overlays here
nixpkgs.overlays = attrValues overlays;
}
# HomeManager
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true; # Use systems pkgs, disables nixpkgs.* options in home.nix
home-manager.useUserPackages = true; # Enable installing packages through users.christoph.packages
home-manager.users.christoph = import ./home/home.nix;
# Make our overlays available in home.nix
home-manager.extraSpecialArgs = { inherit inputs; };
}
];
# Make our inputs available to the config (for importing modules)
# Make our inputs available to the configuration.nix (for importing modules)
specialArgs = { inherit inputs; };
};
};
# Home configurations
# Home configurations standalone
# Accessible via 'home-manager'
homeConfigurations = {
# We give our configuration a name (the user + hostname).
# This makes it easy to add configurations for different users/PCs.
# Usage: home-manager switch --flake .#christoph@nixinator
"christoph@nixinator" = homeManagerConfiguration rec {
pkgs = nixpkgs.legacyPackages."x86_64-linux"; # HomeManager needs this since 22.11 release
# homeConfigurations = {
# # We give our configuration a name (the user + hostname).
# # This makes it easy to add configurations for different users/PCs.
# # Usage: home-manager switch --flake .#christoph@nixinator
# "christoph@nixinator" = home-manager.lib.homeManagerConfiguration rec {
# pkgs = nixpkgs.legacyPackages."x86_64-linux"; # HomeManager needs this since 22.11 release
modules = [
# >> Main HomeManager configuration file <<
./home/home.nix
# modules = [
# # >> Main HomeManager configuration file <<
# ./home/home.nix
{
home = rec {
username = "christoph";
homeDirectory = "/home/${username}";
stateVersion = "22.05";
};
# {
# home = rec {
# username = "christoph";
# homeDirectory = "/home/${username}";
# stateVersion = "22.05";
# };
# Add the overlays
# TODO: I guess attrValues unpacks the overlays set or smth?
nixpkgs.overlays = attrValues overlays;
}
];
# # Add the overlays
# # TODO: I guess attrValues unpacks the overlays set or smth?
# nixpkgs.overlays = attrValues overlays;
# }
# ];
# Make our inputs available to the config (for importing modules)
extraSpecialArgs = { inherit inputs; };
};
};
# # Make our inputs available to the config (for importing modules)
# extraSpecialArgs = {
# inherit inputs;
# };
# };
# };
};
}

9
home/home.nix
View File

@ -9,9 +9,10 @@
# Feel free to split up your configuration and import pieces of it here.
];
# Disabled since HomeManager should use global pkgs
# https://github.com/nix-community/home-manager/issues/2942
nixpkgs.config.allowUnfreePredicate = (pkg: true);
nixpkgs.config.allowUnfree = true;
# nixpkgs.config.allowUnfreePredicate = (pkg: true);
# nixpkgs.config.allowUnfree = true;
# Chinese Input
i18n.inputMethod.enabled = "fcitx5";
@ -92,7 +93,7 @@
settings = {
"app.update.auto" = false;
# "browser.startup.homepage" = "https://lobste.rs";
"identity.fxaccounts.account.device.name" = "nixinator"; # TODO: I want to pass the toplevel config to use config.networking.hostName
"identity.fxaccounts.account.device.name" = "nixinator"; # TODO: I want to pass the toplevel config to use config.networking.hostName, there seems to be an attribute nixosConfig for that but it didn't work
"signon.rememberSignons" = false;
# "browser.urlbar.placeholderName" = "DuckDuckGo";
# "toolkit.legacyUserProfileCustomizations.stylesheets" = true;
@ -301,4 +302,6 @@
# Nicely reload system units when changing configs
systemd.user.startServices = "sd-switch";
home.stateVersion = "22.05";
}

1
nixos/configuration.nix
View File

@ -44,6 +44,7 @@
'';
# Allow unfree packages
# Since we use HomeManager as a module with global pkgs this should also cover user packages
nixpkgs.config.allowUnfree = true;
# Bootloader/Kernel stuff