finn.markwitz/nixos
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: Formatting

Browse Source
This commit is contained in:
finn.markwitz
2025-02-07 22:13:20 +01:00
parent c3f4470f80
commit dc2abe6ff1
36 changed files with 349 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flake.nix
+18 -8
View File
@@ -1,7 +1,6 @@
{
description = "NixOS configuration";
inputs = {
nix.url = "github:NixOS/nix";
nixpkgs.url = "nixpkgs/nixos-24.11";
@@ -14,22 +13,33 @@
};
# hyprland.url = "github:hyprwm/Hyprland";
};
};
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, ... }: {
# make pkgs available to all `perSystem` functions
_module.args.pkgs = import inputs.nixpkgs {
inherit system;
perSystem =
{
self',
inputs',
config,
pkgs,
system,
...
}:
{
# make pkgs available to all `perSystem` functions
_module.args.pkgs = import inputs.nixpkgs {
inherit system;
};
};
};
systems = [ "x86_64-linux" ];
};
formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt-rfc-style;
}
machines/configuration.nix
+15 -13
View File
@@ -1,7 +1,6 @@
{ self, ... }:
let
inherit
(self.inputs)
inherit (self.inputs)
nixpkgs
nixpkgs-unstable
nixos-hardware
@@ -24,16 +23,19 @@ let
}
{
imports = [
({ pkgs, ... }: {
nixpkgs.overlays = [
overlay-unstable
(import ../pkgs)
];
nix.nixPath = [
"nixpkgs=${pkgs.path}"
];
documentation.info.enable = false;
})
(
{ pkgs, ... }:
{
nixpkgs.overlays = [
overlay-unstable
(import ../pkgs)
];
nix.nixPath = [
"nixpkgs=${pkgs.path}"
];
documentation.info.enable = false;
}
)
#hyprland.nixosModules.default
];
}
@@ -60,4 +62,4 @@ in
];
};
};
}
}
machines/configuration_old.nix
+22 -19
View File
@@ -5,10 +5,10 @@
{ config, pkgs, ... }:
{
imports =
[ # Include the results of the hardware scan.
./hardware-configuration.nix
];
imports = [
# Include the results of the hardware scan.
./hardware-configuration.nix
];
# Bootloader.
boot.loader.grub.enable = true;
@@ -85,22 +85,25 @@
users.users.finn = {
isNormalUser = true;
description = "Finn Markwitz";
extraGroups = [ "networkmanager" "wheel" ];
extraGroups = [
"networkmanager"
"wheel"
];
packages = with pkgs; [
firefox
jetbrains.webstorm
jetbrains.goland
jetbrains.pycharm-professional
jetbrains.idea-ultimate
thunderbird
google-chrome
discord
spotify
keepassxc
nextcloud-client
zsh
oh-my-zsh
neovim
firefox
jetbrains.webstorm
jetbrains.goland
jetbrains.pycharm-professional
jetbrains.idea-ultimate
thunderbird
google-chrome
discord
spotify
keepassxc
nextcloud-client
zsh
oh-my-zsh
neovim
];
};
machines/core/core.nix
+8 -2
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";
@@ -63,4 +69,4 @@
LC_TIME = "de_DE.UTF-8";
};
}
}
machines/core/default.nix
+1 -1
View File
@@ -4,4 +4,4 @@
./network.nix
./nix.nix
./users.nix
]
]
machines/core/modules.nix
+7 -2
View File
@@ -1,3 +1,8 @@
# Generate via nix-generate
{ config, lib, pkgs, ... }:
{}
{
config,
lib,
pkgs,
...
}:
{ }
machines/core/network.nix
+7 -2
View File
@@ -1,4 +1,9 @@
{ config, lib, pkgs, ... }:
{
config,
lib,
pkgs,
...
}:
{
networking.networkmanager = {
@@ -12,4 +17,4 @@
];
};
}
}
machines/core/nix.nix
+8 -2
View File
@@ -1,4 +1,10 @@
{ config, lib, pkgs, inputs, ... }:
{
config,
lib,
pkgs,
inputs,
...
}:
{
nix = {
daemonCPUSchedPolicy = "idle";
@@ -24,4 +30,4 @@
};
};
nixpkgs.config.allowUnfree = true;
}
}
machines/core/users.nix
+7 -2
View File
@@ -1,4 +1,9 @@
{ config, pkgs, lib, ... }:
{
config,
pkgs,
lib,
...
}:
{
users.users.finn = {
@@ -24,4 +29,4 @@
users.groups.finn = {
gid = 1000;
};
}
}
machines/jupiter/configuration.nix
+14 -9
View File
@@ -1,4 +1,9 @@
{ config, pkgs, lib, ... }:
{
config,
pkgs,
lib,
...
}:
{
imports = [
@@ -8,20 +13,20 @@
];
networking.hostName = "jupiter";
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;
boot.kernelPackages = pkgs.unstable.linuxPackages_latest;
# Shitfuck SOnar Dotnet dependency
nixpkgs.config = {
permittedInsecurePackages = [
"aspnetcore-runtime-6.0.36"
"aspnetcore-runtime-wrapped-6.0.36"
"dotnet-sdk-6.0.428"
"dotnet-sdk-wrapped-6.0.428"
];
};
permittedInsecurePackages = [
"aspnetcore-runtime-6.0.36"
"aspnetcore-runtime-wrapped-6.0.36"
"dotnet-sdk-6.0.428"
"dotnet-sdk-wrapped-6.0.428"
];
};
services.openssh.enable = true;
machines/jupiter/disks.nix
+23 -15
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."/" =
{ device = "/dev/disk/by-uuid/c95c64ad-f131-4bde-9bca-a7a3692173da";
fsType = "ext4";
};
fileSystems."/" = {
device = "/dev/disk/by-uuid/c95c64ad-f131-4bde-9bca-a7a3692173da";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/0D77-17BB";
fsType = "vfat";
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/0D77-17BB";
fsType = "vfat";
};
fileSystems."/data/nfs" =
{ device = "voyager:/";
fsType = "nfs";
options = [ "x-systemd.automount" "noauto" ];
};
fileSystems."/data/nfs" = {
device = "voyager:/";
fsType = "nfs";
options = [
"x-systemd.automount"
"noauto"
];
};
}
machines/jupiter/hardware-configuration.nix
+25 -15
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 = [ ];
@@ -16,7 +27,7 @@
# 9a49
nixpkgs.config.packageOverrides = pkgs: {
vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
};
hardware.opengl = {
enable = true;
@@ -33,16 +44,15 @@
enableGraphical = true;
};
fileSystems."/" = {
device = "/dev/disk/by-uuid/c95c64ad-f131-4bde-9bca-a7a3692173da";
fsType = "ext4";
};
fileSystems."/" =
{ device = "/dev/disk/by-uuid/c95c64ad-f131-4bde-9bca-a7a3692173da";
fsType = "ext4";
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/0D77-17BB";
fsType = "vfat";
};
fileSystems."/boot" = {
device = "/dev/disk/by-uuid/0D77-17BB";
fsType = "vfat";
};
swapDevices = [ ];
machines/mibook/configuration.nix
+7 -3
View File
@@ -1,4 +1,9 @@
{ config, pkgs, lib, ... }:
{
config,
pkgs,
lib,
...
}:
{
imports = [
@@ -50,9 +55,8 @@
#media-session.enable = true;
};
system = {
stateVersion = "23.05";
autoUpgrade.enable = true;
};
}
}
machines/mibook/disks.nix
+11 -6
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."/" =
{ device = "/dev/disk/by-uuid/077abdb0-cbc1-4589-b411-25ecc157488f";
fsType = "ext4";
};
fileSystems."/" = {
device = "/dev/disk/by-uuid/077abdb0-cbc1-4589-b411-25ecc157488f";
fsType = "ext4";
};
}
machines/mibook/environments.nix
+1 -1
View File
@@ -12,4 +12,4 @@ in
dev_apps = true;
};
};
}
}
machines/mibook/hardware-configuration.nix
+19 -9
View File
@@ -1,22 +1,32 @@
# 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";
fsType = "ext4";
};
fileSystems."/" = {
device = "/dev/disk/by-uuid/077abdb0-cbc1-4589-b411-25ecc157488f";
fsType = "ext4";
};
swapDevices = [ ];
modules/default.nix
+1 -1
View File
@@ -4,4 +4,4 @@
./environments
./hardware
];
}
}
modules/environments/apps/default.nix
+17 -14
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";
@@ -16,17 +19,17 @@ let
users.users.finn.packages = with pkgs; [
firefox
thunderbird
google-chrome
google-chrome
vscode
discord
spotify
keepassxc
discord
spotify
keepassxc
moonlight-qt
nextcloud-client
pipewire
nextcloud-client
pipewire
wireplumber
vlc
vlc
ghostty
];
};
}
};
}
modules/environments/default.nix
+1 -1
View File
@@ -15,4 +15,4 @@
./jellyfin
./jellyseerr
];
}
}
modules/environments/development/default.nix
+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";
modules/environments/docker/default.nix
+9 -2
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
@@ -19,4 +26,4 @@ in
autoPrune.enable = true;
};
};
}
}
modules/environments/hyprland/default.nix
+16 -11
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,12 +18,11 @@ let
xwayland.enable = true;
};
services.displayManager.sddm.wayland.enable = true;
services.xserver = {
layout = "de";
xkbVariant = "";
};
layout = "de";
xkbVariant = "";
};
users.users.finn.packages = with pkgs; [
wofi
mako
@@ -30,12 +35,12 @@ let
#xdg-desktop-portal-hyprland
];
hardware = {
# Opengl
opengl.enable = true;
# Opengl
opengl.enable = true;
# Most wayland compositors need this
nvidia.modesetting.enable = true;
};
# Most wayland compositors need this
nvidia.modesetting.enable = true;
};
};
}
modules/environments/jellyfin/default.nix
+7 -3
View File
@@ -1,5 +1,10 @@
# manages and downloads films
{ config, lib, pkgs, ... }:
{
config,
lib,
pkgs,
...
}:
let
cfg = config.my.profiles.jellyfin;
in
@@ -15,9 +20,8 @@ in
openFirewall = true;
};
systemd.services.jellyfin = {
after = [ "network-online.target" ];
};
};
}
}
modules/environments/jellyseerr/default.nix
+1 -2
View File
@@ -1,4 +1,3 @@
# manages and downloads films
{ config, lib, ... }:
let
@@ -20,4 +19,4 @@ in
after = [ "network-online.target" ];
};
};
}
}
modules/environments/kde-desktop/default.nix
+10 -5
View File
@@ -1,5 +1,10 @@
# KDE Desktio Environment
{ config, lib, pkgs, ... }:
{
config,
lib,
pkgs,
...
}:
let
cfg = config.my.profiles.kde-desktop;
in
@@ -10,13 +15,13 @@ in
config = lib.mkIf cfg.enable {
services.xserver = {
enable = true;
displayManager.sddm.enable = true;
desktopManager.plasma5.enable = true;
enable = true;
displayManager.sddm.enable = true;
desktopManager.plasma5.enable = true;
};
users.users.finn.packages = with pkgs; [
# Programms can be added here...
numix-icon-theme
];
};
}
}
modules/environments/paperless/default.nix
+13 -11
View File
@@ -8,18 +8,20 @@ in
enable = mkEnableOption "Paperless Server";
port = mkOption {
type = types.port;
default = 28981;
example = 8080;
description = "Internal port for webui";
};
type = types.port;
default = 28981;
example = 8080;
description = "Internal port for webui";
};
extraConfig = mkOption {
type = types.attrs;
default = {};
example = { PAPERLESS_OCR_LANGUAGE = "deu+eng"; };
description = "Extra configuration options";
};
type = types.attrs;
default = { };
example = {
PAPERLESS_OCR_LANGUAGE = "deu+eng";
};
description = "Extra configuration options";
};
};
config = lib.mkIf cfg.enable {
@@ -33,4 +35,4 @@ in
};
networking.firewall.allowedTCPPorts = [ cfg.port ];
};
}
}
modules/environments/prowlarr/default.nix
+9 -4
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";
@@ -30,4 +35,4 @@ in
after = [ "network-online.target" ];
};
};
}
}
modules/environments/radarr/default.nix
+9 -4
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";
@@ -23,4 +28,4 @@ in
after = [ "network-online.target" ];
};
};
}
}
modules/environments/readarr/default.nix
+9 -4
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";
@@ -23,4 +28,4 @@ in
after = [ "network-online.target" ];
};
};
}
}
modules/environments/sonarr/default.nix
+8 -3
View File
@@ -1,9 +1,14 @@
# manages and downloads films
{ config, lib, pkgs, ... }:
{
config,
lib,
pkgs,
...
}:
let
cfg = config.my.profiles.sonarr;
# domain = config.networking.domain;
port = 8989;
port = 8989;
in
{
options.my.profiles.sonarr = with lib; {
@@ -23,4 +28,4 @@ in
after = [ "network-online.target" ];
};
};
}
}
modules/environments/zsh/default.nix
+13 -10
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";
@@ -12,13 +16,12 @@ let
config = lib.mkIf cfg.enable {
users.defaultUserShell = pkgs.zsh;
programs.zsh = {
enable = true;
ohMyZsh = {
enable = true;
ohMyZsh = {
enable = true;
theme = "agnoster";
};
theme = "agnoster";
};
};
};
};
}
modules/hardware/bluetooth/default.nix
+6 -1
View File
@@ -1,4 +1,9 @@
{ config, lib, pkgs, ... }:
{
config,
lib,
pkgs,
...
}:
let
cfg = config.my.hardware.bluetooth;
in
modules/hardware/default.nix
+1 -1
View File
@@ -14,4 +14,4 @@
#./thunderbolt
#./wifi
];
}
}
modules/hardware/sound/default.nix
+7 -4
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;
@@ -17,4 +20,4 @@ in
headsetcontrol
];
};
}
}
modules/hardware/wifi/default.nix
+7 -2
View File
@@ -1,4 +1,9 @@
{ config, lib, pkgs, ... }:
{
config,
lib,
pkgs,
...
}:
let
cfg = config.my.hardware.wifi;
in
@@ -13,4 +18,4 @@ in
package = pkgs.rtw89-firmware;
};
};
}
}
pkgs/default.nix
+2 -3
View File
@@ -1,4 +1,3 @@
final: prev:
{
final: prev: {
# homer = final.callPackage ./homer { };
}
}