refactor: Formatting

This commit is contained in:
2025-02-07 22:13:20 +01:00
parent c3f4470f80
commit dc2abe6ff1
36 changed files with 349 additions and 198 deletions
+13 -3
View File
@@ -1,7 +1,6 @@
{ {
description = "NixOS configuration"; description = "NixOS configuration";
inputs = { inputs = {
nix.url = "github:NixOS/nix"; nix.url = "github:NixOS/nix";
nixpkgs.url = "nixpkgs/nixos-24.11"; nixpkgs.url = "nixpkgs/nixos-24.11";
@@ -16,14 +15,24 @@
}; };
outputs = inputs@{ self, flake-parts, ... }: outputs =
inputs@{ self, flake-parts, ... }:
flake-parts.lib.mkFlake { inherit inputs; } { flake-parts.lib.mkFlake { inherit inputs; } {
imports = [ imports = [
./machines/configuration.nix ./machines/configuration.nix
]; ];
perSystem = { self', inputs', config, pkgs, system, ... }: { perSystem =
{
self',
inputs',
config,
pkgs,
system,
...
}:
{
# make pkgs available to all `perSystem` functions # make pkgs available to all `perSystem` functions
_module.args.pkgs = import inputs.nixpkgs { _module.args.pkgs = import inputs.nixpkgs {
inherit system; inherit system;
@@ -32,4 +41,5 @@
systems = [ "x86_64-linux" ]; systems = [ "x86_64-linux" ];
}; };
formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt-rfc-style;
} }
+6 -4
View File
@@ -1,7 +1,6 @@
{ self, ... }: { self, ... }:
let let
inherit inherit (self.inputs)
(self.inputs)
nixpkgs nixpkgs
nixpkgs-unstable nixpkgs-unstable
nixos-hardware nixos-hardware
@@ -24,7 +23,9 @@ let
} }
{ {
imports = [ imports = [
({ pkgs, ... }: { (
{ pkgs, ... }:
{
nixpkgs.overlays = [ nixpkgs.overlays = [
overlay-unstable overlay-unstable
(import ../pkgs) (import ../pkgs)
@@ -33,7 +34,8 @@ let
"nixpkgs=${pkgs.path}" "nixpkgs=${pkgs.path}"
]; ];
documentation.info.enable = false; documentation.info.enable = false;
}) }
)
#hyprland.nixosModules.default #hyprland.nixosModules.default
]; ];
} }
+6 -3
View File
@@ -5,8 +5,8 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
imports = imports = [
[ # Include the results of the hardware scan. # Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-configuration.nix
]; ];
@@ -85,7 +85,10 @@
users.users.finn = { users.users.finn = {
isNormalUser = true; isNormalUser = true;
description = "Finn Markwitz"; description = "Finn Markwitz";
extraGroups = [ "networkmanager" "wheel" ]; extraGroups = [
"networkmanager"
"wheel"
];
packages = with pkgs; [ packages = with pkgs; [
firefox firefox
jetbrains.webstorm jetbrains.webstorm
+7 -1
View File
@@ -1,4 +1,9 @@
{ config, pkgs, lib, ... }: {
config,
pkgs,
lib,
...
}:
{ {
# Packages # Packages
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
@@ -40,6 +45,7 @@
networkmanager networkmanager
lm_sensors lm_sensors
systemctl-tui systemctl-tui
nixfmt-rfc-style
]; ];
time.timeZone = "Europe/Berlin"; time.timeZone = "Europe/Berlin";
+6 -1
View File
@@ -1,3 +1,8 @@
# Generate via nix-generate # Generate via nix-generate
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
{ } { }
+6 -1
View File
@@ -1,4 +1,9 @@
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
{ {
networking.networkmanager = { networking.networkmanager = {
+7 -1
View File
@@ -1,4 +1,10 @@
{ config, lib, pkgs, inputs, ... }: {
config,
lib,
pkgs,
inputs,
...
}:
{ {
nix = { nix = {
daemonCPUSchedPolicy = "idle"; daemonCPUSchedPolicy = "idle";
+6 -1
View File
@@ -1,4 +1,9 @@
{ config, pkgs, lib, ... }: {
config,
pkgs,
lib,
...
}:
{ {
users.users.finn = { users.users.finn = {
+6 -1
View File
@@ -1,4 +1,9 @@
{ config, pkgs, lib, ... }: {
config,
pkgs,
lib,
...
}:
{ {
imports = [ imports = [
+16 -8
View File
@@ -1,22 +1,30 @@
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
#TODO: CHECK THIS OUT: https://github.com/nix-community/disko its kinda better but felix does not support it #TODO: CHECK THIS OUT: https://github.com/nix-community/disko its kinda better but felix does not support it
{ {
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/c95c64ad-f131-4bde-9bca-a7a3692173da"; device = "/dev/disk/by-uuid/c95c64ad-f131-4bde-9bca-a7a3692173da";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/0D77-17BB"; device = "/dev/disk/by-uuid/0D77-17BB";
fsType = "vfat"; fsType = "vfat";
}; };
fileSystems."/data/nfs" = fileSystems."/data/nfs" = {
{ device = "voyager:/"; device = "voyager:/";
fsType = "nfs"; fsType = "nfs";
options = [ "x-systemd.automount" "noauto" ]; options = [
"x-systemd.automount"
"noauto"
];
}; };
} }
+19 -9
View File
@@ -1,14 +1,25 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }: {
config,
lib,
pkgs,
modulesPath,
...
}:
{ {
imports = imports = [
[ (modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" ]; boot.initrd.availableKernelModules = [
"xhci_pci"
"ahci"
"nvme"
"usbhid"
];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
@@ -33,14 +44,13 @@
enableGraphical = true; enableGraphical = true;
}; };
fileSystems."/" = {
fileSystems."/" = device = "/dev/disk/by-uuid/c95c64ad-f131-4bde-9bca-a7a3692173da";
{ device = "/dev/disk/by-uuid/c95c64ad-f131-4bde-9bca-a7a3692173da";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/0D77-17BB"; device = "/dev/disk/by-uuid/0D77-17BB";
fsType = "vfat"; fsType = "vfat";
}; };
+6 -2
View File
@@ -1,4 +1,9 @@
{ config, pkgs, lib, ... }: {
config,
pkgs,
lib,
...
}:
{ {
imports = [ imports = [
@@ -50,7 +55,6 @@
#media-session.enable = true; #media-session.enable = true;
}; };
system = { system = {
stateVersion = "23.05"; stateVersion = "23.05";
autoUpgrade.enable = true; autoUpgrade.enable = true;
+8 -3
View File
@@ -1,10 +1,15 @@
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
#TODO: CHECK THIS OUT: https://github.com/nix-community/disko its kinda better but felix does not support it #TODO: CHECK THIS OUT: https://github.com/nix-community/disko its kinda better but felix does not support it
{ {
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/077abdb0-cbc1-4589-b411-25ecc157488f"; device = "/dev/disk/by-uuid/077abdb0-cbc1-4589-b411-25ecc157488f";
fsType = "ext4"; fsType = "ext4";
}; };
} }
+16 -6
View File
@@ -1,20 +1,30 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }: {
config,
lib,
pkgs,
modulesPath,
...
}:
{ {
imports = imports = [
[ (modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" ]; boot.initrd.availableKernelModules = [
"xhci_pci"
"ahci"
"nvme"
];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/disk/by-uuid/077abdb0-cbc1-4589-b411-25ecc157488f"; device = "/dev/disk/by-uuid/077abdb0-cbc1-4589-b411-25ecc157488f";
fsType = "ext4"; fsType = "ext4";
}; };
+8 -5
View File
@@ -1,10 +1,13 @@
{
{ config, lib, pkgs, ... }: config,
lib,
pkgs,
...
}:
let let
cfg = config.my.profiles.apps; cfg = config.my.profiles.apps;
in { in
{
options.my.profiles.apps = with lib; { options.my.profiles.apps = with lib; {
desktop_apps = mkEnableOption "Basic Apps"; desktop_apps = mkEnableOption "Basic Apps";
+10 -3
View File
@@ -1,6 +1,13 @@
{ config, lib, pkgs, ... }: {
let cfg = config.my.profiles.development; config,
in { lib,
pkgs,
...
}:
let
cfg = config.my.profiles.development;
in
{
options.my.profiles.development = with lib; { options.my.profiles.development = with lib; {
enable = mkEnableOption "Development Tools"; enable = mkEnableOption "Development Tools";
+8 -1
View File
@@ -1,5 +1,12 @@
# Docker related settings # Docker related settings
{ config, inputs, lib, options, pkgs, ... }: {
config,
inputs,
lib,
options,
pkgs,
...
}:
let let
cfg = config.my.profiles.docker; cfg = config.my.profiles.docker;
in in
+8 -3
View File
@@ -1,7 +1,13 @@
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
let let
cfg = config.my.profiles.hyprland; cfg = config.my.profiles.hyprland;
in { in
{
options.my.profiles.hyprland = with lib; { options.my.profiles.hyprland = with lib; {
enable = mkEnableOption "hyprland env"; enable = mkEnableOption "hyprland env";
}; };
@@ -12,7 +18,6 @@ let
xwayland.enable = true; xwayland.enable = true;
}; };
services.displayManager.sddm.wayland.enable = true; services.displayManager.sddm.wayland.enable = true;
services.xserver = { services.xserver = {
layout = "de"; layout = "de";
+6 -2
View File
@@ -1,5 +1,10 @@
# manages and downloads films # manages and downloads films
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
let let
cfg = config.my.profiles.jellyfin; cfg = config.my.profiles.jellyfin;
in in
@@ -15,7 +20,6 @@ in
openFirewall = true; openFirewall = true;
}; };
systemd.services.jellyfin = { systemd.services.jellyfin = {
after = [ "network-online.target" ]; after = [ "network-online.target" ];
}; };
@@ -1,4 +1,3 @@
# manages and downloads films # manages and downloads films
{ config, lib, ... }: { config, lib, ... }:
let let
+6 -1
View File
@@ -1,5 +1,10 @@
# KDE Desktio Environment # KDE Desktio Environment
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
let let
cfg = config.my.profiles.kde-desktop; cfg = config.my.profiles.kde-desktop;
in in
+3 -1
View File
@@ -17,7 +17,9 @@ in
extraConfig = mkOption { extraConfig = mkOption {
type = types.attrs; type = types.attrs;
default = { }; default = { };
example = { PAPERLESS_OCR_LANGUAGE = "deu+eng"; }; example = {
PAPERLESS_OCR_LANGUAGE = "deu+eng";
};
description = "Extra configuration options"; description = "Extra configuration options";
}; };
}; };
+7 -2
View File
@@ -1,10 +1,15 @@
# manages indexes # manages indexes
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
let let
cfg = config.my.profiles.prowlarr; cfg = config.my.profiles.prowlarr;
in
# domain = config.networking.domain; # domain = config.networking.domain;
# port = 9696; # port = 9696;
in
{ {
options.my.profiles.prowlarr = with lib; { options.my.profiles.prowlarr = with lib; {
enable = mkEnableOption "Prowlarr for indexing"; enable = mkEnableOption "Prowlarr for indexing";
+7 -2
View File
@@ -1,10 +1,15 @@
# manages and downloads films # manages and downloads films
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
let let
cfg = config.my.profiles.radarr; cfg = config.my.profiles.radarr;
in
# domain = config.networking.domain; # domain = config.networking.domain;
# port = 7878; # port = 7878;
in
{ {
options.my.profiles.radarr = with lib; { options.my.profiles.radarr = with lib; {
enable = mkEnableOption "Sonarr for films management"; enable = mkEnableOption "Sonarr for films management";
+7 -2
View File
@@ -1,10 +1,15 @@
# manages and downloads films # manages and downloads films
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
let let
cfg = config.my.profiles.readarr; cfg = config.my.profiles.readarr;
in
# domain = config.networking.domain; # domain = config.networking.domain;
# port = 7878; # port = 7878;
in
{ {
options.my.profiles.readarr = with lib; { options.my.profiles.readarr = with lib; {
enable = mkEnableOption "Readarr for ebook management"; enable = mkEnableOption "Readarr for ebook management";
+6 -1
View File
@@ -1,5 +1,10 @@
# manages and downloads films # manages and downloads films
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
let let
cfg = config.my.profiles.sonarr; cfg = config.my.profiles.sonarr;
# domain = config.networking.domain; # domain = config.networking.domain;
+8 -5
View File
@@ -1,9 +1,13 @@
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
let let
cfg = config.my.profiles.zsh; cfg = config.my.profiles.zsh;
in { in
{
options.my.profiles.zsh = with lib; { options.my.profiles.zsh = with lib; {
enable = mkEnableOption "zsh env"; enable = mkEnableOption "zsh env";
@@ -20,5 +24,4 @@ let
}; };
}; };
} }
+6 -1
View File
@@ -1,4 +1,9 @@
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
let let
cfg = config.my.hardware.bluetooth; cfg = config.my.hardware.bluetooth;
in in
+6 -3
View File
@@ -1,4 +1,9 @@
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
let let
cfg = config.my.hardware.bluetooth; cfg = config.my.hardware.bluetooth;
in in
@@ -7,8 +12,6 @@ in
enable = mkEnableOption "Sound configuration"; enable = mkEnableOption "Sound configuration";
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
hardware.pulseaudio.enable = false; hardware.pulseaudio.enable = false;
hardware.pulseaudio.support32Bit = true; hardware.pulseaudio.support32Bit = true;
+6 -1
View File
@@ -1,4 +1,9 @@
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
let let
cfg = config.my.hardware.wifi; cfg = config.my.hardware.wifi;
in in
+1 -2
View File
@@ -1,4 +1,3 @@
final: prev: final: prev: {
{
# homer = final.callPackage ./homer { }; # homer = final.callPackage ./homer { };
} }