alyraffauf/nixcfg
1
0
Fork 0
mirror of https://github.com/alyraffauf/nixcfg.git synced 2024-11-22 15:03:55 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

modules: massive code cleanup and style improvements

Browse source
This commit is contained in:
Aly Raffauf 2024-03-16 13:18:17 -04:00
parent 155a84003c
commit e8d8a01070
12 changed files with 170 additions and 157 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
modules/desktop.nix
View file

@ -2,15 +2,13 @@
{ {
## Enable the X11 windowing system. ## Enable the X11 windowing system.
services.xserver.enable = true;
services.xserver.excludePackages = with pkgs; [
xterm
];
# Configure keymap in X11
services.xserver = { services.xserver = {
enable = true;
xkb.layout = "us"; xkb.layout = "us";
xkb.variant = ""; xkb.variant = "";
desktopManager = {
xterm.enable = false;
};
}; };
## Needed for Flatpaks ## Needed for Flatpaks

23
modules/gnome/default.nix
View file

@ -6,16 +6,6 @@
../desktop.nix ../desktop.nix
]; ];
# Enable Gnome and GDM.
services.xserver.displayManager.gdm.enable = true;
services.xserver.desktopManager.gnome.enable = true;
security.pam.services.gdm.enableKwallet = true;
services.udev.packages = with pkgs; [ gnome.gnome-settings-daemon ];
services.gnome.tracker-miners.enable = true;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
fractal fractal
gnome.gnome-software gnome.gnome-software
@ -28,4 +18,17 @@
gnomeExtensions.tailscale-status gnomeExtensions.tailscale-status
gnomeExtensions.tiling-assistant gnomeExtensions.tiling-assistant
]; ];
# Enable keyring support for KDE apps in GNOME.
security.pam.services.gdm.enableKwallet = true;
# Enable GNOME and GDM.
services = {
gnome.tracker-miners.enable = true;
udev.packages = with pkgs; [ gnome.gnome-settings-daemon ];
xserver = {
desktopManager.gnome.enable = true;
displayManager.gdm.enable = true;
};
};
} }

6
modules/homelab/default.nix
View file

@ -10,10 +10,6 @@
# services.ddclient.enable = true; # services.ddclient.enable = true;
# services.ddclient.configFile = "/etc/ddclient/ddclient.conf"; # services.ddclient.configFile = "/etc/ddclient/ddclient.conf";
# Open TCP ports for transmission-server.
networking.firewall.allowedTCPPorts = [ 51413 9091 ];
networking.firewall.allowedUDPPorts = [ 51413 ];
virtualisation.oci-containers.containers = { virtualisation.oci-containers.containers = {
audiobookshelf = { audiobookshelf = {
ports = ["0.0.0.0:13378:80"]; ports = ["0.0.0.0:13378:80"];
@ -73,7 +69,7 @@
MusicFolder = "/Music"; MusicFolder = "/Music";
DefaultTheme = "Auto"; DefaultTheme = "Auto";
SubsonicArtistParticipations = true; SubsonicArtistParticipations = true;
UIWelcomeMessage = "Welcome to Navidrome on Raffauf Labs."; UIWelcomeMessage = "Welcome to Navidrome @ raffauflabs.com.";
}; };
}; };
}; };

13
modules/homelab/nginx_proxy.nix
View file

@ -5,14 +5,19 @@
# services.ddclient.configFile = "/etc/ddclient/ddclient.conf"; # services.ddclient.configFile = "/etc/ddclient/ddclient.conf";
# Open TCP ports for audiobookshelf, plex-server, and transmission-server. # Open TCP ports for audiobookshelf, plex-server, and transmission-server.
networking.firewall.allowedTCPPorts = [ 80 443 51413 9091 ]; networking = {
networking.firewall.allowedUDPPorts = [ 51413 ]; firewall = {
allowedTCPPorts = [ 80 443 51413 9091 ];
networking.extraHosts = '' allowedUDPPorts = [ 51413 ];
};
# My router doesn't expose settings for NAT loopback
# So we have to use this workaround.
extraHosts = ''
127.0.0.1 music.raffauflabs.com 127.0.0.1 music.raffauflabs.com
127.0.0.1 podcasts.raffauflabs.com 127.0.0.1 podcasts.raffauflabs.com
127.0.0.1 plex.raffauflabs.com 127.0.0.1 plex.raffauflabs.com
''; '';
};
security.acme = { security.acme = {
acceptTerms = true; acceptTerms = true;

8
modules/homelab/samba.nix
View file

@ -1,8 +1,8 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
services.avahi.nssmdns = true; services = {
services.samba = { samba = {
enable = true; enable = true;
securityType = "user"; securityType = "user";
openFirewall = true; openFirewall = true;
@ -27,10 +27,10 @@
}; };
}; };
}; };
samba-wsdd = {
services.samba-wsdd = {
enable = true; enable = true;
openFirewall = true; openFirewall = true;
}; };
};
} }

