This commit is contained in:
2026-06-16 18:13:56 +02:00
parent ef0aef2178
commit 49b7373ce1
44 changed files with 648 additions and 506 deletions

View File

@@ -1,7 +1,15 @@
{ nixpkgs, nixpkgs-unstable, home-manager, nix-flatpak, ... }: {
nixpkgs,
nixpkgs-unstable,
home-manager,
nix-flatpak,
...
}:
let let
mkPkgsUnstable = system: import nixpkgs-unstable { mkPkgsUnstable =
system:
import nixpkgs-unstable {
inherit system; inherit system;
config.allowUnfree = true; config.allowUnfree = true;
}; };

View File

@@ -2,11 +2,16 @@
# your system. Help is available in the configuration.nix(5) man page, on # your system. Help is available in the configuration.nix(5) man page, on
# https://search.nixos.org/options and in the NixOS manual (`nixos-help`). # https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
{ config, lib, pkgs, ... }: {
config,
lib,
pkgs,
...
}:
{ {
imports = imports = [
[ # Include the results of the hardware scan. # Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-configuration.nix
../modules/home-manager.nix ../modules/home-manager.nix
../modules/common.nix ../modules/common.nix
@@ -38,11 +43,19 @@
networking.hostName = "balrog"; networking.hostName = "balrog";
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
networking.nameservers = [ "192.168.68.56" "1.1.1.1" "8.8.8.8" ]; networking.nameservers = [
"192.168.68.56"
"1.1.1.1"
"8.8.8.8"
];
hardware.enableAllFirmware = true; hardware.enableAllFirmware = true;
boot.initrd.kernelModules = [ "wl" ]; boot.kernelModules = [ "wl" "kvm-intel" ]; boot.initrd.kernelModules = [ "wl" ];
boot.kernelModules = [
"wl"
"kvm-intel"
];
boot.extraModulePackages = with config.boot.kernelPackages; [ boot.extraModulePackages = with config.boot.kernelPackages; [
broadcom_sta broadcom_sta

View File

@@ -1,27 +1,42 @@
# 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" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.availableKernelModules = [
"xhci_pci"
"ahci"
"usbhid"
"usb_storage"
"sd_mod"
];
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/6795dc19-3130-4693-b04c-a2c56fbdbd55"; device = "/dev/disk/by-uuid/6795dc19-3130-4693-b04c-a2c56fbdbd55";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/A202-E19C"; device = "/dev/disk/by-uuid/A202-E19C";
fsType = "vfat"; fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" ]; options = [
"fmask=0022"
"dmask=0022"
];
}; };
swapDevices = [ ]; swapDevices = [ ];

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
../modules/common.nix ../modules/common.nix
../modules/users.nix ../modules/users.nix

View File

@@ -1,20 +1,32 @@
# 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 + "/profiles/qemu-guest.nix") (modulesPath + "/profiles/qemu-guest.nix")
]; ];
boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "virtio_pci" "sr_mod" "virtio_blk" ]; boot.initrd.availableKernelModules = [
"ahci"
"xhci_pci"
"virtio_pci"
"sr_mod"
"virtio_blk"
];
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/abc73402-b278-4995-a3bf-4bd28646285a"; device = "/dev/disk/by-uuid/abc73402-b278-4995-a3bf-4bd28646285a";
fsType = "ext4"; fsType = "ext4";
}; };

View File

@@ -1,8 +1,7 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
imports = imports = [
[
./hardware-configuration.nix ./hardware-configuration.nix
../modules/home-manager.nix ../modules/home-manager.nix
../modules/common.nix ../modules/common.nix
@@ -36,7 +35,11 @@
networking.hostName = "gandalf"; networking.hostName = "gandalf";
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
networking.nameservers = [ "192.168.68.56" "1.1.1.1" "8.8.8.8" ]; networking.nameservers = [
"192.168.68.56"
"1.1.1.1"
"8.8.8.8"
];
networking.firewall.enable = false; networking.firewall.enable = false;
home-manager.users.avravels.home.hyprland.execOnce = [ home-manager.users.avravels.home.hyprland.execOnce = [

View File

@@ -1,27 +1,43 @@
# 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" "usb_storage" "sd_mod" ]; boot.initrd.availableKernelModules = [
"xhci_pci"
"ahci"
"nvme"
"usbhid"
"usb_storage"
"sd_mod"
];
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/fbdcecb5-3a2b-4bd5-9586-4de834200363"; device = "/dev/disk/by-uuid/fbdcecb5-3a2b-4bd5-9586-4de834200363";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/01E4-5DD7"; device = "/dev/disk/by-uuid/01E4-5DD7";
fsType = "vfat"; fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ]; options = [
"fmask=0077"
"dmask=0077"
];
}; };
swapDevices = [ ]; swapDevices = [ ];

View File

