bryan/nixos
0
0
Fork 0
mirror of https://github.com/itme-brain/nixos.git synced 2026-03-23 16:29:42 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Modularized user declarations in flake

Browse source
This commit is contained in:
Bryan Ramos 2024-02-09 05:53:16 -05:00
parent 6e6e06136a
commit 49f8b3f33c
Signed by: bryan
GPG key ID: 6ABDCD144D6643C8
4 changed files with 90 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

30
flake.nix
View file

@ -1,5 +1,5 @@
{ {
description = "Nix Flake Configurations for Bryan"; description = "My NixOS Configs";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
@ -30,11 +30,7 @@
modules = [ modules = [
./src/systems/desktop ./src/systems/desktop
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ (import ./src/systems/desktop/home.nix)
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.bryan = import ./src/systems/desktop/home.nix;
}
]; ];
}; };
nixosConfigurations.windows = nixpkgs.lib.nixosSystem { nixosConfigurations.windows = nixpkgs.lib.nixosSystem {
@ -42,27 +38,9 @@
modules = [ modules = [
./src/systems/wsl ./src/systems/wsl
nixos-wsl.nixosModules.wsl nixos-wsl.nixosModules.wsl
{ (import ./src/systems/wsl/wsl.nix)
wsl = {
enable = true;
defaultUser = nixpkgs.lib.mkDefault "bryan";
nativeSystemd = true;
wslConf = {
boot.command = "cd";
network = {
hostname = "plato";
generateHosts = true;
};
};
};
}
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
{ (import ./src/systems/wsl/home.nix)
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.bryan = import ./src/systems/wsl/home.nix;
}
]; ];
}; };
}; };

72
src/systems/desktop/home.nix
View file

@ -1,43 +1,47 @@
{ config, ... }: { config, ... }:
{ {
programs.home-manager.enable = true; home-manager.useGlobalPkgs = true;
programs.bash.shellAliases = { home-manager.useUserPackages = true;
nixup = "sudo nixos-rebuild switch --flake /etc/nixos/.#desktop"; home-manager.users.${config.user.name} = {
}; imports = [
../../user
../../modules
];
imports = [ programs.home-manager.enable = true;
../../modules programs.bash.shellAliases = {
../../user nixup = "sudo nixos-rebuild switch --flake /etc/nixos/.#desktop";
];
home.stateVersion = "22.11";
home.username = "${config.user.name}";
home.homeDirectory = "/home/${config.user.name}";
modules = {
bash.enable = true;
git.enable = true;
gpg.enable = true;
security.enable = true;
utils = {
enable = true;
dev.enable = true;
irc.enable = true;
vim.enable = false;
}; };
gui = { home.stateVersion = "22.11";
enable = true;
alacritty.enable = true; home.username = "${config.user.name}";
browsers.enable = true; home.homeDirectory = "/home/${config.user.name}";
corn.enable = true;
fun.enable = true; modules = {
neovim.enable = true; bash.enable = true;
utils.enable = true; git.enable = true;
writing.enable = true; gpg.enable = true;
security.enable = true;
utils = {
enable = true;
dev.enable = true;
irc.enable = true;
vim.enable = false;
};
gui = {
enable = true;
alacritty.enable = true;
browsers.enable = true;
corn.enable = true;
fun.enable = true;
neovim.enable = true;
utils.enable = true;
writing.enable = true;
};
}; };
}; };
} }

50
src/systems/wsl/home.nix
View file

@ -1,33 +1,37 @@
{ config, ... }: { config, ... }:
{ {
programs.home-manager.enable = true; home-manager.useGlobalPkgs = true;
programs.bash.shellAliases = { home-manager.useUserPackages = true;
nixup = "sudo nixos-rebuild switch --flake /etc/nixos/.#windows"; home-manager.users.${config.user.name} = {
}; programs.home-manager.enable = true;
programs.bash.shellAliases = {
nixup = "sudo nixos-rebuild switch --flake /etc/nixos/.#windows";
};
imports = [ imports = [
../../modules ../../modules
../../user ../../user
]; ];
home.stateVersion = "23.11"; home.stateVersion = "23.11";
home.username = "${config.user.name}"; home.username = "${config.user.name}";
home.homeDirectory = "/home/${config.user.name}"; home.homeDirectory = "/home/${config.user.name}";
modules = { modules = {
bash.enable = true; bash.enable = true;
git.enable = true; git.enable = true;
gpg.enable = true; gpg.enable = true;
gui.enable = false; gui.enable = false;
security.enable = true; security.enable = true;
utils = { utils = {
enable = true; enable = true;
dev.enable = true; dev.enable = true;
email.enable = true; email.enable = true;
irc.enable = true; irc.enable = true;
vim.enable = true; vim.enable = true;
};
}; };
}; };
} }

21
src/systems/wsl/wsl.nix Normal file
View file

@ -0,0 +1,21 @@
{ pkgs, config, ... }:
{
imports = [
../../user
];
wsl = {
enable = true;
defaultUser = pkgs.lib.mkDefault "${config.user.name}";
nativeSystemd = true;
wslConf = {
boot.command = "cd";
network = {
hostname = "plato";
generateHosts = true;
};
};
};
}