Daholli/nixos-config
1
0
Fork 0
Code Issues 2 Pull requests Releases Packages Activity Actions

Compare commits

base: Daholli:46a599e19daf24221db19b24cf0356b5af4b2808
Branches Tags
Daholli:main
..
compare: Daholli:56da3287073bfc1e1a98f8af10a8c7db0c934c31
Branches Tags
Daholli:main

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

6 changed files with 120 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

53
modules/hosts/loptland/default.nix
View file

@ -19,28 +19,45 @@ topLevel: {
# TODO: dunno why I need this packge
environment.systemPackages = [ pkgs.dconf ];
imports = with topLevel.config.flake.modules.nixos; [
(modulesPath + "/profiles/qemu-guest.nix")
inputs.catppuccin.nixosModules.catppuccin
imports =
with topLevel.config.flake.modules.nixos;
[
(modulesPath + "/profiles/qemu-guest.nix")
inputs.catppuccin.nixosModules.catppuccin
# System modules
base
server
loptland-acme
hydra
forgejo
forgejo-runner
# System modules
base
server
loptland-acme
hydra
forgejo
forgejo-runner
# game server
minecraft-server
factorio-server
# game server
minecraft-server
factorio-server
# apps
# apps
# Users
cholli
root
];
# Users
cholli
]
++ [
{
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 = {
enable = true;

19
modules/hosts/nixberry/default.nix
View file

@ -52,7 +52,24 @@ topLevel: {
server
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 = {

29
modules/hosts/wsl/default.nix
View file

@ -12,14 +12,31 @@ topLevel: {
};
programs.dconf.enable = true;
imports = with topLevel.config.flake.modules.nixos; [
inputs.nixos-wsl.nixosModules.default
imports =
with topLevel.config.flake.modules.nixos;
[
inputs.nixos-wsl.nixosModules.default
base
server
cholli
];
base
server
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 = {
enable = true;
defaultUser = topLevel.config.flake.meta.users.cholli.username;

65
modules/hosts/yggdrasil/default.nix
View file

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

24
modules/users/cholli/default.nix
View file

@ -18,30 +18,8 @@ topLevel: {
modules = {
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;
sops.secrets.passwordHash.neededForUsers = true;

22
modules/users/root/default.nix
View file

@ -1,28 +1,8 @@
topLevel: {
flake = {
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;
sops.secrets.passwordHash.neededForUsers = true;