@@ -2,9 +2,12 @@
{ {
nixpkgs.overlays = [ nixpkgs.overlays = [
(final: prev: let (
final: prev:
let
targetVersion = "1.1.23"; targetVersion = "1.1.23";
in { in
{
libmtp = libmtp =
if builtins.compareVersions prev.libmtp.version targetVersion >= 0 then if builtins.compareVersions prev.libmtp.version targetVersion >= 0 then
prev.libmtp prev.libmtp
@@ -21,6 +24,7 @@
patches = [ ]; patches = [ ];
}); });
}) }
)
]; ];
} }

View File

@@ -1,8 +1,7 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
imports = imports = [
[
./hardware-configuration.nix ./hardware-configuration.nix
../modules/common.nix ../modules/common.nix
../modules/users.nix ../modules/users.nix
@@ -17,7 +16,11 @@
networking.hostName = "legolas"; networking.hostName = "legolas";
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
networking.nameservers = [ "192.168.68.56" "1.1.1.1" "8.8.8.8" ]; networking.nameservers = [
"192.168.68.56"
"1.1.1.1"
"8.8.8.8"
];
services.xserver.videoDrivers = [ "nvidia" ]; services.xserver.videoDrivers = [ "nvidia" ];

View File

@@ -1,31 +1,46 @@
# 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" "sd_mod" ]; boot.initrd.availableKernelModules = [
"xhci_pci"
"ahci"
"nvme"
"usbhid"
"sd_mod"
];
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/3369db74-89ad-4b2f-b843-485c1b4f356b"; device = "/dev/disk/by-uuid/3369db74-89ad-4b2f-b843-485c1b4f356b";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/C4C8-E90E"; device = "/dev/disk/by-uuid/C4C8-E90E";
fsType = "vfat"; fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" ]; options = [
"fmask=0022"
"dmask=0022"
];
}; };
fileSystems."/media" = fileSystems."/media" = {
{ device = "/dev/disk/by-uuid/faa2f6ba-00a5-46e4-9b03-a031509dd232"; device = "/dev/disk/by-uuid/faa2f6ba-00a5-46e4-9b03-a031509dd232";
fsType = "ext4"; fsType = "ext4";
}; };

View File

@@ -5,4 +5,3 @@
arduino-ide arduino-ide
]; ];
} }

View File

@@ -9,4 +9,3 @@
bitwarden-desktop bitwarden-desktop
]; ];
} }

View File

@@ -5,4 +5,3 @@
btop btop
]; ];
} }

View File

@@ -3,7 +3,10 @@
{ {
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
nix.settings.experimental-features = [ "nix-command" "flakes" ]; nix.settings.experimental-features = [
"nix-command"
"flakes"
];
users.defaultUserShell = pkgs.zsh; users.defaultUserShell = pkgs.zsh;

View File

@@ -1,4 +1,3 @@
{ config, pkgsUnstable, ... }: { config, pkgsUnstable, ... }:
{ {
@@ -6,5 +5,8 @@
devenv devenv
]; ];
nix.settings.trusted-users = [ "root" "avravels" ]; nix.settings.trusted-users = [
"root"
"avravels"
];
} }

View File

@@ -5,7 +5,10 @@
enable = true; enable = true;
settings = { settings = {
server = [ "1.1.1.1" "8.8.8.8" ]; server = [
"1.1.1.1"
"8.8.8.8"
];
address = [ "/.enova.local/127.0.0.1" ]; address = [ "/.enova.local/127.0.0.1" ];
}; };
}; };

View File

@@ -12,15 +12,18 @@
policies = { policies = {
# From https://discourse.nixos.org/t/declare-firefox-extensions-and-settings/36265/17 # From https://discourse.nixos.org/t/declare-firefox-extensions-and-settings/36265/17
ExtensionSettings = with builtins; ExtensionSettings =
let extension = shortId: uuid: { with builtins;
let
extension = shortId: uuid: {
name = uuid; name = uuid;
value = { value = {
install_url = "https://addons.mozilla.org/en-US/firefox/downloads/latest/${shortId}/latest.xpi"; install_url = "https://addons.mozilla.org/en-US/firefox/downloads/latest/${shortId}/latest.xpi";
installation_mode = "normal_installed"; installation_mode = "normal_installed";
}; };
}; };
in listToAttrs [ in
listToAttrs [
(extension "bitwarden-password-manager" "{446900e4-71c2-419f-a6a7-df9c091e268b}") (extension "bitwarden-password-manager" "{446900e4-71c2-419f-a6a7-df9c091e268b}")
(extension "ublock-origin" "uBlock0@raymondhill.net") (extension "ublock-origin" "uBlock0@raymondhill.net")
(extension "privacy-badger17" "jid1-MnnxcxisBPnSXQ@jetpack") (extension "privacy-badger17" "jid1-MnnxcxisBPnSXQ@jetpack")

View File

@@ -1,4 +1,9 @@
{ lib, pkgsUnstable, config, ... }: {
lib,
pkgsUnstable,
config,
...
}:
{ {
options.home.git = { options.home.git = {

View File

@@ -5,4 +5,3 @@
ripgrep ripgrep
]; ];
} }

View File

@@ -1,8 +1,7 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
home.file.".zsh/fastfetch.jsonc".source = home.file.".zsh/fastfetch.jsonc".source = ./fastfetch/config.jsonc;
./fastfetch/config.jsonc;
programs.zsh = { programs.zsh = {
enable = true; enable = true;

View File

@@ -1,4 +1,9 @@
{ lib, pkgs, config, ... }: {
lib,
pkgs,
config,
...
}:
let let
cfg = config.home.hyprland; cfg = config.home.hyprland;

View File

@@ -26,4 +26,3 @@ in
}; };
}; };
} }

