fw/nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

huge change

Browse source
This commit is contained in:
fwastring 2025-11-12 10:12:29 +01:00
parent c159d2f3e3
commit d86cc3c816
29 changed files with 1151 additions and 792 deletions
Download patch file Download diff file Expand all files Collapse all files

67
maskiner/core/configuration.nix
View file

@ -10,7 +10,7 @@
...
}:
let
btusb = pkgs.callPackage ../../moduler/btusb.nix { inherit (config.boot.kernelPackages) kernel; };
theme = "latte";
in
{
imports = [
@ -28,6 +28,7 @@ in
../../moduler/hyprland.nix
../../moduler/sound.nix
../../moduler/programs/kubernetes-tools.nix
../../moduler/programs/confetti
];
kubernetes-tools.enable = true;
@ -40,8 +41,7 @@ in
stylix = {
enable = true;
# base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-mocha.yaml";
base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-latte.yaml";
base16Scheme = "${pkgs.base16-schemes}/share/themes/catppuccin-${theme}.yaml";
};
programs.ssh.knownHosts = {
@ -53,6 +53,10 @@ in
publicKeyFile = ../../keys/rsa_pubkey;
};
};
hyprland = {
enable = true;
theme = theme;
};
home-manager.extraSpecialArgs = { inherit inputs pkgs; };
home-manager.users.fw = {
@ -61,10 +65,11 @@ in
./../../moduler/programs/waybar
inputs.catppuccin.homeModules.catppuccin
];
waybar = {
enable = true;
# configPath = ./../../moduler/programs/waybar/waybar-laptop.jsonc;
};
waybar = {
enable = true;
configPath = ./../../moduler/programs/waybar/waybar.jsonc;
stylePath = ./../../moduler/programs/waybar/waybar-${theme}.css;
};
gtk = {
enable = true;
iconTheme = {
@ -72,10 +77,37 @@ in
package = pkgs.gruvbox-dark-icons-gtk;
};
};
kitty = {
enable = true;
theme = theme;
};
fish = {
theme = theme;
};
k9s = {
enable = true;
theme = theme;
};
programs.zsh = {
enable = true;
enableCompletion = true;
autosuggestion.enable = true;
syntaxHighlighting.enable = true;
shellAliases = {
ll = "ls -l";
update = "sudo nixos-rebuild switch";
};
history.size = 10000;
};
oh-my-posh = {
enable = true;
theme = theme;
};
catppuccin = {
librewolf = {
enable = true;
flavor = "latte";
flavor = theme;
accent = "peach";
};
};
@ -90,20 +122,19 @@ in
};
};
boot.kernelPackages = pkgs.linuxPackages_latest;
# boot.extraModulePackages = [
# (btusb.overrideAttrs (_: {
# patches = [ ../../moduler/btusb-add-mt7925.patch ];
# }))
# ];
networking.hostName = myhostname;
services = {
tailscale = {
fprintd = {
enable = true;
tod = {
enable = true;
driver = pkgs.libfprint-2-tod1-goodix;
};
};
};
boot.kernelPackages = pkgs.linuxPackages_latest;
networking.hostName = myhostname;
system.stateVersion = "25.05";
}

4
maskiner/legacy/configuration.nix
View file

@ -46,6 +46,7 @@ in
waybar = {
enable = true;
configPath = ./../../moduler/programs/waybar/waybar-laptop.jsonc;
stylePath = ./../../moduler/programs/waybar/waybar-latte.css;
};
gtk = {
enable = true;
@ -78,9 +79,6 @@ in
services = {
tailscale = {
enable = true;
};
searx = {
enable = true;
redisCreateLocally = true;

62
maskiner/node/configuration.nix
View file

@ -9,28 +9,30 @@
...
}:
let
modulesDirectory = ../../moduler;
modulesDirectory = ../../moduler;
in
{
# You can import other NixOS modules here
imports = [
./hardware-configuration.nix
( modulesDirectory + /base.nix )
( modulesDirectory + /users.nix )
( modulesDirectory + /kitchenowl.nix )
( modulesDirectory + /radicale.nix )
( modulesDirectory + /vaultwarden.nix )
( modulesDirectory + /signal.nix )
( modulesDirectory + /uptime-kuma.nix )
( modulesDirectory + /wedding.nix )
(modulesDirectory + /base.nix)
(modulesDirectory + /users.nix)
(modulesDirectory + /kitchenowl.nix)
(modulesDirectory + /radicale.nix)
(modulesDirectory + /vaultwarden.nix)
(modulesDirectory + /signal.nix)
(modulesDirectory + /uptime-kuma.nix)
(modulesDirectory + /wedding.nix)
( modulesDirectory + /services/monitoring )
( modulesDirectory + /services/headscale )
( modulesDirectory + /services/mpd )
( modulesDirectory + /services/actual )
( modulesDirectory + /services/forgejo )
( modulesDirectory + /services/wishlist )
( modulesDirectory + /services/glance )
(modulesDirectory + /services/monitoring)
(modulesDirectory + /services/headscale)
(modulesDirectory + /services/mpd)
(modulesDirectory + /services/actual)
(modulesDirectory + /services/forgejo)
(modulesDirectory + /services/wishlist)
(modulesDirectory + /services/glance)
(modulesDirectory + /services/gotify)
(modulesDirectory + /services/kanboard)
];
sops.defaultSopsFile = ../../secrets/sops.yaml;
@ -40,23 +42,38 @@ in
owner = "root";
mode = "0440";
};
environment.systemPackages = with pkgs; [
beets
];
mpd = {
enable = true;
enable = true;
};
kanboard = {
enable = true;
host = "127.0.0.1";
port = 3128;
domain = "kanboard.wastring.com";
};
gotify = {
enable = true;
host = "127.0.0.1";
port = 8121;
domain = "message.wastring.com";
};
glance = {
enable = true;
enable = true;
host = "127.0.0.1";
domain = "home.wastring.com";
domain = "home.wastring.com";
};
wishlist = {
enable = true;
enable = true;
host = "127.0.0.1";
domain = "wish.wastring.com";
domain = "wish.wastring.com";
};
forgejo = {
enable = true;
enable = true;
};
actual = {
@ -102,7 +119,6 @@ in
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII60tdNsG0z9q2jHmoTKvkeLQE6OF0bmTsDX1bpqpoG7 fw@jobb"
];
networking.hostName = myhostname;
system.stateVersion = "25.05";