14
modules/homelab/virtualization.nix
View file

@ -5,17 +5,13 @@
virtualisation = { virtualisation = {
libvirtd.enable = true; libvirtd.enable = true;
podman = {
enable = true;
# Create a `docker` alias for podman, to use it as a drop-in replacement
dockerCompat = true;
# Required for containers under podman-compose to be able to talk to each other.
defaultNetwork.settings.dns_enabled = true;
};
oci-containers = { oci-containers = {
backend = "podman"; backend = "podman";
}; };
podman = {
# Required for containers under podman-compose to be able to talk to each other.
defaultNetwork.settings.dns_enabled = true;
enable = true;
};
}; };
} }

10
modules/kde.nix
View file

@ -6,9 +6,13 @@
./desktop.nix ./desktop.nix
]; ];
# Enable the KDE Plasma Desktop Environment. # Enable SDDM + Plasma Desktop.
services.xserver.displayManager.sddm.wayland.enable = true; services = {
services.xserver.desktopManager.plasma6.enable = true; desktopManager.plasma6.enable = true;
xserver = {
displayManager.sddm.wayland.enable = true;
};
};
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
kdePackages.kate kdePackages.kate

9
modules/plymouth.nix
View file

@ -1,8 +1,9 @@
{ config, pkgs, ... }: { config, pkgs, ... }:
{ {
boot.initrd.verbose = false; boot = {
boot.consoleLogLevel = 0; consoleLogLevel = 0;
initrd.verbose = false;
boot.plymouth.enable = true; plymouth.enable = true;
};
} }

55
system/default.nix
View file

@ -6,13 +6,14 @@
./network.nix ./network.nix
./sound.nix ./sound.nix
]; ];
# Set your time zone. # Set your time zone.
time.timeZone = "America/New_York"; time.timeZone = "America/New_York";
# Select internationalisation properties. # Select internationalisation properties.
i18n.defaultLocale = "en_US.UTF-8"; i18n = {
defaultLocale = "en_US.UTF-8";
i18n.extraLocaleSettings = { extraLocaleSettings = {
LC_ADDRESS = "en_US.UTF-8"; LC_ADDRESS = "en_US.UTF-8";
LC_IDENTIFICATION = "en_US.UTF-8"; LC_IDENTIFICATION = "en_US.UTF-8";
LC_MEASUREMENT = "en_US.UTF-8"; LC_MEASUREMENT = "en_US.UTF-8";
@ -23,47 +24,59 @@
LC_TELEPHONE = "en_US.UTF-8"; LC_TELEPHONE = "en_US.UTF-8";
LC_TIME = "en_US.UTF-8"; LC_TIME = "en_US.UTF-8";
}; };
};
hardware = {
# Enable Bluetooth connections.
bluetooth.enable = true;
# Add support for logitech unifying receivers. # Add support for logitech unifying receivers.
hardware.logitech.wireless.enable = true; logitech.wireless = {
hardware.logitech.wireless.enableGraphical = true; enable = true;
enableGraphical = true;
};
# Add support for configuring QMK keyboards with Via. # Add support for configuring QMK keyboards with Via.
hardware.keyboard.qmk.enable = true; keyboard.qmk.enable = true;
};
# Allow unfree packages # Allow unfree packages
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
system.autoUpgrade = { system.autoUpgrade = {
enable = true;
allowReboot = true; allowReboot = true;
flake = "github:alyraffauf/nixcfg";
dates = "daily"; dates = "daily";
enable = true;
flake = "github:alyraffauf/nixcfg";
operation = "boot"; operation = "boot";
rebootWindow = { rebootWindow = {
lower = "01:00"; lower = "02:00";
upper = "05:00"; upper = "05:00";
}; };
}; };
nix = {
gc = {
# Delete generations older than 7 days. # Delete generations older than 7 days.
nix.gc = {
automatic = true; automatic = true;
dates = "weekly"; dates = "daily";
options = "--delete-older-than 7d"; options = "--delete-older-than 7d";
randomizedDelaySec = "60min";
}; };
# Automatically optimize the Nix store in the background.
nix.settings.auto-optimise-store = true;
# Run GC when there is less than 100MiB left. # Run GC when there is less than 100MiB left.
nix.extraOptions = '' extraOptions = ''
min-free = ${toString (100 * 1024 * 1024)} min-free = ${toString (100 * 1024 * 1024)}
max-free = ${toString (1024 * 1024 * 1024)} max-free = ${toString (1024 * 1024 * 1024)}
''; '';
settings = {
# Automatically optimize the Nix store in the background.
auto-optimise-store = true;
# Enable experimental `nix` command and flakes.
experimental-features = [ "nix-command" "flakes" ];
};
};
nix.settings.experimental-features = [ "nix-command" "flakes" ]; home-manager = {
useGlobalPkgs = true;
home-manager.useGlobalPkgs = true; useUserPackages = true;
home-manager.useUserPackages = true; };
} }

