materus
/
nixos-config
mirror of https://github.com/materusPL/nixos-config
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

code: nixpkgs-fmt to format code

This commit is contained in:
Mateusz Słodkowicz 2024-03-11 16:19:31 +01:00
parent 8ecb892244
commit 04ad6ac1cd
Signed by: materus
GPG Key ID: 28D140BCA60B4FD1
46 changed files with 544 additions and 524 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configurations/home/genHomes.nix
View File

@ -14,7 +14,7 @@ let
value = let host = builtins.elemAt hosts i; in value = let host = builtins.elemAt hosts i; in
materusFlake.nixosConfigurations.${host}.materusCfg.hm.lib.homeManagerConfiguration { materusFlake.nixosConfigurations.${host}.materusCfg.hm.lib.homeManagerConfiguration {
pkgs = materusFlake.nixosConfigurations.${host}.pkgs; pkgs = materusFlake.nixosConfigurations.${host}.pkgs;
extraSpecialArgs = { materusCfg = materusFlake.nixosConfigurations.${host}.materusCfg // {homePath = materusFlake.selfPath + "/configurations/home/${username}"; isHm = true;}; }; extraSpecialArgs = { materusCfg = materusFlake.nixosConfigurations.${host}.materusCfg // { homePath = materusFlake.selfPath + "/configurations/home/${username}"; isHm = true; }; };
modules = [ modules = [
./${username} ./${username}
../host/${host}/extraHome.nix ../host/${host}/extraHome.nix
@ -30,7 +30,8 @@ let
(builtins.listToAttrs (_for 0)) // { (builtins.listToAttrs (_for 0)) // {
#Make generic x86_64-linux user profile "username" #Make generic x86_64-linux user profile "username"
${username} = ${username} =
let materusCfg = { let
materusCfg = {
stable = false; stable = false;
inherit materusFlake; inherit materusFlake;
host = "Generic"; host = "Generic";
@ -40,7 +41,8 @@ let
path = materusFlake.selfPath; path = materusFlake.selfPath;
homePath = materusFlake.selfPath + "/configurations/home/${username}"; homePath = materusFlake.selfPath + "/configurations/home/${username}";
isHm = true; isHm = true;
}; in };
in
inputs.configInputs.home-manager.lib.homeManagerConfiguration { inputs.configInputs.home-manager.lib.homeManagerConfiguration {
pkgs = import inputs.nixpkgs { system = "x86_64-linux"; config = { allowUnfree = true; }; }; pkgs = import inputs.nixpkgs { system = "x86_64-linux"; config = { allowUnfree = true; }; };
extraSpecialArgs = { inherit materusCfg; }; extraSpecialArgs = { inherit materusCfg; };

8
configurations/host/Old-materusPC/configuration.nix
View File

@ -137,7 +137,7 @@ in
services.fstrim = { services.fstrim = {
enable = true; enable = true;
interval = "weekly"; interval = "weekly";
}; };
# Configure network proxy if necessary # Configure network proxy if necessary
# networking.proxy.default = "http://user:password@proxy:port/"; # networking.proxy.default = "http://user:password@proxy:port/";
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
@ -665,7 +665,7 @@ in
fonts.fontconfig.enable = true; fonts.fontconfig.enable = true;
fonts.fontconfig.cache32Bit = true; fonts.fontconfig.cache32Bit = true;
fonts.fontconfig.defaultFonts.sansSerif = [ "Noto Sans" "DejaVu Sans" "WenQuanYi Zen Hei" "Noto Color Emoji" ]; fonts.fontconfig.defaultFonts.sansSerif = [ "Noto Sans" "DejaVu Sans" "WenQuanYi Zen Hei" "Noto Color Emoji" ];
fonts.fontconfig.defaultFonts.serif = [ "Noto Serif" "DejaVu Serif" "WenQuanYi Zen Hei" "Noto Color Emoji"]; fonts.fontconfig.defaultFonts.serif = [ "Noto Serif" "DejaVu Serif" "WenQuanYi Zen Hei" "Noto Color Emoji" ];
fonts.fontconfig.defaultFonts.emoji = [ "Noto Color Emoji" "OpenMoji Color" ]; fonts.fontconfig.defaultFonts.emoji = [ "Noto Color Emoji" "OpenMoji Color" ];
fonts.fontconfig.defaultFonts.monospace = [ "FiraCode Nerd Font Mono" "Noto Sans Mono" "WenQuanYi Zen Hei Mono" ]; fonts.fontconfig.defaultFonts.monospace = [ "FiraCode Nerd Font Mono" "Noto Sans Mono" "WenQuanYi Zen Hei Mono" ];
@ -753,8 +753,8 @@ in
}; };
# Open ports in the firewall. # Open ports in the firewall.
networking.firewall.allowedTCPPorts = [ 24800 5900 5357 4656]; networking.firewall.allowedTCPPorts = [ 24800 5900 5357 4656 ];
networking.firewall.allowedUDPPorts = [ 24800 5900 3702 4656]; networking.firewall.allowedUDPPorts = [ 24800 5900 3702 4656 ];
# Or disable the firewall altogether. # Or disable the firewall altogether.
networking.firewall.enable = true; networking.firewall.enable = true;

2
configurations/host/Old-materusPC/extraHome.nix
View File

@ -21,7 +21,7 @@
enableTerminalExtra = lib.mkDefault true; enableTerminalExtra = lib.mkDefault true;
enableNixDevel = lib.mkDefault true; enableNixDevel = lib.mkDefault true;
editor.code.fhs.enable = true; editor.code.fhs.enable = true;
editor.code.fhs.packages = (ps: with ps; let llvmpkgs = llvmPackages_16; in[ editor.code.fhs.packages = (ps: with ps; let llvmpkgs = llvmPackages_16; in [
llvmpkgs.clang llvmpkgs.clang
llvmpkgs.llvm llvmpkgs.llvm
llvmpkgs.bintools llvmpkgs.bintools

31
configurations/host/Old-materusPC/hardware-configuration.nix
View File

@ -5,14 +5,15 @@
{ {
imports = imports =
[ (modulesPath + "/installer/scan/not-detected.nix") [
(modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_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 = [ ];
boot.kernel.sysctl = {"vm.swappiness" = 10;}; boot.kernel.sysctl = { "vm.swappiness" = 10; };
swapDevices = [ swapDevices = [
{ {
device = "/swapfile"; device = "/swapfile";
@ -20,42 +21,49 @@
} }
]; ];
fileSystems."/" = fileSystems."/" =
{ device = "/dev/disk/by-label/NixOS_Root"; {
device = "/dev/disk/by-label/NixOS_Root";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=@" "noatime" "ssd" "space_cache=v2" ]; options = [ "subvol=@" "noatime" "ssd" "space_cache=v2" ];
}; };
fileSystems."/nix" = fileSystems."/nix" =
{ device = "/dev/disk/by-label/NixOS_Root"; {
device = "/dev/disk/by-label/NixOS_Root";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=@nix" "noatime" "compress=zstd" "ssd" "space_cache=v2" ]; options = [ "subvol=@nix" "noatime" "compress=zstd" "ssd" "space_cache=v2" ];
}; };
fileSystems."/materus" = fileSystems."/materus" =
{ device = "/dev/disk/by-label/NixOS_Root"; {
device = "/dev/disk/by-label/NixOS_Root";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=@materus" "noatime" "compress=zstd" "ssd" "space_cache=v2"]; options = [ "subvol=@materus" "noatime" "compress=zstd" "ssd" "space_cache=v2" ];
}; };
fileSystems."/etc/nixos" = fileSystems."/etc/nixos" =
{ device = "/materus/config/nixos-config"; {
device = "/materus/config/nixos-config";
fsType = "none"; fsType = "none";
options = [ "bind" ]; options = [ "bind" ];
}; };
fileSystems."/home" = fileSystems."/home" =
{ device = "/dev/disk/by-label/NixOS_Home"; {
device = "/dev/disk/by-label/NixOS_Home";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=@home" "nossd" "noatime" "compress=zstd" "space_cache=v2" "autodefrag" ]; options = [ "subvol=@home" "nossd" "noatime" "compress=zstd" "space_cache=v2" "autodefrag" ];
}; };
fileSystems."/materus/data" = fileSystems."/materus/data" =
{ device = "/dev/disk/by-label/NixOS_Home"; {
device = "/dev/disk/by-label/NixOS_Home";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=@data" "nossd" "noatime" "compress=zstd" "space_cache=v2" "autodefrag" ]; options = [ "subvol=@data" "nossd" "noatime" "compress=zstd" "space_cache=v2" "autodefrag" ];
}; };
fileSystems."/boot" = fileSystems."/boot" =
{ device = "/dev/disk/by-label/NixOS_Root"; {
device = "/dev/disk/by-label/NixOS_Root";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=@boot" "ssd" ]; options = [ "subvol=@boot" "ssd" ];
}; };
@ -63,7 +71,8 @@
fileSystems."/boot/efi" = fileSystems."/boot/efi" =
{ device = "/dev/disk/by-label/NixOS_EFI"; {
device = "/dev/disk/by-label/NixOS_EFI";
fsType = "vfat"; fsType = "vfat";
}; };

3
configurations/host/materusPC/audio.nix
View File

@ -14,7 +14,8 @@
}; };
hardware.pulseaudio.enable = false; hardware.pulseaudio.enable = false;
environment.sessionVariables = let environment.sessionVariables =
let
makePluginPath = format: makePluginPath = format:
(lib.makeSearchPath format [ (lib.makeSearchPath format [
"$HOME/.nix-profile/lib" "$HOME/.nix-profile/lib"

3
configurations/host/materusPC/gnome.nix
View File

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

8
configurations/host/materusPC/kde.nix
View File

@ -29,7 +29,7 @@ in
services.xserver.displayManager.sddm.settings = { services.xserver.displayManager.sddm.settings = {
General = { General = {
#DisplayServer = "wayland"; #DisplayServer = "wayland";
InputMethod=""; InputMethod = "";
}; };
Theme = { Theme = {
CursorTheme = "breeze_cursors"; CursorTheme = "breeze_cursors";
@ -50,12 +50,12 @@ in
#KWIN_DRM_NO_AMS = "1"; #KWIN_DRM_NO_AMS = "1";
#Fix for amdgpu crashes #Fix for amdgpu crashes
KWIN_DRM_USE_MODIFIERS="0"; KWIN_DRM_USE_MODIFIERS = "0";
KWIN_DRM_NO_DIRECT_SCANOUT="1"; KWIN_DRM_NO_DIRECT_SCANOUT = "1";
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
]; ];
materus.profile.steam.extraPkgs = [pkgs.kdePackages.breeze pkgs.kdePackages.breeze-gtk pkgs.kdePackages.dolphin]; materus.profile.steam.extraPkgs = [ pkgs.kdePackages.breeze pkgs.kdePackages.breeze-gtk pkgs.kdePackages.dolphin ];
} }

4
configurations/host/materusPC/network.nix
View File

@ -6,8 +6,8 @@
networking.networkmanager.enable = true; networking.networkmanager.enable = true;
#networking.networkmanager.wifi.backend = "iwd"; #networking.networkmanager.wifi.backend = "iwd";
networking.firewall.enable = true; networking.firewall.enable = true;
networking.firewall.allowedTCPPorts = [ 24800 5900 5357 4656 8080 9943 9944]; networking.firewall.allowedTCPPorts = [ 24800 5900 5357 4656 8080 9943 9944 ];
networking.firewall.allowedUDPPorts = [ 24800 5900 3702 4656 6000 9943 9944]; networking.firewall.allowedUDPPorts = [ 24800 5900 3702 4656 6000 9943 9944 ];
#Fix warning #Fix warning
networking.networkmanager.extraConfig = lib.mkDefault '' networking.networkmanager.extraConfig = lib.mkDefault ''
[connectivity] [connectivity]

48
configurations/host/materusPC/scripts.nix
View File

@ -1,46 +1,46 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
let let
valkyrie-sync = pkgs.writeShellScriptBin "valkyrie-sync" '' valkyrie-sync = pkgs.writeShellScriptBin "valkyrie-sync" ''
${pkgs.rsync}/bin/rsync -avzrh --delete --exclude ".git*" --exclude "flake.lock" /materus/config/nixos-config materus@valkyrie:/materus/config/ && \ ${pkgs.rsync}/bin/rsync -avzrh --delete --exclude ".git*" --exclude "flake.lock" /materus/config/nixos-config materus@valkyrie:/materus/config/ && \
${pkgs.rsync}/bin/rsync -avzrh --delete --exclude ".git*" /materus/config/private/valkyrie materus@valkyrie:/materus/config/private ${pkgs.rsync}/bin/rsync -avzrh --delete --exclude ".git*" /materus/config/private/valkyrie materus@valkyrie:/materus/config/private
''; '';
valkyrie-flakelock = pkgs.writeShellScriptBin "valkyrie-flakelock" '' valkyrie-flakelock = pkgs.writeShellScriptBin "valkyrie-flakelock" ''
${pkgs.openssh}/bin/ssh materus@valkyrie "nix flake update /materus/config/nixos-config --override-input nixpkgs github:NixOS/nixpkgs/23.05 \ ${pkgs.openssh}/bin/ssh materus@valkyrie "nix flake update /materus/config/nixos-config --override-input nixpkgs github:NixOS/nixpkgs/23.05 \
--override-input home-manager github:nix-community/home-manager/release-23.05 \ --override-input home-manager github:nix-community/home-manager/release-23.05 \
--override-input private /materus/config/private/valkyrie/flake" --override-input private /materus/config/private/valkyrie/flake"
''; '';
valkyrie-rebuild-boot = pkgs.writeShellScriptBin "valkyrie-rebuild-boot" '' valkyrie-rebuild-boot = pkgs.writeShellScriptBin "valkyrie-rebuild-boot" ''
${pkgs.openssh}/bin/ssh -t materus@valkyrie "sudo nixos-rebuild boot --flake /materus/config/nixos-config#valkyrie \ ${pkgs.openssh}/bin/ssh -t materus@valkyrie "sudo nixos-rebuild boot --flake /materus/config/nixos-config#valkyrie \
--override-input private /materus/config/private/valkyrie/flake" --override-input private /materus/config/private/valkyrie/flake"
''; '';
valkyrie-rebuild-switch = pkgs.writeShellScriptBin "valkyrie-rebuild-switch" '' valkyrie-rebuild-switch = pkgs.writeShellScriptBin "valkyrie-rebuild-switch" ''
${pkgs.openssh}/bin/ssh -t materus@valkyrie "sudo nixos-rebuild switch --flake /materus/config/nixos-config#valkyrie \ ${pkgs.openssh}/bin/ssh -t materus@valkyrie "sudo nixos-rebuild switch --flake /materus/config/nixos-config#valkyrie \
--override-input private /materus/config/private/valkyrie/flake" --override-input private /materus/config/private/valkyrie/flake"
''; '';
flamaster-sync = pkgs.writeShellScriptBin "flamaster-sync" '' flamaster-sync = pkgs.writeShellScriptBin "flamaster-sync" ''
${pkgs.rsync}/bin/rsync -avzrh --delete --exclude ".git*" --exclude "flake.lock" /materus/config/nixos-config materus@flamaster:/materus/config/ && \ ${pkgs.rsync}/bin/rsync -avzrh --delete --exclude ".git*" --exclude "flake.lock" /materus/config/nixos-config materus@flamaster:/materus/config/ && \
${pkgs.rsync}/bin/rsync -avzrh --delete --exclude ".git*" /materus/config/private/flamaster materus@flamaster:/materus/config/private ${pkgs.rsync}/bin/rsync -avzrh --delete --exclude ".git*" /materus/config/private/flamaster materus@flamaster:/materus/config/private
''; '';
flamaster-flakelock = pkgs.writeShellScriptBin "flamaster-flakelock" '' flamaster-flakelock = pkgs.writeShellScriptBin "flamaster-flakelock" ''
${pkgs.openssh}/bin/ssh materus@flamaster "nix flake update /materus/config/nixos-config --override-input nixpkgs github:NixOS/nixpkgs/23.05 \ ${pkgs.openssh}/bin/ssh materus@flamaster "nix flake update /materus/config/nixos-config --override-input nixpkgs github:NixOS/nixpkgs/23.05 \
--override-input home-manager github:nix-community/home-manager/release-23.05 \ --override-input home-manager github:nix-community/home-manager/release-23.05 \
--override-input private /materus/config/private/flamaster/flake" --override-input private /materus/config/private/flamaster/flake"
''; '';
flamaster-rebuild-boot = pkgs.writeShellScriptBin "flamaster-rebuild-boot" '' flamaster-rebuild-boot = pkgs.writeShellScriptBin "flamaster-rebuild-boot" ''
${pkgs.openssh}/bin/ssh -t materus@flamaster "sudo nixos-rebuild boot --flake /materus/config/nixos-config#flamaster \ ${pkgs.openssh}/bin/ssh -t materus@flamaster "sudo nixos-rebuild boot --flake /materus/config/nixos-config#flamaster \
--override-input private /materus/config/private/flamaster/flake" --override-input private /materus/config/private/flamaster/flake"
''; '';
flamaster-rebuild-switch = pkgs.writeShellScriptBin "flamaster-rebuild-switch" '' flamaster-rebuild-switch = pkgs.writeShellScriptBin "flamaster-rebuild-switch" ''
${pkgs.openssh}/bin/ssh -t materus@flamaster "sudo nixos-rebuild switch --flake /materus/config/nixos-config#flamaster \ ${pkgs.openssh}/bin/ssh -t materus@flamaster "sudo nixos-rebuild switch --flake /materus/config/nixos-config#flamaster \
--override-input private /materus/config/private/flamaster/flake" --override-input private /materus/config/private/flamaster/flake"
''; '';
in in

6
configurations/host/materusPC/secrets/default.nix
View File

@ -3,13 +3,13 @@
imports = imports =
[ [
] ++ (if (materusCfg.materusFlake.decrypted) then [ ./private ] else [] ); ] ++ (if (materusCfg.materusFlake.decrypted) then [ ./private ] else [ ]);
sops.age.generateKey = false; sops.age.generateKey = false;
sops.gnupg.home = null; sops.gnupg.home = null;
sops.gnupg.sshKeyPaths = []; sops.gnupg.sshKeyPaths = [ ];
sops.defaultSopsFile = materusCfg.hostPath + "/secrets/secrets.yaml"; sops.defaultSopsFile = materusCfg.hostPath + "/secrets/secrets.yaml";
sops.secrets."users/materus" = {}; sops.secrets."users/materus" = { };
services.openssh.hostKeys = [ services.openssh.hostKeys = [
{ {

10
configurations/host/materusPC/tmp.nix
View File

@ -103,10 +103,10 @@
XDG_BIN_HOME = "\${HOME}/.local/bin"; XDG_BIN_HOME = "\${HOME}/.local/bin";
XDG_DATA_HOME = "\${HOME}/.local/share"; XDG_DATA_HOME = "\${HOME}/.local/share";
QT_XKB_CONFIG_ROOT = "\${XKB_CONFIG_ROOT}"; QT_XKB_CONFIG_ROOT = "\${XKB_CONFIG_ROOT}";
GTK_IM_MODULE="fcitx"; GTK_IM_MODULE = "fcitx";
QT_IM_MODULE="fcitx"; QT_IM_MODULE = "fcitx";
XMODIFIERS="@im=fcitx"; XMODIFIERS = "@im=fcitx";
SDL_IM_MODULE="fcitx"; SDL_IM_MODULE = "fcitx";
#SDL_AUDIODRIVER = "pipewire"; #SDL_AUDIODRIVER = "pipewire";
#SSH_ASKPASS_REQUIRE = "prefer"; #SSH_ASKPASS_REQUIRE = "prefer";
@ -122,7 +122,7 @@
''; '';
i18n.inputMethod.enabled = "fcitx5"; i18n.inputMethod.enabled = "fcitx5";
i18n.inputMethod.fcitx5.addons = [ pkgs.fcitx5-configtool pkgs.fcitx5-lua pkgs.fcitx5-mozc pkgs.fcitx5-gtk pkgs.kdePackages.fcitx5-qt]; i18n.inputMethod.fcitx5.addons = [ pkgs.fcitx5-configtool pkgs.fcitx5-lua pkgs.fcitx5-mozc pkgs.fcitx5-gtk pkgs.kdePackages.fcitx5-qt ];
# Some programs need SUID wrappers, can be configured further or are # Some programs need SUID wrappers, can be configured further or are

9
configurations/host/materusPC/vm/default.nix
View File

@ -5,17 +5,20 @@
]; ];
systemd.mounts = [ systemd.mounts = [
{ where = "/dev/hugepages"; {
where = "/dev/hugepages";
enable = false; enable = false;
} }
{ where = "/dev/hugepages/hugepages-2048kB"; {
where = "/dev/hugepages/hugepages-2048kB";
enable = true; enable = true;
what = "hugetlbfs"; what = "hugetlbfs";
type = "hugetlbfs"; type = "hugetlbfs";
options = "pagesize=2M"; options = "pagesize=2M";
requiredBy = [ "basic.target" ]; requiredBy = [ "basic.target" ];
} }
{ where = "/dev/hugepages/hugepages-1048576kB"; {
where = "/dev/hugepages/hugepages-1048576kB";
enable = true; enable = true;
what = "hugetlbfs"; what = "hugetlbfs";
type = "hugetlbfs"; type = "hugetlbfs";

18
configurations/host/valkyrie/services/pihole.nix
View File

@ -1,18 +1,20 @@
{ config, pkgs, lib, materusArg, ... }: { config, pkgs, lib, materusArg, ... }:
{ {
options.valkyrieService.pihole.enable = materusArg.pkgs.lib.mkBoolOpt false "Enable pihole"; options.valkyrieService.pihole.enable = materusArg.pkgs.lib.mkBoolOpt false "Enable pihole";
options.valkyrieService.pihole.dnsIP = lib.mkOption { default = "127.0.0.1";}; options.valkyrieService.pihole.dnsIP = lib.mkOption { default = "127.0.0.1"; };
options.valkyrieService.pihole.webIP = lib.mkOption { default = "127.0.0.1";}; options.valkyrieService.pihole.webIP = lib.mkOption { default = "127.0.0.1"; };
config = let config =
let
cfg = config.valkyrieService.pihole; cfg = config.valkyrieService.pihole;
dnsmasqConf = pkgs.writeText "02-dnsmasq-custom.conf" '' dnsmasqConf = pkgs.writeText "02-dnsmasq-custom.conf" ''
no-hosts no-hosts
''; '';
in lib.mkIf config.valkyrieService.pihole.enable { in
lib.mkIf config.valkyrieService.pihole.enable {
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [
"d /var/lib/dnsmasq.d 0776 root root -" "d /var/lib/dnsmasq.d 0776 root root -"
"d /var/lib/pihole 0776 root root -" "d /var/lib/pihole 0776 root root -"
@ -29,10 +31,10 @@
]; ];
environment = { environment = {
TZ = "Europe/Warsaw"; TZ = "Europe/Warsaw";
FTLCONF_LOCAL_IPV4="127.0.0.1"; FTLCONF_LOCAL_IPV4 = "127.0.0.1";
DNSMASQ_USER="root"; DNSMASQ_USER = "root";
VIRTUAL_HOST="pi.hole"; VIRTUAL_HOST = "pi.hole";
PROXY_LOCATION="pi.hole"; PROXY_LOCATION = "pi.hole";
}; };
volumes = [ volumes = [
"/var/lib/pihole/:/etc/pihole/" "/var/lib/pihole/:/etc/pihole/"

5
configurations/host/waffentrager/configuration.nix
View File

@ -6,7 +6,8 @@
{ {
imports = imports =
[ # Include the results of the hardware scan. [
# Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-configuration.nix
]; ];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
@ -37,7 +38,7 @@
"https://cache.nixos.org/" "https://cache.nixos.org/"
"https://nixerus.cachix.org/" "https://nixerus.cachix.org/"
]; ];
trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nixerus.cachix.org-1:2x7sIG7y1vAoxc8BNRJwsfapZsiX4hIl4aTi9V5ZDdE="]; trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nixerus.cachix.org-1:2x7sIG7y1vAoxc8BNRJwsfapZsiX4hIl4aTi9V5ZDdE=" ];
}; };
}; };
# Use the extlinux boot loader. (NixOS wants to enable GRUB by default) # Use the extlinux boot loader. (NixOS wants to enable GRUB by default)

6
configurations/host/waffentrager/hardware-configuration.nix
View File

@ -5,7 +5,8 @@
{ {
imports = imports =
[ (modulesPath + "/installer/scan/not-detected.nix") [
(modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.kernelPackages = pkgs.linuxPackages_rpi4; boot.kernelPackages = pkgs.linuxPackages_rpi4;
boot.initrd.availableKernelModules = [ "xhci_pci" "usb_storage" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "usb_storage" ];
@ -16,7 +17,8 @@
"vm.swappiness" = 10; "vm.swappiness" = 10;
}; };
fileSystems."/" = fileSystems."/" =
{ device = "/dev/disk/by-uuid/44444444-4444-4444-8888-888888888888"; {
device = "/dev/disk/by-uuid/44444444-4444-4444-8888-888888888888";
fsType = "ext4"; fsType = "ext4";
}; };
fileSystems."/etc/nixos" = fileSystems."/etc/nixos" =

8
configurations/profile/common/default.nix
View File

@ -1,17 +1,17 @@
{ config, pkgs, lib, materusCfg, ... }: { config, pkgs, lib, materusCfg, ... }:
let let
materusArg = { materusArg = {
pkgs = (import materusCfg.nixerus { inherit pkgs; }) // pkgs = (import materusCfg.nixerus { inherit pkgs; }) //
(if pkgs.system == "x86_64-linux" then { i686Linux = import materusCfg.nixerus { pkgs = pkgs.pkgsi686Linux; }; } else { }); (if pkgs.system == "x86_64-linux" then { i686Linux = import materusCfg.nixerus { pkgs = pkgs.pkgsi686Linux; }; } else { });
cfg = materusCfg; cfg = materusCfg;
}; };
in in
{ {
imports = [ imports = [
./nixpkgs.nix ./nixpkgs.nix
./packages ./packages
]; ];
options.materus.materusArg = lib.mkOption {default = {};}; options.materus.materusArg = lib.mkOption { default = { }; };
config._module.args.materusArg = config.materus.materusArg // materusArg; config._module.args.materusArg = config.materus.materusArg // materusArg;
config.warnings = lib.mkIf (!materusCfg.materusFlake.decrypted) ["Repository not decrypted, private configs not loaded, use crypt.sh to decrypt"]; config.warnings = lib.mkIf (!materusCfg.materusFlake.decrypted) [ "Repository not decrypted, private configs not loaded, use crypt.sh to decrypt" ];
} }

4
configurations/profile/common/nixpkgs.nix
View File

@ -14,12 +14,12 @@ in
options.materus.profile.nixpkgs.enableOverlays = mkBoolOpt (cfg.enable) "Enable materus overlays"; options.materus.profile.nixpkgs.enableOverlays = mkBoolOpt (cfg.enable) "Enable materus overlays";
options.materus.profile.nix.enableRegistry = mkBoolOpt (!materusCfg.isHm) "Enable materus nix registry"; options.materus.profile.nix.enableRegistry = mkBoolOpt (!materusCfg.isHm) "Enable materus nix registry";
config.nixpkgs.config = lib.mkIf cfg.enable{ config.nixpkgs.config = lib.mkIf cfg.enable {
allowUnfree = lib.mkDefault true; allowUnfree = lib.mkDefault true;
joypixels.acceptLicense = lib.mkDefault true; joypixels.acceptLicense = lib.mkDefault true;
firefox.enablePlasmaBrowserIntegration = true; firefox.enablePlasmaBrowserIntegration = true;
}; };
config.nixpkgs.overlays = lib.mkIf cfg.enableOverlays [materusArg.cfg.configInputs.emacs-overlay.overlay]; config.nixpkgs.overlays = lib.mkIf cfg.enableOverlays [ materusArg.cfg.configInputs.emacs-overlay.overlay ];
config.nix.package = lib.mkDefault pkgs.nixUnstable; config.nix.package = lib.mkDefault pkgs.nixUnstable;
config.nix.registry = lib.mkIf config.materus.profile.nix.enableRegistry { config.nix.registry = lib.mkIf config.materus.profile.nix.enableRegistry {

2
configurations/profile/common/packages/fonts.nix
View File

@ -16,7 +16,7 @@ let
pkgs.noto-fonts-cjk-serif pkgs.noto-fonts-cjk-serif
pkgs.wqy_zenhei pkgs.wqy_zenhei
pkgs.corefonts pkgs.corefonts
(pkgs.nerdfonts.override { fonts = [ "FiraCode"]; }) (pkgs.nerdfonts.override { fonts = [ "FiraCode" ]; })
] ++ defaultFonts; ] ++ defaultFonts;

4
configurations/profile/home/browser.nix
View File

@ -1,10 +1,10 @@
{ config, lib, pkgs, materusArg, ... }: { config, lib, pkgs, materusArg, ... }:
let let
cfg = config.materus.profile.browser; cfg = config.materus.profile.browser;
in in
{ {
options= let mkBoolOpt = materusArg.pkgs.lib.mkBoolOpt; in{ options = let mkBoolOpt = materusArg.pkgs.lib.mkBoolOpt; in {
materus.profile.browser.firefox.enable = mkBoolOpt config.materus.profile.enableDesktop "Enable Firefox with materus cfg"; materus.profile.browser.firefox.enable = mkBoolOpt config.materus.profile.enableDesktop "Enable Firefox with materus cfg";
materus.profile.browser.vivaldi.enable = mkBoolOpt config.materus.profile.enableDesktop "Enable Vivaldi with materus cfg"; materus.profile.browser.vivaldi.enable = mkBoolOpt config.materus.profile.enableDesktop "Enable Vivaldi with materus cfg";
materus.profile.browser.brave.enable = mkBoolOpt false "Enable Brave with materus cfg"; materus.profile.browser.brave.enable = mkBoolOpt false "Enable Brave with materus cfg";

6
configurations/profile/home/default.nix
View File

@ -20,9 +20,9 @@ in
config = config =
{ {
home.packages = (if cfg.enableDesktop then packages.list.desktopApps else []) ++ home.packages = (if cfg.enableDesktop then packages.list.desktopApps else [ ]) ++
(if cfg.enableNixDevel then packages.list.nixRelated else []) ++ (if cfg.enableNixDevel then packages.list.nixRelated else [ ]) ++
(if cfg.enableTerminal then packages.list.terminalApps else []); (if cfg.enableTerminal then packages.list.terminalApps else [ ]);
#Desktop #Desktop
programs.feh.enable = lib.mkDefault cfg.enableDesktop; programs.feh.enable = lib.mkDefault cfg.enableDesktop;

2
configurations/profile/home/editor/code.nix
View File

@ -5,7 +5,7 @@ in
{ {
options.materus.profile.editor.code.enable = materusArg.pkgs.lib.mkBoolOpt config.materus.profile.enableDesktop "Enable VSCodium with materus cfg"; options.materus.profile.editor.code.enable = materusArg.pkgs.lib.mkBoolOpt config.materus.profile.enableDesktop "Enable VSCodium with materus cfg";
options.materus.profile.editor.code.fhs.enable = materusArg.pkgs.lib.mkBoolOpt false "Use fhs vscodium"; options.materus.profile.editor.code.fhs.enable = materusArg.pkgs.lib.mkBoolOpt false "Use fhs vscodium";
options.materus.profile.editor.code.fhs.packages = lib.mkOption { default = (ps: []);}; options.materus.profile.editor.code.fhs.packages = lib.mkOption { default = (ps: [ ]); };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
programs.vscode = { programs.vscode = {
enable = lib.mkDefault true; enable = lib.mkDefault true;

2
configurations/profile/home/editor/emacs/default.nix
View File

@ -2,7 +2,7 @@
let let
configPath = "${materusArg.cfg.path}" + "/extraFiles/config/emacs/"; configPath = "${materusArg.cfg.path}" + "/extraFiles/config/emacs/";
inits = import ./init.nix {path = configPath; inherit pkgs;}; inits = import ./init.nix { path = configPath; inherit pkgs; };
packages = epkgs: with epkgs; [ packages = epkgs: with epkgs; [
load-relative load-relative
elcord elcord

2
configurations/profile/home/editor/emacs/init.nix
View File

@ -1,4 +1,4 @@
{path, pkgs}: { path, pkgs }:
{ {
earlyInitText = '' earlyInitText = ''

2
configurations/profile/home/editor/neovim.nix
View File

@ -1,6 +1,6 @@
{ config, lib, pkgs, materusArg, ... }: { config, lib, pkgs, materusArg, ... }:
let let
cfg = config.materus.profile.editor.neovim; cfg = config.materus.profile.editor.neovim;
in in
{ {
options.materus.profile.editor.neovim.enable = materusArg.pkgs.lib.mkBoolOpt config.materus.profile.enableTerminalExtra "Enable neovim with materus cfg"; options.materus.profile.editor.neovim.enable = materusArg.pkgs.lib.mkBoolOpt config.materus.profile.enableTerminalExtra "Enable neovim with materus cfg";

4
configurations/profile/home/shell/bash.nix
View File

@ -1,6 +1,6 @@
{ config, pkgs, lib, materusArg, ... }: { config, pkgs, lib, materusArg, ... }:
let let
cfg = config.materus.profile.bash; cfg = config.materus.profile.bash;
in in
{ {
options.materus.profile.bash.enable = materusArg.pkgs.lib.mkBoolOpt config.materus.profile.enableTerminal "Enable materus bash config"; options.materus.profile.bash.enable = materusArg.pkgs.lib.mkBoolOpt config.materus.profile.enableTerminal "Enable materus bash config";
@ -12,7 +12,7 @@ in
enable = lib.mkDefault true; enable = lib.mkDefault true;
enableCompletion = lib.mkDefault true; enableCompletion = lib.mkDefault true;
enableVteIntegration = lib.mkDefault true; enableVteIntegration = lib.mkDefault true;
historyControl = lib.mkDefault ["erasedups" "ignorespace"]; historyControl = lib.mkDefault [ "erasedups" "ignorespace" ];
shellOptions = lib.mkDefault [ "autocd" "checkwinsize" "cmdhist" "expand_aliases" "extglob" "globstar" "checkjobs" "nocaseglob" ]; shellOptions = lib.mkDefault [ "autocd" "checkwinsize" "cmdhist" "expand_aliases" "extglob" "globstar" "checkjobs" "nocaseglob" ];
}; };
}; };

2
configurations/profile/home/shell/fish.nix
View File

@ -1,6 +1,6 @@
{ config, pkgs, lib, materusArg, ... }: { config, pkgs, lib, materusArg, ... }:
let let
cfg = config.materus.profile.fish; cfg = config.materus.profile.fish;
in in
{ {
options.materus.profile.fish.enable = materusArg.pkgs.lib.mkBoolOpt config.materus.profile.enableTerminalExtra "Enable materus fish config"; options.materus.profile.fish.enable = materusArg.pkgs.lib.mkBoolOpt config.materus.profile.enableTerminalExtra "Enable materus fish config";

4
configurations/profile/home/shell/starship.nix
View File

@ -28,8 +28,8 @@ in
shell = { shell = {
disabled = false; disabled = false;
fish_indicator = "fish"; fish_indicator = "fish";
bash_indicator= "bash"; bash_indicator = "bash";
zsh_indicator= "zsh"; zsh_indicator = "zsh";
style = "blue bold"; style = "blue bold";
}; };

7
configurations/profile/home/shell/zsh.nix
View File

@ -2,7 +2,8 @@
let let
relToDotDir = file: (lib.optionalString (config.programs.zsh.dotDir != null) (config.programs.zsh.dotDir + "/")) + file; relToDotDir = file: (lib.optionalString (config.programs.zsh.dotDir != null) (config.programs.zsh.dotDir + "/")) + file;
pluginsDir = if config.programs.zsh.dotDir != null then pluginsDir =
if config.programs.zsh.dotDir != null then
relToDotDir "plugins" else ".zsh/plugins"; relToDotDir "plugins" else ".zsh/plugins";
@ -44,7 +45,7 @@ in
{ {
options.materus.profile.zsh.enable = materusArg.pkgs.lib.mkBoolOpt config.materus.profile.enableTerminalExtra "Enable materus zsh config"; options.materus.profile.zsh.enable = materusArg.pkgs.lib.mkBoolOpt config.materus.profile.enableTerminalExtra "Enable materus zsh config";
options.materus.profile.zsh.prompt = lib.mkOption { options.materus.profile.zsh.prompt = lib.mkOption {
type = lib.types.enum ["p10k" "starship"]; type = lib.types.enum [ "p10k" "starship" ];
example = "p10k"; example = "p10k";
default = "p10k"; default = "p10k";
}; };
@ -55,7 +56,7 @@ in
pkgs.ripgrep pkgs.ripgrep
]; ];
home.file = builtins.foldl' (a: b: a // b) {} (builtins.map (plugin: {${plugin.path}.source = plugin.src;})(builtins.attrValues extraPlugins)); home.file = builtins.foldl' (a: b: a // b) { } (builtins.map (plugin: { ${plugin.path}.source = plugin.src; }) (builtins.attrValues extraPlugins));
programs.zsh = { programs.zsh = {
enable = true; enable = true;

2
configurations/profile/os/default.nix
View File

@ -6,7 +6,7 @@
./games ./games
]; ];
/* /*
users.users.nixos-rebuild = { users.users.nixos-rebuild = {
#isSystemUser = true; #isSystemUser = true;
isNormalUser = true; isNormalUser = true;

2
configurations/profile/os/games/steam.nix
View File

@ -109,7 +109,7 @@ in
description = "Package used by steam"; description = "Package used by steam";
}; };
options.materus.profile.steam.extraPkgs = lib.mkOption { options.materus.profile.steam.extraPkgs = lib.mkOption {
default = []; default = [ ];
description = "Extra packages for steam"; description = "Extra packages for steam";
}; };

2
configurations/profile/os/nix.nix
View File

@ -16,7 +16,7 @@ in
"https://cache.nixos.org/" "https://cache.nixos.org/"
"https://nixerus.cachix.org/" "https://nixerus.cachix.org/"
]; ];
trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nixerus.cachix.org-1:2x7sIG7y1vAoxc8BNRJwsfapZsiX4hIl4aTi9V5ZDdE="]; trusted-public-keys = [ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nixerus.cachix.org-1:2x7sIG7y1vAoxc8BNRJwsfapZsiX4hIl4aTi9V5ZDdE=" ];
}; };
}; };
} }