aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--hosts/nyaan/hardware.nix49
-rw-r--r--hosts/sagittarius/auto-update.nix5
-rw-r--r--hosts/sagittarius/headscale.nix5
-rw-r--r--hosts/sagittarius/web/git.nix2
-rw-r--r--hosts/underworld/default.nix1
-rw-r--r--share/cfg/waybar.css3
-rw-r--r--share/home/gui-tools.nix42
-rw-r--r--share/home/niri.nix2
-rw-r--r--wireguard.nix5
9 files changed, 69 insertions, 45 deletions
diff --git a/hosts/nyaan/hardware.nix b/hosts/nyaan/hardware.nix
index d3a1025..7bf5004 100644
--- a/hosts/nyaan/hardware.nix
+++ b/hosts/nyaan/hardware.nix
@@ -1,32 +1,47 @@
# 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 = [ "nvme" "xhci_pci" "thunderbolt" "usb_storage" "sd_mod" ];
+ boot.initrd.availableKernelModules = [
+ "nvme"
+ "xhci_pci"
+ "thunderbolt"
+ "usb_storage"
+ "sd_mod"
+ ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ "kvm-amd" ];
boot.extraModulePackages = [ ];
- fileSystems."/" =
- { device = "/dev/disk/by-uuid/20fc22cd-161a-4537-b432-adf6c60c9f1c";
- fsType = "btrfs";
- };
+ fileSystems."/" = {
+ device = "/dev/disk/by-uuid/20fc22cd-161a-4537-b432-adf6c60c9f1c";
+ fsType = "btrfs";
+ };
- fileSystems."/boot" =
- { device = "/dev/disk/by-uuid/B057-BE14";
- fsType = "vfat";
- options = [ "fmask=0077" "dmask=0077" ];
- };
-
- swapDevices =
- [ { device = "/dev/disk/by-uuid/253a1a87-9919-4262-8ae9-63ad63b00648"; }
+ fileSystems."/boot" = {
+ device = "/dev/disk/by-uuid/B057-BE14";
+ fsType = "vfat";
+ options = [
+ "fmask=0077"
+ "dmask=0077"
];
+ };
+
+ swapDevices = [
+ { device = "/dev/disk/by-uuid/253a1a87-9919-4262-8ae9-63ad63b00648"; }
+ ];
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
diff --git a/hosts/sagittarius/auto-update.nix b/hosts/sagittarius/auto-update.nix
index dfe9ab8..8fb2a07 100644
--- a/hosts/sagittarius/auto-update.nix
+++ b/hosts/sagittarius/auto-update.nix
@@ -22,7 +22,10 @@ in
StandardOutput = "journal";
StandardError = "journal";
};
- path = [ pkgs.gitMinimal pkgs.nixos-rebuild-ng ];
+ path = [
+ pkgs.gitMinimal
+ pkgs.nixos-rebuild-ng
+ ];
# we need root privileges for a system update anyway
confinement.enable = false;
diff --git a/hosts/sagittarius/headscale.nix b/hosts/sagittarius/headscale.nix
index f45534d..3887de3 100644
--- a/hosts/sagittarius/headscale.nix
+++ b/hosts/sagittarius/headscale.nix
@@ -14,7 +14,10 @@ in
server_url = "https://${domain}";
dns = {
base_domain = "sorre.internal";
- nameservers.global = [ "1.1.1.1" "2301:db8:acad:a::1" ];
+ nameservers.global = [
+ "1.1.1.1"
+ "2301:db8:acad:a::1"
+ ];
extra_records = [
{
name = "vaultwarden.sorre.internal";
diff --git a/hosts/sagittarius/web/git.nix b/hosts/sagittarius/web/git.nix
index 9c3180a..b44d556 100644
--- a/hosts/sagittarius/web/git.nix
+++ b/hosts/sagittarius/web/git.nix
@@ -4,7 +4,7 @@ let
domainInternal = "git.sorre.internal";
domainPublic = "git.sorre.xyz";
- commonSettings= {
+ commonSettings = {
readme = "main:README.md";
};
in
diff --git a/hosts/underworld/default.nix b/hosts/underworld/default.nix
index 2d1c814..f055f7a 100644
--- a/hosts/underworld/default.nix
+++ b/hosts/underworld/default.nix
@@ -99,7 +99,6 @@
#media-session.enable = true;
};
-
# Since 6.17, the special WiFi hardware I'm using should work since 6.17.
boot.kernelPackages = lib.mkForce (
if builtins.compareVersions pkgs.linuxPackages.kernel.version "6.17" >= 0 then
diff --git a/share/cfg/waybar.css b/share/cfg/waybar.css
index b17e6d1..ed92ef2 100644
--- a/share/cfg/waybar.css
+++ b/share/cfg/waybar.css
@@ -97,7 +97,8 @@ button:hover {
color: #000000;
}
-#battery.charging, #battery.plugged {
+#battery.charging,
+#battery.plugged {
color: #ffffff;
background-color: #26a65b;
}
diff --git a/share/home/gui-tools.nix b/share/home/gui-tools.nix
index 9cbcc43..1caefe4 100644
--- a/share/home/gui-tools.nix
+++ b/share/home/gui-tools.nix
@@ -5,27 +5,29 @@
./wayland-common.nix
];
- home.packages = builtins.attrValues {
- inherit (pkgs)
- thunderbird # email client
- nsxiv # image viewer
- qbittorrent # bittorrent client
- discord
- gimp
- libreoffice-qt6-fresh
- haruna
- calibre
- mullvad-vpn
- ente-desktop
- wireshark
+ home.packages =
+ builtins.attrValues {
+ inherit (pkgs)
+ thunderbird # email client
+ nsxiv # image viewer
+ qbittorrent # bittorrent client
+ discord
+ gimp
+ libreoffice-qt6-fresh
+ haruna
+ calibre
+ mullvad-vpn
+ ente-desktop
+ wireshark
- # Other
- # It seems that not all gtk icon themes contain all icons? At least the
- # Flat-Remix icon themes don't contain all the icons that Foliate uses,
- # so I'm bringing in the adwaita icons as a fallback.
- adwaita-icon-theme
- ;
- } ++ [ pkgs.sorre.signal-desktop ];
+ # Other
+ # It seems that not all gtk icon themes contain all icons? At least the
+ # Flat-Remix icon themes don't contain all the icons that Foliate uses,
+ # so I'm bringing in the adwaita icons as a fallback.
+ adwaita-icon-theme
+ ;
+ }
+ ++ [ pkgs.sorre.signal-desktop ];
programs.firefox = {
enable = true;
diff --git a/share/home/niri.nix b/share/home/niri.nix
index 0150235..4447aeb 100644
--- a/share/home/niri.nix
+++ b/share/home/niri.nix
@@ -186,7 +186,7 @@ in
matches = [
{ app-id = ''^org\.keepassxc\.KeePassXC$''; }
{ app-id = ''^org\.gnome\.World\.Secrets$''; }
- { app-id = ''^Bitwarden$''; }
+ { app-id = "^Bitwarden$"; }
];
block-out-from = "screen-capture";
}
diff --git a/wireguard.nix b/wireguard.nix
index c880be2..f6c696a 100644
--- a/wireguard.nix
+++ b/wireguard.nix
@@ -5,7 +5,8 @@ let
inherit (pkgs) lib;
inherit (lib.attrsets)
- mapAttrsToList;
+ mapAttrsToList
+ ;
# The topology is hub-and-spoke/star
# sagittarius is the hub == 2301:db8:acad:a::1
@@ -78,7 +79,7 @@ in
address = [ conf.address ];
networkConfig = lib.mkIf isHub {
IPv6Forwarding = true;
- IPv6AcceptRA = false; # Disable RA acceptance on router interfaces
+ IPv6AcceptRA = false; # Disable RA acceptance on router interfaces
};
};
generated by cgit v1.3.1 (git 2.54.0) at 2026-10-27 10:23:35 +0000