79
system/network.nix
View file

@ -2,50 +2,49 @@
{ {
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
networking.networkmanager.enable = true; networking = {
networkmanager.enable = true;
# Enable tailscale firewall.allowedTCPPortRanges = [
services.tailscale.enable = true; # KDE Connect
{ from = 1714; to = 1764; }
# Enable avahi. # Soulseek
services.avahi.enable = true; { from = 2234; to = 2239; }
services.avahi.publish.enable = true; ];
services.avahi.publish.addresses = true; firewall.allowedUDPPortRanges = [
services.avahi.publish.workstation = true; # KDE/GS Connect
{ from = 1714; to = 1764; }
# for a WiFi printer # Soulseek
services.avahi.openFirewall = true; { from = 2234; to = 2239; }
];
hardware.bluetooth.enable = true; };
# Enable CUPS to print documents.
services.printing.enable = true;
programs.gnupg.agent = { programs.gnupg.agent = {
enable = true; enable = true;
enableSSHSupport = true; enableSSHSupport = true;
}; };
# Enable the OpenSSH daemon. services = {
services.openssh.enable = true; # Enable avahi for auto network discovery.
avahi = {
# Open TCP ports for SSH and Syncthing. enable = true;
networking.firewall.allowedTCPPorts = [ 22 8384 22000 ]; nssmdns4 = true;
openFirewall = true;
# Open UDP ports for Syncthing. publish = {
networking.firewall.allowedUDPPorts = [ 22000 21027 ]; addresses = true;
enable = true;
networking.firewall.allowedTCPPortRanges = [ workstation = true;
# KDE Connect };
{ from = 1714; to = 1764; } };
# Soulseek # Enable remote connections with SSH.
{ from = 2234; to = 2239; } openssh = {
]; enable = true;
openFirewall = true;
networking.firewall.allowedUDPPortRanges = [ };
# KDE Connect # Enable printing.
{ from = 1714; to = 1764; } printing.enable = true;
# Soulseek # Syncthing runs as a user service, but needs its ports open here.
{ from = 2234; to = 2239; } syncthing.openDefaultPorts = true;
]; # Enable tailscale for easy Wireguard VPNs on a tailnet.
tailscale.enable = true;
};
} }

2
system/sound.nix
View file

@ -14,7 +14,5 @@
alsa.enable = true; alsa.enable = true;
alsa.support32Bit = true; alsa.support32Bit = true;
pulse.enable = true; pulse.enable = true;
# If you want to use JACK applications, uncomment this
#jack.enable = true;
}; };
} }