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";
inputs = {
nix.url = "github:NixOS/nix";
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; } {
imports = [
./machines/configuration.nix
];
perSystem = { self', inputs', config, pkgs, system, ... }: {
perSystem =
{
self',
inputs',
config,
pkgs,
system,
...
}:
{
# make pkgs available to all `perSystem` functions
_module.args.pkgs = import inputs.nixpkgs {
inherit system;
@@ -32,4 +41,5 @@
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, ... }:
let
inherit
(self.inputs)
inherit (self.inputs)
nixpkgs
nixpkgs-unstable
nixos-hardware
@@ -24,7 +23,9 @@ let
}
{
imports = [
({ pkgs, ... }: {
(
{ pkgs, ... }:
{
nixpkgs.overlays = [
overlay-unstable
(import ../pkgs)
@@ -33,7 +34,8 @@ let
"nixpkgs=${pkgs.path}"
];
documentation.info.enable = false;
})
}
)
#hyprland.nixosModules.default
];
}
+6 -3
View File
@@ -5,8 +5,8 @@
{ config, pkgs, ... }:
{
imports =
[ # Include the results of the hardware scan.
imports = [
# Include the results of the hardware scan.
./hardware-configuration.nix
];
@@ -85,7 +85,10 @@
users.users.finn = {
isNormalUser = true;
description = "Finn Markwitz";
extraGroups = [ "networkmanager" "wheel" ];
extraGroups = [
"networkmanager"
"wheel"
];
packages = with pkgs; [
firefox
jetbrains.webstorm
+7 -1
View File
@@ -1,4 +1,9 @@
{ config, pkgs, lib, ... }:
{
config,
pkgs,
lib,
...
}:
{
# Packages
environment.systemPackages = with pkgs; [
@@ -40,6 +45,7 @@
networkmanager
lm_sensors
systemctl-tui
nixfmt-rfc-style
];
time.timeZone = "Europe/Berlin";
+7 -2
View File
@@ -1,3 +1,8 @@
# 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 = {
+7 -1
View File
@@ -1,4 +1,10 @@
{ config, lib, pkgs, inputs, ... }:
{
config,
lib,
pkgs,
inputs,
...
}:
{
nix = {
daemonCPUSchedPolicy = "idle";
+6 -1
View File
@@ -1,4 +1,9 @@
{ config, pkgs, lib, ... }:
{
config,
pkgs,
lib,
...
}:
{
users.users.finn = {
+6 -1
View File
@@ -1,4 +1,9 @@
{ config, pkgs, lib, ... }:
{
config,
pkgs,
lib,
...
}:
{
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
{
fileSystems."/" =
{ device = "/dev/disk/by-uuid/c95c64ad-f131-4bde-9bca-a7a3692173da";
fileSystems."/" = {
device = "/dev/disk/by-uuid/c95c64ad-f131-4bde-9bca-a7a3692173da";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/0D77-17BB";
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/0D77-17BB";
fsType = "vfat";
};
fileSystems."/data/nfs" =
{ device = "voyager:/";
fileSystems."/data/nfs" = {
device = "voyager:/";
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
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }:
{
config,
lib,
pkgs,
modulesPath,
...
}:
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
imports = [
(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.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
@@ -33,14 +44,13 @@
enableGraphical = true;
};
fileSystems."/" =
{ device = "/dev/disk/by-uuid/c95c64ad-f131-4bde-9bca-a7a3692173da";
fileSystems."/" = {
device = "/dev/disk/by-uuid/c95c64ad-f131-4bde-9bca-a7a3692173da";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/0D77-17BB";
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/0D77-17BB";
fsType = "vfat";
};
+6 -2
View File
@@ -1,4 +1,9 @@
{ config, pkgs, lib, ... }:
{
config,
pkgs,
lib,
...
}:
{
imports = [
@@ -50,7 +55,6 @@
#media-session.enable = true;
};
system = {
stateVersion = "23.05";
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
{
fileSystems."/" =
{ device = "/dev/disk/by-uuid/077abdb0-cbc1-4589-b411-25ecc157488f";
fileSystems."/" = {
device = "/dev/disk/by-uuid/077abdb0-cbc1-4589-b411-25ecc157488f";
fsType = "ext4";
};
}
+16 -6
View File
@@ -1,20 +1,30 @@
# 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, ... }:
{
config,
lib,
pkgs,
modulesPath,
...
}:
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" ];
boot.initrd.availableKernelModules = [
"xhci_pci"
"ahci"
"nvme"
];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/077abdb0-cbc1-4589-b411-25ecc157488f";
fileSystems."/" = {
device = "/dev/disk/by-uuid/077abdb0-cbc1-4589-b411-25ecc157488f";
fsType = "ext4";
};
+9 -6
View File
@@ -1,10 +1,13 @@
{ config, lib, pkgs, ... }:
{
config,
lib,
pkgs,
...
}:
let
cfg = config.my.profiles.apps;
in {
in
{
options.my.profiles.apps = with lib; {
desktop_apps = mkEnableOption "Basic Apps";
@@ -29,4 +32,4 @@ let
ghostty
];
};
}
}
+10 -3
View File
@@ -1,6 +1,13 @@
{ config, lib, pkgs, ... }:
let cfg = config.my.profiles.development;
in {
{
config,
lib,
pkgs,
...
}:
let
cfg = config.my.profiles.development;
in
{
options.my.profiles.development = with lib; {
enable = mkEnableOption "Development Tools";
+8 -1
View File
@@ -1,5 +1,12 @@
# Docker related settings
{ config, inputs, lib, options, pkgs, ... }:
{
config,
inputs,
lib,
options,
pkgs,
...
}:
let
cfg = config.my.profiles.docker;
in
+8 -3
View File
@@ -1,7 +1,13 @@
{ config, lib, pkgs, ... }:
{
config,
lib,
pkgs,
...
}:
let
cfg = config.my.profiles.hyprland;
in {
in
{
options.my.profiles.hyprland = with lib; {
enable = mkEnableOption "hyprland env";
};
@@ -12,7 +18,6 @@ let
xwayland.enable = true;
};
services.displayManager.sddm.wayland.enable = true;
services.xserver = {
layout = "de";
+6 -2
View File
@@ -1,5 +1,10 @@
# manages and downloads films
{ config, lib, pkgs, ... }:
{
config,
lib,
pkgs,
...
}:
let
cfg = config.my.profiles.jellyfin;
in
@@ -15,7 +20,6 @@ in
openFirewall = true;
};
systemd.services.jellyfin = {
after = [ "network-online.target" ];
};
@@ -1,4 +1,3 @@
# manages and downloads films
{ config, lib, ... }:
let
+6 -1
View File
@@ -1,5 +1,10 @@
# KDE Desktio Environment
{ config, lib, pkgs, ... }:
{
config,
lib,
pkgs,
...
}:
let
cfg = config.my.profiles.kde-desktop;
in
+4 -2
View File
@@ -16,8 +16,10 @@ in
extraConfig = mkOption {
type = types.attrs;
default = {};
example = { PAPERLESS_OCR_LANGUAGE = "deu+eng"; };
default = { };
example = {
PAPERLESS_OCR_LANGUAGE = "deu+eng";
};
description = "Extra configuration options";
};
};
+8 -3
View File
@@ -1,10 +1,15 @@
# manages indexes
{ config, lib, pkgs, ... }:
{
config,
lib,
pkgs,
...
}:
let
cfg = config.my.profiles.prowlarr;
# domain = config.networking.domain;
# port = 9696;
in
# domain = config.networking.domain;
# port = 9696;
{
options.my.profiles.prowlarr = with lib; {
enable = mkEnableOption "Prowlarr for indexing";
+8 -3
View File
@@ -1,10 +1,15 @@
# manages and downloads films
{ config, lib, pkgs, ... }:
{
config,
lib,
pkgs,
...
}:
let
cfg = config.my.profiles.radarr;
# domain = config.networking.domain;
# port = 7878;
in
# domain = config.networking.domain;
# port = 7878;
{
options.my.profiles.radarr = with lib; {
enable = mkEnableOption "Sonarr for films management";
+8 -3
View File
@@ -1,10 +1,15 @@
# manages and downloads films
{ config, lib, pkgs, ... }:
{
config,
lib,
pkgs,
...
}:
let
cfg = config.my.profiles.readarr;
# domain = config.networking.domain;
# port = 7878;
in
# domain = config.networking.domain;
# port = 7878;
{
options.my.profiles.readarr = with lib; {
enable = mkEnableOption "Readarr for ebook management";
+6 -1
View File
@@ -1,5 +1,10 @@
# manages and downloads films
{ config, lib, pkgs, ... }:
{
config,
lib,
pkgs,
...
}:
let
cfg = config.my.profiles.sonarr;
# domain = config.networking.domain;
+8 -5
View File
@@ -1,9 +1,13 @@
{ config, lib, pkgs, ... }:
{
config,
lib,
pkgs,
...
}:
let
cfg = config.my.profiles.zsh;
in {
in
{
options.my.profiles.zsh = with lib; {
enable = mkEnableOption "zsh env";
@@ -20,5 +24,4 @@ let
};
};
}
+6 -1
View File
@@ -1,4 +1,9 @@
{ config, lib, pkgs, ... }:
{
config,
lib,
pkgs,
...
}:
let
cfg = config.my.hardware.bluetooth;
in
+6 -3
View File
@@ -1,4 +1,9 @@
{ config, lib, pkgs, ... }:
{
config,
lib,
pkgs,
...
}:
let
cfg = config.my.hardware.bluetooth;
in
@@ -7,8 +12,6 @@ in
enable = mkEnableOption "Sound configuration";
};
config = lib.mkIf cfg.enable {
hardware.pulseaudio.enable = false;
hardware.pulseaudio.support32Bit = true;
+6 -1
View File
@@ -1,4 +1,9 @@
{ config, lib, pkgs, ... }:
{
config,
lib,
pkgs,
...
}:
let
cfg = config.my.hardware.wifi;
in
+1 -2
View File
@@ -1,4 +1,3 @@
final: prev:
{
final: prev: {
# homer = final.callPackage ./homer { };
}