aboutsummaryrefslogtreecommitdiff
path: root/nixos/modules
diff options
context:
space:
mode:
Diffstat (limited to 'nixos/modules')
-rw-r--r--nixos/modules/desktop.nix67
-rw-r--r--nixos/modules/develop.nix11
-rw-r--r--nixos/modules/gaming.nix6
-rw-r--r--nixos/modules/hosts.nix4
-rw-r--r--nixos/modules/openwrtone.nix1
-rw-r--r--nixos/modules/packages.nix2
-rw-r--r--nixos/modules/router.nix11
-rw-r--r--nixos/modules/syncthing.nix4
-rw-r--r--nixos/modules/users.nix2
-rw-r--r--nixos/modules/wifi-client.nix3
10 files changed, 63 insertions, 48 deletions
diff --git a/nixos/modules/desktop.nix b/nixos/modules/desktop.nix
index 3d8bfb4..c39f9d2 100644
--- a/nixos/modules/desktop.nix
+++ b/nixos/modules/desktop.nix
@@ -47,6 +47,7 @@ in {
waybar
swaybackground
myswaylock
+ brightnessctl
alacritty
nautilus
@@ -67,6 +68,7 @@ in {
resources
isync
+ davmail
msmtp
notmuch
dodo
@@ -102,7 +104,7 @@ in {
pulsemixer
mpd
mpc
- ncmpcpp
+ #ncmpcpp
feh
shotwell
id3lib
@@ -146,8 +148,9 @@ in {
gimp
inkscape
blender
- #tenacity
- #kdePackages.kdenlive
+ tenacity
+ kdePackages.kdenlive
+ qrrs
# GStreamer
gst_all_1.gstreamer
@@ -162,7 +165,6 @@ in {
# Writing
typst
typstyle
- typst-live
tinymist
vale
@@ -171,6 +173,7 @@ in {
kicad
sweethome3d.application
qelectrotech
+ super-slicer
]
++ (optionals cnf.laptop [
# Power management
@@ -185,11 +188,9 @@ in {
nativeMessagingHosts.packages = with pkgs; [browserpass];
};
- light.enable = mkIf cnf.laptop true;
-
nix-ld = {
enable = true;
- libraries = with pkgs; [xorg.libXpm];
+ libraries = with pkgs; [libXpm];
};
usbkey = {
@@ -204,6 +205,13 @@ in {
enable = true;
enableSSHSupport = true;
enableBrowserSocket = true;
+ pinentryPackage = pkgs.writeShellScriptBin "pinentry-auto" ''
+ if [ -n "$WAYLAND_DISPLAY" ] || [ -n "$DISPLAY" ]; then
+ exec ${pkgs.pinentry-gnome3}/bin/pinentry-gnome3 "$@"
+ else
+ exec ${pkgs.pinentry-gnome3}/bin/pinentry-curses "$@"
+ fi
+ '';
};
kdeconnect.enable = true;
@@ -303,27 +311,30 @@ in {
allowedUDPPorts = [3702];
};
- fonts.packages = with pkgs; [
- arkpandora_ttf
- corefonts
- dejavu_fonts
- fira-code
- fira-code-symbols
- fira-math
- fira-mono
- fira-sans
- font-awesome
- freefont_ttf
- hack-font
- liberation_ttf
- libertine
- nerd-fonts.hack
- noto-fonts
- noto-fonts-color-emoji
- terminus_font_ttf
- ubuntu-classic
- unifont
- ];
+ fonts = {
+ enableDefaultPackages = true;
+ packages = with pkgs; [
+ arkpandora_ttf
+ corefonts
+ dejavu_fonts
+ fira-code
+ fira-code-symbols
+ fira-math
+ fira-mono
+ fira-sans
+ font-awesome
+ freefont_ttf
+ hack-font
+ liberation_ttf
+ libertine
+ nerd-fonts.hack
+ noto-fonts
+ noto-fonts-color-emoji
+ terminus_font_ttf
+ ubuntu-classic
+ unifont
+ ];
+ };
documentation = {
enable = true;
diff --git a/nixos/modules/develop.nix b/nixos/modules/develop.nix
index bd84a87..587477f 100644
--- a/nixos/modules/develop.nix
+++ b/nixos/modules/develop.nix
@@ -44,7 +44,7 @@ in {
cachix
nurl
nil
- nixfmt-rfc-style
+ nixfmt
alejandra
statix
deadnix
@@ -169,6 +169,9 @@ in {
# Images
imagemagick
+
+ # S3
+ rclone
];
programs.wireshark = {
enable = true;
@@ -191,6 +194,8 @@ in {
SUBSYSTEMS=="usb", ATTRS{idVendor}=="1366", ATTRS{idProduct}=="0105", MODE:="0660", GROUP="develop", SYMLINK+="jlink_%n"
SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2111", MODE:="0660", GROUP="develop", SYMLINK+="cmsip_dap_%n"
SUBSYSTEMS=="usb", ATTRS{idVendor}=="1ab1", ATTRS{idProduct}=="0e11", MODE:="0660", GROUP="develop"
+ SUBSYSTEMS=="usb", ATTRS{idVendor}=="303a", ATTRS{idProduct}=="1001", MODE:="0660", GROUP="develop", TAG+="uaccess"
+ SUBSYSTEMS=="usb", ATTRS{idVendor}=="303a", ATTRS{idProduct}=="1002", MODE:="0660", GROUP="develop", TAG+="uaccess"
'';
guix.enable = true;
@@ -203,10 +208,6 @@ in {
autoPrune.enable = true;
storageDriver = "btrfs";
};
- #lxd = {
- # enable = true;
- # recommendedSysctlSettings = true;
- #};
lxc.enable = true;
libvirtd.enable = true;
spiceUSBRedirection.enable = true;
diff --git a/nixos/modules/gaming.nix b/nixos/modules/gaming.nix
index 4f957ed..e939bf2 100644
--- a/nixos/modules/gaming.nix
+++ b/nixos/modules/gaming.nix
@@ -37,7 +37,7 @@ in {
extraPkgs = pkgs:
with pkgs; [
ncurses
- xorg.libXpm
+ libxpm
flac134
libopus
];
@@ -46,7 +46,7 @@ in {
extraPkgs = pkgs:
with pkgs; [
ncurses
- xorg.libXpm
+ libxpm
flac134 # For Nebuchadnezzar
libopus
SDL
@@ -56,7 +56,7 @@ in {
SDL_image
SDL_mixer
SDL_ttf
- glew110
+ glew_1_10
libdrm
libidn
tbb
diff --git a/nixos/modules/hosts.nix b/nixos/modules/hosts.nix
index 81bd844..6d901e0 100644
--- a/nixos/modules/hosts.nix
+++ b/nixos/modules/hosts.nix
@@ -36,7 +36,10 @@ in {
"camera2" = "10.8.0.22";
# Local
"ridcully" = "10.8.0.59";
+ "dribbler" = "10.8.0.60";
"tc" = "10.8.0.99";
+ "vb" = "10.8.0.98";
+ "printer" = "10.8.0.90";
# Portable
"binky" = "10.8.0.63";
};
@@ -60,7 +63,6 @@ in {
# Local
"mpd" = "10.8.2.51";
"errol" = "10.8.2.60";
- "printer" = "10.8.2.90";
# Portable
"albert" = "10.8.2.61";
"binky" = "10.8.2.63";
diff --git a/nixos/modules/openwrtone.nix b/nixos/modules/openwrtone.nix
index 85ddbd2..40c1ed6 100644
--- a/nixos/modules/openwrtone.nix
+++ b/nixos/modules/openwrtone.nix
@@ -60,7 +60,6 @@ in {
kernelParams = [
"fw_devlink=permissive"
"clk_ignore_unused"
- "pcie_aspm=off"
];
initrd = {
diff --git a/nixos/modules/packages.nix b/nixos/modules/packages.nix
index f6961af..e97229f 100644
--- a/nixos/modules/packages.nix
+++ b/nixos/modules/packages.nix
@@ -70,7 +70,7 @@ in {
]
++ optionals isx86_64 [
nmap
- #ltrace
+ ltrace
pv
screen
]
diff --git a/nixos/modules/router.nix b/nixos/modules/router.nix
index 01110ae..1c8f4cc 100644
--- a/nixos/modules/router.nix
+++ b/nixos/modules/router.nix
@@ -178,12 +178,11 @@ in {
services.resolved = {
enable = true;
- #dnssec = "true";
- fallbackDns = ["1.1.1.1" "8.8.8.8"];
- extraConfig = ''
- DNSStubListenerExtra=${cnf.lanIP}
- DNSStubListenerExtra=192.168.1.1
- '';
+ settings.Resolve = {
+ FallbackDNS = ["1.1.1.1" "8.8.8.8"];
+ DNSStubListenerExtra=[cnf.lanIP "192.168.1.1"];
+ # TODO possibly enforce DNSSEC again
+ };
};
};
}
diff --git a/nixos/modules/syncthing.nix b/nixos/modules/syncthing.nix
index 1148da6..eab61c7 100644
--- a/nixos/modules/syncthing.nix
+++ b/nixos/modules/syncthing.nix
@@ -58,8 +58,8 @@ in {
devices = allDevices;
ignorePerms = false;
};
- "${baseDir}/pictures" = {
- label = "Pictures";
+ "${baseDir}/images" = {
+ label = "Images";
id = "pictures";
devices = bigStorageDevices;
ignorePerms = false;
diff --git a/nixos/modules/users.nix b/nixos/modules/users.nix
index 9c65f8b..24eedb5 100644
--- a/nixos/modules/users.nix
+++ b/nixos/modules/users.nix
@@ -85,6 +85,8 @@ in {
enable = !isArm;
defaultEditor = !isArm;
withNodeJs = true;
+ withPython3 = true;
+ withRuby = true;
};
};
diff --git a/nixos/modules/wifi-client.nix b/nixos/modules/wifi-client.nix
index b82633d..07eb686 100644
--- a/nixos/modules/wifi-client.nix
+++ b/nixos/modules/wifi-client.nix
@@ -22,7 +22,8 @@ in {
enable = true;
networks = config.secrets.wifiNetworks;
secretsFile = "/run/secrets/wifi.secrets";
- userControlled.enable = true;
+ userControlled = true;
};
+ users.users.cynerd.extraGroups = ["wpa_supplicant"];
};
}
generated by cgit v1.3 (git 2.53.0) at 2026-04-18 00:40:02 +0000