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
mkPkgsUnstable = system: import nixpkgs-unstable {
mkPkgsUnstable =
system:
import nixpkgs-unstable {
inherit system;
config.allowUnfree = true;
};

View File

@@ -2,11 +2,16 @@
# 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`).
{ config, lib, pkgs, ... }:
{
config,
lib,
pkgs,
...
}:
{
imports =
[ # Include the results of the hardware scan.
imports = [
# Include the results of the hardware scan.
./hardware-configuration.nix
../modules/home-manager.nix
../modules/common.nix
@@ -19,7 +24,7 @@
../modules/bambu-studio-flatpak.nix
../modules/arduino-ide.nix
../modules/devenv.nix
# ../modules/bitwarden.nix
# ../modules/bitwarden.nix
];
boot.kernelPackages = pkgs.linuxPackages_latest;
@@ -38,18 +43,26 @@
networking.hostName = "balrog";
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;
boot.initrd.kernelModules = [ "wl" ]; boot.kernelModules = [ "wl" "kvm-intel" ];
boot.initrd.kernelModules = [ "wl" ];
boot.kernelModules = [
"wl"
"kvm-intel"
];
boot.extraModulePackages = with config.boot.kernelPackages; [
broadcom_sta
];
nixpkgs.config = {
allowInsecurePredicate = pkg: builtins.elem (lib.getName pkg) ["broadcom-sta"];
allowInsecurePredicate = pkg: builtins.elem (lib.getName pkg) [ "broadcom-sta" ];
};
hardware.bluetooth.enable = true;
services.blueman.enable = true;

View File

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

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

View File

@@ -1,20 +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 + "/profiles/qemu-guest.nix")
imports = [
(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.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];
fileSystems."/" =
{ device = "/dev/disk/by-uuid/abc73402-b278-4995-a3bf-4bd28646285a";
fileSystems."/" = {
device = "/dev/disk/by-uuid/abc73402-b278-4995-a3bf-4bd28646285a";
fsType = "ext4";
};

View File

@@ -1,8 +1,7 @@
{ config, pkgs, ... }:
{
imports =
[
imports = [
./hardware-configuration.nix
../modules/home-manager.nix
../modules/common.nix
@@ -36,7 +35,11 @@
networking.hostName = "gandalf";
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;
home-manager.users.avravels.home.hyprland.execOnce = [
@@ -49,7 +52,7 @@
networking.interfaces.enp130s0.wakeOnLan.enable = true;
networking.firewall.allowedUDPPorts = [ 9 ];
services.xserver.videoDrivers = ["nvidia"];
services.xserver.videoDrivers = [ "nvidia" ];
services.openssh.settings.X11Forwarding = true;
hardware = {

View File

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

View File

@@ -1,10 +1,13 @@
{ pkgs, ...}:
{ pkgs, ... }:
{
nixpkgs.overlays = [
(final: prev: let
(
final: prev:
let
targetVersion = "1.1.23";
in {
in
{
libmtp =
if builtins.compareVersions prev.libmtp.version targetVersion >= 0 then
prev.libmtp
@@ -19,8 +22,9 @@
hash = "sha256-FlPj9PEeOAWabU11dFTzDgY9TBbgmJclbeL0iULYw6A=";
};
patches = [];
patches = [ ];
});
})
}
)
];
}

View File

@@ -1,8 +1,7 @@
{ config, pkgs, ... }:
{
imports =
[
imports = [
./hardware-configuration.nix
../modules/common.nix
../modules/users.nix
@@ -17,9 +16,13 @@
networking.hostName = "legolas";
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" ];
hardware = {
graphics.enable = true;

View File

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

View File

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

View File

@@ -1,4 +1,4 @@
{ pkgs, ...}:
{ pkgs, ... }:
{
services.flatpak.enable = true;

View File

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

View File

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

View File

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

View File

@@ -1,10 +1,12 @@
{ config, pkgsUnstable, ... } :
{ config, pkgsUnstable, ... }:
{
environment.systemPackages = with pkgsUnstable; [
devenv
];
nix.settings.trusted-users = [ "root" "avravels" ];
nix.settings.trusted-users = [
"root"
"avravels"
];
}

View File

@@ -5,7 +5,10 @@
enable = true;
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" ];
};
};

View File

@@ -8,7 +8,7 @@
package = pkgs.steam.override {
extraEnv = {
MANGOHUD = "1";
WINE_VK_VULKAN_ONLY="1";
WINE_VK_VULKAN_ONLY = "1";
};
};
};

View File

@@ -1,4 +1,4 @@
{ config, pkgs, ... } :
{ config, pkgs, ... }:
{
environment.systemPackages = with pkgs; [

View File

@@ -9,7 +9,7 @@
imports = [
./other/fonts.nix
# ./programs/bitwarden.nix
# ./programs/bitwarden.nix
./programs/kitty.nix
./programs/zsh.nix
./programs/direnv.nix

View File

@@ -1,4 +1,4 @@
{ pkgs, ...}:
{ pkgs, ... }:
{
home.packages = [

View File

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

View File

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

View File

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

View File

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

View File

@@ -2,8 +2,8 @@
{
home.pointerCursor = {
# name = "Bibata-Modern-Ice"; # change to your cursor theme
# package = pkgs.bibata-cursors;
# name = "Bibata-Modern-Ice"; # change to your cursor theme
# package = pkgs.bibata-cursors;
name = "Adwaita";
package = pkgs.adwaita-icon-theme;
size = 24;

View File

@@ -1,4 +1,9 @@
{ lib, pkgs, config, ... }:
{
lib,
pkgs,
config,
...
}:
let
cfg = config.home.hyprland;
@@ -100,7 +105,7 @@ in
};
bind = lib.flatten [
(bind "${mod} + W" (dsp.exec_cmd "pkill -SIGUSR1 -f '^waybar$'") {})
(bind "${mod} + W" (dsp.exec_cmd "pkill -SIGUSR1 -f '^waybar$'") { })
(bind "${mod} + Q" (dsp.window.kill) { })
(bind "${mod} + L" (dsp.exec_cmd "hyprlock") { })
(bind "${mod} + D" (dsp.exec_cmd "rofi -show drun") { })
@@ -121,25 +126,25 @@ in
(bind "${mod} + UP" (dsp.focus { direction = "u"; }) { })
(bind "${mod} + RIGHT" (dsp.focus { direction = "r"; }) { })
(bind "${mod} + 1" (dsp.focus { workspace = 1; }) {})
(bind "${mod} + 2" (dsp.focus { workspace = 2; }) {})
(bind "${mod} + 3" (dsp.focus { workspace = 3; }) {})
(bind "${mod} + 4" (dsp.focus { workspace = 4; }) {})
(bind "${mod} + 5" (dsp.focus { workspace = 5; }) {})
(bind "${mod} + 6" (dsp.focus { workspace = 6; }) {})
(bind "${mod} + 7" (dsp.focus { workspace = 7; }) {})
(bind "${mod} + 8" (dsp.focus { workspace = 8; }) {})
(bind "${mod} + 9" (dsp.focus { workspace = 9; }) {})
(bind "${mod} + 1" (dsp.focus { workspace = 1; }) { })
(bind "${mod} + 2" (dsp.focus { workspace = 2; }) { })
(bind "${mod} + 3" (dsp.focus { workspace = 3; }) { })
(bind "${mod} + 4" (dsp.focus { workspace = 4; }) { })
(bind "${mod} + 5" (dsp.focus { workspace = 5; }) { })
(bind "${mod} + 6" (dsp.focus { workspace = 6; }) { })
(bind "${mod} + 7" (dsp.focus { workspace = 7; }) { })
(bind "${mod} + 8" (dsp.focus { workspace = 8; }) { })
(bind "${mod} + 9" (dsp.focus { workspace = 9; }) { })
(bind "${mod} + SHIFT + 1" (dsp.window.move { workspace = 1; }) {})
(bind "${mod} + SHIFT + 2" (dsp.window.move { workspace = 2; }) {})
(bind "${mod} + SHIFT + 3" (dsp.window.move { workspace = 3; }) {})
(bind "${mod} + SHIFT + 4" (dsp.window.move { workspace = 4; }) {})
(bind "${mod} + SHIFT + 5" (dsp.window.move { workspace = 5; }) {})
(bind "${mod} + SHIFT + 6" (dsp.window.move { workspace = 6; }) {})
(bind "${mod} + SHIFT + 7" (dsp.window.move { workspace = 7; }) {})
(bind "${mod} + SHIFT + 8" (dsp.window.move { workspace = 8; }) {})
(bind "${mod} + SHIFT + 9" (dsp.window.move { workspace = 9; }) {})
(bind "${mod} + SHIFT + 1" (dsp.window.move { workspace = 1; }) { })
(bind "${mod} + SHIFT + 2" (dsp.window.move { workspace = 2; }) { })
(bind "${mod} + SHIFT + 3" (dsp.window.move { workspace = 3; }) { })
(bind "${mod} + SHIFT + 4" (dsp.window.move { workspace = 4; }) { })
(bind "${mod} + SHIFT + 5" (dsp.window.move { workspace = 5; }) { })
(bind "${mod} + SHIFT + 6" (dsp.window.move { workspace = 6; }) { })
(bind "${mod} + SHIFT + 7" (dsp.window.move { workspace = 7; }) { })
(bind "${mod} + SHIFT + 8" (dsp.window.move { workspace = 8; }) { })
(bind "${mod} + SHIFT + 9" (dsp.window.move { workspace = 9; }) { })
(bind "XF86AudioLowerVolume" (dsp.exec_cmd "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-") {
repeating = true;

View File

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

View File

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

View File

@@ -1,4 +1,4 @@
{ config, pkgs, ... } :
{ config, pkgs, ... }:
{
environment.systemPackages = with pkgs; [

View File

@@ -1,4 +1,4 @@
{ config, pkgs, ... } :
{ config, pkgs, ... }:
{
environment.systemPackages = with pkgs; [

View File

@@ -1,5 +1,4 @@
{ config, pkgs, ... } :
{ config, pkgs, ... }:
{
environment.systemPackages = with pkgs; [

View File

@@ -34,6 +34,9 @@
# for samba
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;
};
}

View File

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

View File

@@ -1,8 +1,7 @@
{ config, pkgs, ... }:
{
imports =
[
imports = [
./hardware-configuration.nix
../modules/home-manager.nix
../modules/common.nix
@@ -51,7 +50,12 @@
home-manager.users.avravels.home.git.userEmail = "armel@webavance.nl";
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;
hardware.graphics.enable = true;
@@ -60,7 +64,12 @@
virtualisation.libvirtd.enable = true;
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" ];
};

View File

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