View File

@@ -35,7 +35,11 @@
scroll-step = 5; scroll-step = 5;
format-icons = { format-icons = {
default = [ "󰕿" "󰖀" "󰕾" ]; default = [
"󰕿"
"󰖀"
"󰕾"
];
}; };
on-click = "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"; on-click = "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle";
@@ -46,7 +50,10 @@
format = "{player_icon} {artist} - {title}"; format = "{player_icon} {artist} - {title}";
format-paused = "{player_icon} {title}"; format-paused = "{player_icon} {title}";
tooltip = true; tooltip = true;
ignored-players = [ "firefox" "vlc" ]; ignored-players = [
"firefox"
"vlc"
];
}; };
cpu = { cpu = {

View File

@@ -1,4 +1,3 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {

View File

@@ -34,6 +34,9 @@
# for samba # for samba
networking.hosts = { networking.hosts = {
"192.168.68.60" = [ "2C2919000000.local" "2C2919000000" ]; "192.168.68.60" = [
"2C2919000000.local"
"2C2919000000"
];
}; };
} }

View File

@@ -10,4 +10,3 @@
virt-manager.enable = true; virt-manager.enable = true;
}; };
} }

View File

@@ -5,7 +5,12 @@
initialPassword = "welcome"; initialPassword = "welcome";
isNormalUser = true; isNormalUser = true;
description = "Armel van Ravels"; description = "Armel van Ravels";
extraGroups = [ "networkmanager" "wheel" "libvirtd" "dialout"]; extraGroups = [
"networkmanager"
"wheel"
"libvirtd"
"dialout"
];
packages = with pkgs; [ packages = with pkgs; [
home-manager home-manager
legcord legcord

View File

@@ -1,8 +1,7 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
imports = imports = [
[
./hardware-configuration.nix ./hardware-configuration.nix
../modules/home-manager.nix ../modules/home-manager.nix
../modules/common.nix ../modules/common.nix
@@ -51,7 +50,12 @@
home-manager.users.avravels.home.git.userEmail = "armel@webavance.nl"; home-manager.users.avravels.home.git.userEmail = "armel@webavance.nl";
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
networking.nameservers = [ "127.0.0.1" "192.168.68.56" "1.1.1.1" "8.8.8.8" ]; networking.nameservers = [
"127.0.0.1"
"192.168.68.56"
"1.1.1.1"
"8.8.8.8"
];
networking.firewall.enable = false; networking.firewall.enable = false;
hardware.graphics.enable = true; hardware.graphics.enable = true;
@@ -60,7 +64,12 @@
virtualisation.libvirtd.enable = true; virtualisation.libvirtd.enable = true;
networking.hosts = { networking.hosts = {
"127.0.0.1" = [ "local.wormundco.de" "local.wormundco.nl" "local.wormenco.nl" "local.wurmundco.de" ]; "127.0.0.1" = [
"local.wormundco.de"
"local.wormundco.nl"
"local.wormenco.nl"
"local.wurmundco.de"
];
"149.210.174.226" = [ "kindertelefoon" ]; "149.210.174.226" = [ "kindertelefoon" ];
}; };

View File

@@ -1,29 +1,45 @@
# 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" "nvme" "usb_storage" "usbhid" "sd_mod" ]; boot.initrd.availableKernelModules = [
"xhci_pci"
"nvme"
"usb_storage"
"usbhid"
"sd_mod"
];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-intel" ]; boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" = {
{ device = "/dev/mapper/luks-5217fae8-1b85-4667-abb7-2b4ca7d443ba"; device = "/dev/mapper/luks-5217fae8-1b85-4667-abb7-2b4ca7d443ba";
fsType = "ext4"; fsType = "ext4";
}; };
boot.initrd.luks.devices."luks-5217fae8-1b85-4667-abb7-2b4ca7d443ba".device = "/dev/disk/by-uuid/5217fae8-1b85-4667-abb7-2b4ca7d443ba"; boot.initrd.luks.devices."luks-5217fae8-1b85-4667-abb7-2b4ca7d443ba".device =
"/dev/disk/by-uuid/5217fae8-1b85-4667-abb7-2b4ca7d443ba";
fileSystems."/boot" = fileSystems."/boot" = {
{ device = "/dev/disk/by-uuid/3892-6129"; device = "/dev/disk/by-uuid/3892-6129";
fsType = "vfat"; fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ]; options = [
"fmask=0077"
"dmask=0077"
];
}; };
swapDevices = [ ]; swapDevices = [ ];