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
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 = [ ];