Nebucatnetzer
/
nixos
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove the custom.username parameter

This commit is contained in:
Andreas Zweili 2023-05-29 14:58:49 +02:00
parent 05474fdfa7
commit 5e971272f3
10 changed files with 56 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
custom/default.nix
View File

@ -1,4 +1,3 @@
{ inputs }: {
username = "andreas";
inputs = inputs;
}

5
home-manager/common/default.nix
View File

@ -1,11 +1,10 @@
{ custom }: { pkgs, ... }:
{ config, pkgs, ... }:
{
# Home Manager needs a bit of information about you and the
# paths it should manage.
programs.home-manager.enable = true;
home = {
username = custom.username;
homeDirectory = "/home/${custom.username}";
homeDirectory = "/home/${config.home.username}";
stateVersion = "22.11";
sessionVariables = {
EDITOR = "vim";

41
home-manager/desktop.nix
View File

@ -1,10 +1,10 @@
{ custom, system }: { config, pkgs, ... }:
{ custom, system }: { config, nixosConfig, pkgs, ... }:
let
unstable = import custom.inputs.nixpkgs-unstable { inherit system; };
in
{
imports = [
(import "${custom.inputs.self}/home-manager/common" { inherit custom; })
"${custom.inputs.self}/home-manager/common"
"${custom.inputs.self}/home-manager/software/alacritty"
"${custom.inputs.self}/home-manager/software/ansible"
"${custom.inputs.self}/home-manager/software/calibre"
@ -30,22 +30,25 @@ in
"${custom.inputs.self}/home-manager/software/work-desktop"
"${custom.inputs.self}/home-manager/software/yt-dlp"
];
home.packages = with pkgs; [
digikam
exercism
freetube
chromium
libreoffice-fresh
meld
nodejs # needed for ansible-language-server
nodePackages.prettier # formatting files
pulseaudio # required for volume controls in qtile
plexamp
remmina
shotwell
sound-juicer
unstable.tagger
];
home = {
username = nixosConfig.az-username;
packages = with pkgs; [
digikam
exercism
freetube
chromium
libreoffice-fresh
meld
nodejs # needed for ansible-language-server
nodePackages.prettier # formatting files
pulseaudio # required for volume controls in qtile
plexamp
remmina
shotwell
sound-juicer
unstable.tagger
];
};
programs.git.userEmail = "andreas@zweili.ch";
# raw config files
@ -67,7 +70,7 @@ in
}
'';
shellAliases = {
management-server = "mosh ${custom.username}@10.7.89.150 -- tmux new -A -s 0";
management-server = "mosh ${config.home.username}@10.7.89.150 -- tmux new -A -s 0";
work-management = "mosh --ssh='ssh -i ~/.ssh/zweili.key' zweili@10.49.0.100 -- tmux new -A -s 0";
};
};

5
home-manager/headless.nix
View File

@ -1,13 +1,14 @@
{ custom, system }: { ... }:
{ custom, system }: { config, nixosConfig, ... }:
{
imports = [
(import "${custom.inputs.self}/home-manager/common" { inherit custom; })
"${custom.inputs.self}/home-manager/common"
"${custom.inputs.self}/home-manager/software/fzf"
"${custom.inputs.self}/home-manager/software/git"
"${custom.inputs.self}/home-manager/software/vim"
"${custom.inputs.self}/home-manager/software/starship"
];
home.username = nixosConfig.az-username;
programs.git.userEmail = "andreas@zweili.ch";
programs.bash = {

5
home-manager/management.nix
View File

@ -1,10 +1,10 @@
{ custom, system }: { pkgs, ... }:
{ custom, system }: { config, nixosConfig, pkgs, ... }:
let
unstable = import custom.inputs.nixpkgs-unstable { inherit system; };
in
{
imports = [
(import "${custom.inputs.self}/home-manager/common" { inherit custom; })
"${custom.inputs.self}/home-manager/common"
(import "${custom.inputs.self}/home-manager/software/emacs" { inherit unstable; })
"${custom.inputs.self}/home-manager/software/fzf"
"${custom.inputs.self}/home-manager/software/git"
@ -13,6 +13,7 @@ in
"${custom.inputs.self}/home-manager/software/vim"
];
home.username = nixosConfig.az-username;
home.packages = with pkgs; [
exercism
nodePackages.prettier # formatting files

6
home-manager/ubuntu.nix
View File

@ -1,10 +1,12 @@
{ custom, inputs }: { ... }:
{ custom, inputs }: { config, nixosConfig, ... }:
{
imports = [
(import "${custom.inputs.self}/home-manager/common" { inherit custom; })
"${custom.inputs.self}/home-manager/common"
"${custom.inputs.self}/home-manager/software/git"
];
home.username = nixosConfig.az-username;
programs.git.userEmail = "andreas@zweili.ch";
programs.bash = {

19
home-manager/work-wsl.nix
View File

@ -4,9 +4,7 @@ let
in
{
imports = [
(import "${custom.inputs.self}/home-manager/common" {
custom = { username = "zweili"; version = "22.11"; };
})
"${custom.inputs.self}/home-manager/common"
"${custom.inputs.self}/home-manager/software/ansible"
(import "${custom.inputs.self}/home-manager/software/emacs" { inherit unstable; })
"${custom.inputs.self}/home-manager/software/fzf"
@ -22,12 +20,15 @@ in
nix-direnv.enable = true;
};
home.sessionPath = [ "$HOME/node_modules/.bin" ];
home.packages = with pkgs; [
keychain
nixpkgs-fmt
mosh
];
home = {
username = "zweili";
sessionPath = [ "$HOME/node_modules/.bin" ];
home.packages = with pkgs; [
keychain
nixpkgs-fmt
mosh
];
};
nix = {
package = pkgs.nix;
settings = {

9
lib/mk_computer.nix
View File

@ -1,4 +1,4 @@
{ custom, hostname, system ? "x86_64-linux", home-module ? "headless" }:
{ custom, hostname, system ? "x86_64-linux", home-module ? "headless", username ? "andreas" }:
let
overlay-unstable = final: prev: {
unstable = import custom.inputs.nixpkgs-unstable {
@ -45,13 +45,16 @@ custom.inputs.nixpkgs.lib.nixosSystem
"${custom.inputs.self}/hardware/default.nix"
custom.inputs.agenix.nixosModules.age
{ environment.systemPackages = [ custom.inputs.agenix.packages.${system}.default ]; }
{
environment.systemPackages = [ custom.inputs.agenix.packages.${system}.default ];
az-username = username;
}
custom.inputs.home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.${custom.username}.imports = [
home-manager.users.andreas.imports = [
(import "${custom.inputs.self}/home-manager/${home-module}.nix" { inherit custom system; })
];
}

9
lib/mk_raspi.nix
View File

@ -1,4 +1,4 @@
{ custom, hostname, system ? "aarch64-linux", home-module ? "headless" }:
{ custom, hostname, system ? "aarch64-linux", home-module ? "headless", username ? "andreas" }:
let
overlay-unstable = final: prev: {
unstable = import custom.inputs.nixpkgs-unstable {
@ -40,13 +40,16 @@ custom.inputs.nixpkgs.lib.nixosSystem {
"${custom.inputs.self}/hardware/default.nix"
custom.inputs.agenix.nixosModules.age
{ environment.systemPackages = [ custom.inputs.agenix.packages.${system}.default ]; }
{
environment.systemPackages = [ custom.inputs.agenix.packages.${system}.default ];
az-username = username;
}
custom.inputs.home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.${custom.username}.imports = [
home-manager.users.${username}.imports = [
(import "${custom.inputs.self}/home-manager/${home-module}.nix" { inherit custom system; })
];
}

1
modules/common/default.nix
View File

@ -123,7 +123,6 @@
}
];
};
az-username = "andreas";
# This value determines the NixOS release from which the default