cleaned up server and laptop home.nix files, along with the homeConfigurations for them
This commit is contained in:
pagedmov
@@ -1,13 +1,9 @@
|
||||
{
|
||||
username,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}:
|
||||
{
|
||||
{ username, lib, config, ... }: {
|
||||
home.username = "${username}"; # Replace with your actual username
|
||||
home.homeDirectory = "/home/${username}"; # Replace with your actual home directory
|
||||
home.stateVersion = "24.05"; # Adjust this based on your system's NixOS version
|
||||
home.homeDirectory =
|
||||
"/home/${username}"; # Replace with your actual home directory
|
||||
home.stateVersion =
|
||||
"24.05"; # Adjust this based on your system's NixOS version
|
||||
|
||||
programs.home-manager.enable = true;
|
||||
|
||||
@@ -16,29 +12,29 @@
|
||||
homeFiles.enable = true;
|
||||
|
||||
# modules/home/environment
|
||||
hyprlandConfig.enable = true;
|
||||
autojumpConfig.enable = true;
|
||||
hyprlandConfig.enable = true;
|
||||
autojumpConfig.enable = true;
|
||||
stylixHomeConfig.enable = true;
|
||||
waybarConfig.enable = true;
|
||||
gtkConfig.enable = true;
|
||||
spicetifyConfig.enable = true;
|
||||
starshipConfig.enable = true;
|
||||
waybarConfig.enable = true;
|
||||
gtkConfig.enable = true;
|
||||
spicetifyConfig.enable = true;
|
||||
starshipConfig.enable = true;
|
||||
|
||||
# modules/home/programs
|
||||
btopConfig.enable = true;
|
||||
swayncConfig.enable = true;
|
||||
userPkgs.enable = true;
|
||||
cavaConfig.enable = true;
|
||||
ezaConfig.enable = true;
|
||||
firefoxConfig.enable = true;
|
||||
fuzzelConfig.enable = true;
|
||||
fzfConfig.enable = true;
|
||||
gitConfig.enable = true;
|
||||
kittyConfig.enable = true;
|
||||
yaziConfig.enable = true;
|
||||
zshConfig.enable = true;
|
||||
passConfig.enable = true;
|
||||
batConfig.enable = true;
|
||||
btopConfig.enable = true;
|
||||
swayncConfig.enable = true;
|
||||
userPkgs.enable = true;
|
||||
cavaConfig.enable = true;
|
||||
ezaConfig.enable = true;
|
||||
firefoxConfig.enable = true;
|
||||
fuzzelConfig.enable = true;
|
||||
fzfConfig.enable = true;
|
||||
gitConfig.enable = true;
|
||||
kittyConfig.enable = true;
|
||||
yaziConfig.enable = true;
|
||||
zshConfig.enable = true;
|
||||
passConfig.enable = true;
|
||||
batConfig.enable = true;
|
||||
|
||||
# modules/home/scripts
|
||||
movScripts.enable = true;
|
||||
@@ -49,8 +45,8 @@
|
||||
|
||||
dconf.settings = {
|
||||
"org/virt-manager/virt-manager/connections" = {
|
||||
autoconnect = ["qemu:///system"];
|
||||
uris = ["qemu:///system"];
|
||||
autoconnect = [ "qemu:///system" ];
|
||||
uris = [ "qemu:///system" ];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,93 +1,47 @@
|
||||
{
|
||||
host,
|
||||
pkgs,
|
||||
self,
|
||||
inputs,
|
||||
username,
|
||||
lib,
|
||||
config,
|
||||
...
|
||||
}: let
|
||||
nur = config.nur;
|
||||
in {
|
||||
imports = [inputs.home-manager.nixosModules.home-manager];
|
||||
home-manager = {
|
||||
useUserPackages = true;
|
||||
useGlobalPkgs = true;
|
||||
backupFileExtension = "backup";
|
||||
extraSpecialArgs = {inherit self inputs host username nur;};
|
||||
users = {
|
||||
${username} = {
|
||||
programs.home-manager.enable = true;
|
||||
imports = [
|
||||
inputs.self.outputs.homeManagerModules.default
|
||||
];
|
||||
{ host, pkgs, self, inputs, username, lib, config, ... }: {
|
||||
home.username = "${username}"; # Replace with your actual username
|
||||
home.homeDirectory =
|
||||
"/home/${username}"; # Replace with your actual home directory
|
||||
home.stateVersion =
|
||||
"24.05"; # Adjust this based on your system's NixOS version
|
||||
|
||||
# My custom home-manager modules
|
||||
programs.home-manager.enable = true;
|
||||
|
||||
# modules/home/files
|
||||
homeFiles.enable = true;
|
||||
movOpts = {
|
||||
# modules/home/files
|
||||
homeFiles.enable = true;
|
||||
|
||||
# modules/home/environment
|
||||
hyprlandConfig.enable = true;
|
||||
autojumpConfig.enable = true;
|
||||
stylixHomeConfig.enable = true;
|
||||
waybarConfig.enable = true;
|
||||
gtkConfig.enable = true;
|
||||
spicetifyConfig.enable = true;
|
||||
starshipConfig.enable = true;
|
||||
# modules/home/environment
|
||||
hyprlandConfig.enable = true;
|
||||
autojumpConfig.enable = true;
|
||||
stylixHomeConfig.enable = true;
|
||||
waybarConfig.enable = true;
|
||||
gtkConfig.enable = true;
|
||||
spicetifyConfig.enable = true;
|
||||
starshipConfig.enable = true;
|
||||
|
||||
# modules/home/programs
|
||||
btopConfig.enable = true;
|
||||
swayncConfig.enable = true;
|
||||
userPkgs.enable = true;
|
||||
cavaConfig.enable = true;
|
||||
ezaConfig.enable = true;
|
||||
firefoxConfig.enable = true;
|
||||
fuzzelConfig.enable = true;
|
||||
fzfConfig.enable = true;
|
||||
gitConfig.enable = true;
|
||||
kittyConfig.enable = true;
|
||||
yaziConfig.enable = true;
|
||||
zshConfig.enable = true;
|
||||
passConfig.enable = true;
|
||||
batConfig.enable = true;
|
||||
# modules/home/programs
|
||||
btopConfig.enable = true;
|
||||
swayncConfig.enable = true;
|
||||
userPkgs.enable = true;
|
||||
cavaConfig.enable = true;
|
||||
ezaConfig.enable = true;
|
||||
firefoxConfig.enable = true;
|
||||
fuzzelConfig.enable = true;
|
||||
fzfConfig.enable = true;
|
||||
gitConfig.enable = true;
|
||||
kittyConfig.enable = true;
|
||||
yaziConfig.enable = true;
|
||||
zshConfig.enable = true;
|
||||
passConfig.enable = true;
|
||||
batConfig.enable = true;
|
||||
|
||||
# modules/home/scripts
|
||||
movScripts.enable = true;
|
||||
movScripts.commandScripts.enable = true;
|
||||
movScripts.hyprlandControls.enable = true;
|
||||
movScripts.nixShortcuts.enable = true;
|
||||
|
||||
dconf.settings = lib.mkIf config.movOpts.virtConfig.enable {
|
||||
"org/virt-manager/virt-manager/connections" = {
|
||||
autoconnect = ["qemu:///system"];
|
||||
uris = ["qemu:///system"];
|
||||
};
|
||||
};
|
||||
home = {
|
||||
username = "${username}";
|
||||
homeDirectory = "/home/${username}";
|
||||
stateVersion = "24.05";
|
||||
};
|
||||
};
|
||||
# modules/home/scripts
|
||||
movScripts = {
|
||||
enable = true;
|
||||
commandScripts.enable = true;
|
||||
hyprlandControls.enable = true;
|
||||
nixShortcuts.enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
users = {
|
||||
groups.persist = {};
|
||||
users = {
|
||||
root.initialPassword = "1234";
|
||||
${username} = {
|
||||
isNormalUser = true;
|
||||
initialPassword = "1234";
|
||||
shell = pkgs.zsh;
|
||||
extraGroups = ["wheel" "persist" "libvirtd"];
|
||||
};
|
||||
};
|
||||
};
|
||||
security.sudo.extraConfig = ''
|
||||
${username} ALL=(ALL) NOPASSWD: /etc/profiles/per-user/${username}/bin/rebuild
|
||||
'';
|
||||
nix.settings.allowed-users = ["${username}"];
|
||||
}
|
||||
|
||||
@@ -1,75 +1,34 @@
|
||||
{
|
||||
host,
|
||||
pkgs,
|
||||
self,
|
||||
inputs,
|
||||
lib,
|
||||
username,
|
||||
config,
|
||||
...
|
||||
}: let
|
||||
nur = config.nur;
|
||||
movModules = inputs.self.outputs.homeManagerModules.default;
|
||||
in {
|
||||
imports = [inputs.home-manager.nixosModules.home-manager];
|
||||
home-manager = {
|
||||
useUserPackages = true;
|
||||
useGlobalPkgs = true;
|
||||
backupFileExtension = "backup";
|
||||
extraSpecialArgs = { inherit self inputs host username nur; };
|
||||
users = {
|
||||
${username} = {
|
||||
programs.home-manager.enable = true;
|
||||
imports = [ movModules ];
|
||||
autojumpConfig.enable = true;
|
||||
btopConfig.enable = true;
|
||||
starshipConfig.enable = true;
|
||||
ezaConfig.enable = true;
|
||||
fzfConfig.enable = true;
|
||||
gitConfig.enable = true;
|
||||
yaziConfig.enable = true;
|
||||
zshConfig.enable = true;
|
||||
batConfig.enable = true;
|
||||
userPkgs.enable = true;
|
||||
{ host, pkgs, self, inputs, lib, username, config, ... }: {
|
||||
|
||||
movScripts = {
|
||||
enable = true;
|
||||
nixShortcuts.enable = true;
|
||||
commandScripts = {
|
||||
enable = true;
|
||||
toolbelt.enable = false;
|
||||
};
|
||||
hyprlandControls = {
|
||||
scheck.enable = true;
|
||||
};
|
||||
};
|
||||
home.username = "${username}"; # Replace with your actual username
|
||||
home.homeDirectory =
|
||||
"/home/${username}"; # Replace with your actual home directory
|
||||
home.stateVersion =
|
||||
"24.05"; # Adjust this based on your system's NixOS version
|
||||
|
||||
home = {
|
||||
username = "${username}";
|
||||
homeDirectory = "/home/${username}";
|
||||
stateVersion = "24.05";
|
||||
};
|
||||
};
|
||||
programs.home-manager.enable = true;
|
||||
|
||||
movOpts = {
|
||||
# modules/home/environment
|
||||
autojumpConfig.enable = true;
|
||||
starshipConfig.enable = true;
|
||||
zshConfig.enable = true;
|
||||
|
||||
# modules/home/programs
|
||||
btopConfig.enable = true;
|
||||
userPkgs.enable = true;
|
||||
ezaConfig.enable = true;
|
||||
fzfConfig.enable = true;
|
||||
gitConfig.enable = true;
|
||||
yaziConfig.enable = true;
|
||||
batConfig.enable = true;
|
||||
|
||||
# modules/home/scripts
|
||||
movScripts = {
|
||||
enable = true;
|
||||
commandScripts.enable = true;
|
||||
hyprlandControls.enable = true;
|
||||
nixShortcuts.enable = true;
|
||||
};
|
||||
};
|
||||
|
||||
users = {
|
||||
users = {
|
||||
root.initialPassword = "1234";
|
||||
${username} = {
|
||||
isNormalUser = true;
|
||||
createHome = true;
|
||||
home = "/home/pagedmov";
|
||||
homeMode = "755";
|
||||
initialPassword = "1234";
|
||||
shell = pkgs.zsh;
|
||||
extraGroups = [ "wheel" ];
|
||||
};
|
||||
jellyfin.extraGroups = [ "users" ];
|
||||
};
|
||||
};
|
||||
security.sudo.extraConfig = ''
|
||||
${username} ALL=(ALL) NOPASSWD: /etc/profiles/per-user/${username}/bin/rebuild
|
||||
'';
|
||||
nix.settings.allowed-users = ["${username}"];
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user