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

refactor

Browse source
This commit is contained in:
fwastring 2025-12-01 21:33:27 +01:00
parent d516a6e283
commit 04fdbf9d61
16 changed files with 72 additions and 335 deletions
Download patch file Download diff file Expand all files Collapse all files

7
maskiner/archive/configuration.nix
View file

@ -8,12 +8,17 @@
myhostname,
...
}:
let
modulesDirectory = ../../moduler;
in
{
# You can import other NixOS modules here
imports = [
./hardware-configuration.nix
(modulesDirectory + /services/base)
../../moduler/users.nix
../../moduler/base.nix
../../moduler/services/monitoring
];

26
maskiner/core/configuration.nix
View file

@ -7,24 +7,26 @@
}:
let
theme = "mocha";
modulesDirectory = ../../moduler;
in
{
imports = [
./hardware-configuration.nix
../../moduler/base.nix
(modulesDirectory + /moduler/users.nix)
(modulesDirectory + /moduler/git.nix)
(modulesDirectory + /moduler/network.nix)
(modulesDirectory + /moduler/programs.nix)
(modulesDirectory + /moduler/system.nix)
(modulesDirectory + /moduler/dev.nix)
(modulesDirectory + /moduler/sound.nix)
(modulesDirectory + /programs/kubernetes-tools.nix)
../../moduler/users.nix
../../moduler/git.nix
../../moduler/network.nix
../../moduler/programs.nix
../../moduler/system.nix
../../moduler/dev.nix
../../moduler/hyprland.nix
../../moduler/sound.nix
../../moduler/programs/kubernetes-tools.nix
../../moduler/programs/confetti
../../moduler/programs/nixvim
(modulesDirectory + /services/base)
(modulesDirectory + /programs/hyprland)
(modulesDirectory + /programs/confetti)
(modulesDirectory + /programs/nixvim)
];
kubernetes-tools.enable = true;

31
maskiner/core/configuration.nix.bak
View file

@ -1,31 +0,0 @@
# This is your system's configuration file.
# Use this to configure your system environment (it replaces /etc/nixos/configuration.nix)
{
inputs,
lib,
config,
pkgs,
myhostname,
...
}: {
# You can import other NixOS modules here
imports = [
./hardware-configuration.nix
../../moduler/base.nix
../../moduler/users.nix
];
environment.systemPackages = with pkgs; [
kubectl
azure-cli
];
networking.hostName = myhostname;
services.xserver.dpi = 140;
system.stateVersion = "23.11";
}

41
maskiner/core/disk-config.nix
View file

@ -1,41 +0,0 @@
{ lib, ... }:
{
disko.devices = {
disk = {
main = {
device = lib.mkDefault "/dev/nvme0n1";
type = "disk";
content = {
type = "gpt";
partitions = {
ESP = {
type = "EF00";
size = "1G";
content = {
type = "filesystem";
format = "vfat";
mountpoint = "/boot";
mountOptions = [ "umask=0077" ];
};
};
root = {
size = "100%";
content = {
type = "filesystem";
format = "ext4";
mountpoint = "/";
};
};
swap = {
size = "101G";
content = {
type = "swap";
};
};
};
};
};
};
};
}

42
maskiner/core/hardware-configuration.nix.bak
View file

@ -1,42 +0,0 @@
# Do not modify this file! It was generated by ‘nixos-generate-config’
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usbhid" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/40bb9f8c-1a35-476a-8d78-18763ec97171";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/FAC4-0F98";
fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ];
};
swapDevices =
[ { device = "/dev/disk/by-uuid/d14d1b31-04fb-4ec8-a70f-438939898c3f"; }
];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's
# still possible to use this option, but it's recommended to use it in conjunction
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
networking.useDHCP = lib.mkDefault true;
# networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true;
# networking.interfaces.enp59s0u1u4.useDHCP = lib.mkDefault true;
# networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
}

26
maskiner/legacy/configuration.nix
View file

@ -11,24 +11,26 @@
}:
let
theme = "mocha";
modulesDirectory = ../../moduler;
in
{
imports = [
./hardware-configuration.nix
../../moduler/base.nix
(modulesDirectory + /moduler/users.nix)
(modulesDirectory + /moduler/git.nix)
(modulesDirectory + /moduler/network.nix)
(modulesDirectory + /moduler/programs.nix)
(modulesDirectory + /moduler/system.nix)
(modulesDirectory + /moduler/dev.nix)
(modulesDirectory + /moduler/hyprland.nix)
(modulesDirectory + /moduler/sound.nix)
../../moduler/users.nix
../../moduler/git.nix
../../moduler/network.nix
../../moduler/programs.nix
../../moduler/system.nix
../../moduler/dev.nix
../../moduler/hyprland.nix
../../moduler/sound.nix
../../moduler/programs/kubernetes-tools.nix
../../moduler/programs/confetti
../../moduler/programs/nixvim
(modulesDirectory + /services/base)
(modulesDirectory + /moduler/programs/kubernetes-tools.nix)
(modulesDirectory + /moduler/programs/confetti)
(modulesDirectory + /moduler/programs/nixvim)
];
kubernetes-tools.enable = true;

3
maskiner/node/configuration.nix
View file

@ -15,7 +15,7 @@ in
# You can import other NixOS modules here
imports = [
./hardware-configuration.nix
(modulesDirectory + /base.nix)
(modulesDirectory + /users.nix)
(modulesDirectory + /kitchenowl.nix)
(modulesDirectory + /radicale.nix)
@ -24,6 +24,7 @@ in
(modulesDirectory + /uptime-kuma.nix)
(modulesDirectory + /wedding.nix)
(modulesDirectory + /services/base)
(modulesDirectory + /services/monitoring)
(modulesDirectory + /services/headscale)
(modulesDirectory + /services/mpd)