some refactoring
This commit is contained in:
@@ -39,8 +39,8 @@ in {
|
||||
nixconfig = "cd /home/$USER/.nix-config/";
|
||||
homemodules = "$EDITOR /home/$USER/.nix-config/users/$USER/modules/{$hostname}mod.nix";
|
||||
hmod = "$EDITOR /home/$USER/.nix-config/users/$USER/modules/{$hostname}mod.nix";
|
||||
homeoptions = "$EDITOR /home/$USER/.nix-config/users/$USER/modules/{$hostname}opt.nix";
|
||||
hopt = "$EDITOR /home/$USER/.nix-config/users/$USER/modules/{$hostname}opt.nix";
|
||||
nixoptions = "$EDITOR /home/$USER/.nix-config/hosts/$hostname/options.nix";
|
||||
nopt = "$EDITOR /home/$USER/.nix-config/hosts/$hostname/options.nix";
|
||||
nixosmodules = "$EDITOR /home/$USER/.nix-config/hosts/$hostname/modules.nix";
|
||||
nmod = "$EDITOR /home/$USER/.nix-config/hosts/$hostname/modules.nix";
|
||||
tree = "${getExe eza} --tree --icons=always";
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
osConfig,
|
||||
...
|
||||
}: let
|
||||
inherit (lib) mkIf mkEnableOption;
|
||||
@@ -14,8 +15,8 @@ in {
|
||||
home.packages = [pkgs.gh];
|
||||
programs.git = {
|
||||
enable = true;
|
||||
userName = config.accounts.username;
|
||||
userEmail = config.accounts.mail;
|
||||
userName = osConfig.accounts.username;
|
||||
userEmail = osConfig.accounts.mail;
|
||||
delta = {
|
||||
enable = true;
|
||||
options.dark = true;
|
||||
@@ -53,7 +54,7 @@ in {
|
||||
];
|
||||
};
|
||||
xdg.configFile."git/allowed_signers".text = ''
|
||||
${config.accounts.mail} namespaces="git" ${config.accounts.sshKey}
|
||||
${osConfig.accounts.mail} namespaces="git" ${osConfig.accounts.sshKey}
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
osConfig,
|
||||
...
|
||||
}: let
|
||||
inherit (lib) mkIf mkEnableOption;
|
||||
@@ -30,7 +31,7 @@ in {
|
||||
background = [
|
||||
{
|
||||
monitor = "";
|
||||
path = config.theme.background.lockscreen;
|
||||
path = osConfig.theme.background.lockscreen;
|
||||
}
|
||||
];
|
||||
input-field = [
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
lib,
|
||||
pkgs,
|
||||
inputs,
|
||||
osConfig,
|
||||
...
|
||||
}: let
|
||||
inherit (lib) mkIf mkEnableOption;
|
||||
@@ -41,13 +42,13 @@ in {
|
||||
];
|
||||
|
||||
wallpaper = [
|
||||
# cnixtop
|
||||
"DP-3,${config.theme.background.desktop}"
|
||||
"DP-4,${config.theme.background.desktop}"
|
||||
# cnixpad
|
||||
"eDP-1,${config.theme.background.desktop}"
|
||||
# kima
|
||||
"DP-3,${osConfig.theme.background.desktop}"
|
||||
"HDMI-A-1,${osConfig.theme.background.lockscreen}"
|
||||
# bunk
|
||||
"eDP-1,${osConfig.theme.background.desktop}"
|
||||
# toothpc
|
||||
"DVI-D-1,${config.theme.background.desktop}"
|
||||
"DVI-D-1,${osConfig.theme.background.desktop}"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user