Compare commits

..

No commits in common. "46a599e19daf24221db19b24cf0356b5af4b2808" and "56da3287073bfc1e1a98f8af10a8c7db0c934c31" have entirely different histories.

6 changed files with 120 additions and 92 deletions

View file

@ -19,28 +19,45 @@ topLevel: {
# TODO: dunno why I need this packge # TODO: dunno why I need this packge
environment.systemPackages = [ pkgs.dconf ]; environment.systemPackages = [ pkgs.dconf ];
imports = with topLevel.config.flake.modules.nixos; [ imports =
(modulesPath + "/profiles/qemu-guest.nix") with topLevel.config.flake.modules.nixos;
inputs.catppuccin.nixosModules.catppuccin [
(modulesPath + "/profiles/qemu-guest.nix")
inputs.catppuccin.nixosModules.catppuccin
# System modules # System modules
base base
server server
loptland-acme loptland-acme
hydra hydra
forgejo forgejo
forgejo-runner forgejo-runner
# game server # game server
minecraft-server minecraft-server
factorio-server factorio-server
# apps # apps
# Users # Users
cholli cholli
root ]
]; ++ [
{
home-manager.users.cholli = {
imports = with topLevel.config.flake.modules.homeManager; [
inputs.catppuccin.homeModules.catppuccin
# components
base
# Activate all user based config
cholli
];
};
}
];
services.tailscale = { services.tailscale = {
enable = true; enable = true;

View file

@ -52,7 +52,24 @@ topLevel: {
server server
cholli cholli
root ]
++ [
{
home-manager.users.cholli = {
imports = with topLevel.config.flake.modules.homeManager; [
inputs.catppuccin.homeModules.catppuccin
# components
base
# Activate all user based config
cholli
];
# https://github.com/NixOS/nixpkgs/pull/398456
home.enableNixpkgsReleaseCheck = false;
};
}
]; ];
services.tailscale = { services.tailscale = {

View file

@ -12,14 +12,31 @@ topLevel: {
}; };
programs.dconf.enable = true; programs.dconf.enable = true;
imports = with topLevel.config.flake.modules.nixos; [ imports =
inputs.nixos-wsl.nixosModules.default with topLevel.config.flake.modules.nixos;
[
inputs.nixos-wsl.nixosModules.default
base base
server server
cholli cholli
]; ]
++ [
{
home-manager.users.cholli = {
imports = with topLevel.config.flake.modules.homeManager; [
inputs.catppuccin.homeModules.catppuccin
# components
base
# Activate all user based config
cholli
];
};
}
];
wsl = { wsl = {
enable = true; enable = true;
defaultUser = topLevel.config.flake.meta.users.cholli.username; defaultUser = topLevel.config.flake.meta.users.cholli.username;

View file

@ -31,6 +31,7 @@ in
termscp termscp
nixpkgs-review nixpkgs-review
# inputs.nix-gaming.packages.${pkgs.stdenv.hostPlatform.system}.star-citizen
]; ];
services.teamviewer.enable = true; services.teamviewer.enable = true;
@ -40,34 +41,52 @@ in
AddressFamily inet AddressFamily inet
''; '';
imports = with config.flake.modules.nixos; [ imports =
inputs.nixos-hardware.nixosModules.common-cpu-amd with config.flake.modules.nixos;
inputs.nixos-hardware.nixosModules.common-pc [
inputs.nixos-hardware.nixosModules.common-pc-ssd inputs.nixos-hardware.nixosModules.common-cpu-amd
inputs.catppuccin.nixosModules.catppuccin inputs.nixos-hardware.nixosModules.common-pc
inputs.nixos-hardware.nixosModules.common-pc-ssd
inputs.catppuccin.nixosModules.catppuccin
# System modules # System modules
base base
dev dev
desktop desktop
games games
# hardware # hardware
audio audio
bluetooth bluetooth
amdgpu amdgpu
# desktops # desktops
# hyprland # hyprland
niri niri
# apps # apps
_1password _1password
# Users # Users
cholli cholli
root ]
]; ++ [
{
home-manager.users.cholli = {
imports = with config.flake.modules.homeManager; [
inputs.catppuccin.homeModules.catppuccin
# components
base
dev
# Activate all user based config
cholli
];
};
}
];
nix = { nix = {
distributedBuilds = true; distributedBuilds = true;

View file

@ -18,30 +18,8 @@ topLevel: {
modules = { modules = {
nixos.cholli = nixos.cholli =
{ config, pkgs, ... }:
{ {
config,
inputs,
pkgs,
...
}:
{
imports = [
{
home-manager.users.cholli = {
imports = with topLevel.config.flake.modules.homeManager; [
inputs.catppuccin.homeModules.catppuccin
# components
base
dev
# Activate all user based config
cholli
];
};
}
];
programs.fish.enable = true; programs.fish.enable = true;
sops.secrets.passwordHash.neededForUsers = true; sops.secrets.passwordHash.neededForUsers = true;

View file

@ -1,28 +1,8 @@
topLevel: { topLevel: {
flake = { flake = {
modules.nixos.root = modules.nixos.root =
{ config, pkgs, ... }:
{ {
config,
inputs,
pkgs,
...
}:
{
imports = [
{
home-manager.users.root = {
imports = with topLevel.config.flake.modules.homeManager; [
inputs.catppuccin.homeModules.catppuccin
# components
base
# Activate all user based config
cholli # TODO: make root based config that makes it clear I am root user right now
];
};
}
];
programs.fish.enable = true; programs.fish.enable = true;
sops.secrets.passwordHash.neededForUsers = true; sops.secrets.passwordHash.neededForUsers = true;