don/NixOS-Configs
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Activity

hosts | upstream changes python3Full -> python313

Browse source
This commit is contained in:
Don Harper 2025-09-24 13:38:50 -05:00
parent 684e78190b
commit 4dbb70199a
3 changed files with 80 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

4
hosts/pi-server/default.nix
View file

@ -8,7 +8,7 @@ let
setuptools setuptools
requests requests
]; ];
python-with-my-packages = pkgs.python3Full.withPackages my-python-packages; python-with-my-packages = pkgs.python313.withPackages my-python-packages;
in { in {
nix = { nix = {
settings = { settings = {
@ -146,7 +146,7 @@ in {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# python-with-my-packages # python-with-my-packages
python3Full python313
aspell aspell
aspellDicts.en aspellDicts.en
base16-schemes base16-schemes

2
hosts/server/default.nix
View file

@ -8,7 +8,7 @@ let
setuptools setuptools
requests requests
]; ];
python-with-my-packages = pkgs.python3Full.withPackages my-python-packages; python-with-my-packages = pkgs.python313.withPackages my-python-packages;
in { in {
nix = { nix = {
settings = { settings = {

143
hosts/workstation/default.nix
View file

@ -1,5 +1,11 @@
{ inputs, outputs, lib, config, pkgs, ... }: {
let inputs,
outputs,
lib,
config,
pkgs,
...
}: let
my-python-packages = python-packages: my-python-packages = python-packages:
with python-packages; [ with python-packages; [
# pipx # pipx
@ -11,14 +17,14 @@ let
requests requests
setuptools setuptools
]; ];
python-with-my-packages = pkgs.python3Full.withPackages my-python-packages; python-with-my-packages = pkgs.python313.withPackages my-python-packages;
in { in {
nix = { nix = {
settings = { settings = {
# experimental-features = ["nix-command" "flakes"]; # experimental-features = ["nix-command" "flakes"];
warn-dirty = false; warn-dirty = false;
auto-optimise-store = true; auto-optimise-store = true;
trusted-users = [ "root" "don" ]; trusted-users = ["root" "don"];
}; };
gc = { gc = {
automatic = true; automatic = true;
@ -52,23 +58,26 @@ in {
networking = { networking = {
networkmanager.enable = true; networkmanager.enable = true;
enableIPv6 = true; enableIPv6 = true;
networkmanager = { wifi = { powersave = true; }; }; networkmanager = {wifi = {powersave = true;};};
useDHCP = false; useDHCP = false;
firewall = { firewall = {
enable = true; enable = true;
trustedInterfaces = trustedInterfaces = ["tailscale0"]; # always allow traffic from your Tailscale network
[ "tailscale0" ]; # always allow traffic from your Tailscale network
checkReversePath = "loose"; checkReversePath = "loose";
allowedUDPPorts = [ config.services.tailscale.port ]; allowedUDPPorts = [config.services.tailscale.port];
allowedTCPPortRanges = [{ allowedTCPPortRanges = [
from = 1714; {
to = 1764; from = 1714;
}]; to = 1764;
allowedUDPPortRanges = [{ }
from = 1714; ];
to = 1764; allowedUDPPortRanges = [
}]; {
allowedTCPPorts = [ 22 ]; from = 1714;
to = 1764;
}
];
allowedTCPPorts = [22];
}; };
}; };
@ -84,7 +93,7 @@ in {
inputMethod = { inputMethod = {
enable = true; enable = true;
type = "fcitx5"; type = "fcitx5";
fcitx5.addons = with pkgs; [ fcitx5-mozc fcitx5-gtk ]; fcitx5.addons = with pkgs; [fcitx5-mozc fcitx5-gtk];
}; };
}; };
@ -92,33 +101,38 @@ in {
boot = { boot = {
# kernelPackages = pkgs.linuxPackages_latest; # kernelPackages = pkgs.linuxPackages_latest;
kernelPackages = pkgs.linuxPackages_zen; kernelPackages = pkgs.linuxPackages_zen;
kernelParams = [ "consoleblank=60" "mem_sleep_default=deep" ]; kernelParams = ["consoleblank=60" "mem_sleep_default=deep"];
# extraModulePackages = [config.boot.kernelPackages.ddcci-driver]; # extraModulePackages = [config.boot.kernelPackages.ddcci-driver];
# kernelModules = ["i2c-dev" "ddcci_backlight"]; # kernelModules = ["i2c-dev" "ddcci_backlight"];
loader = if (pkgs.hostPlatform != lib.mkDefault "aarch64-linux") then { loader =
systemd-boot = { enable = true; }; if (pkgs.hostPlatform != lib.mkDefault "aarch64-linux")
efi = { then {
canTouchEfiVariables = true; systemd-boot = {enable = true;};
efiSysMountPoint = "/boot"; efi = {
canTouchEfiVariables = true;
efiSysMountPoint = "/boot";
};
}
else {
grub.enable = false;
generic-extlinux-compatible.enable = true;
}; };
} else { plymouth = {enable = true;};
grub.enable = false; kernel = {sysctl = {"vm.swappiness" = 10;};};
generic-extlinux-compatible.enable = true;
};
plymouth = { enable = true; };
kernel = { sysctl = { "vm.swappiness" = 10; }; };
}; };
security = { security = {
polkit = { enable = true; }; polkit = {enable = true;};
sudo.enable = false; sudo.enable = false;
doas = { doas = {
enable = true; enable = true;
extraRules = [{ extraRules = [
users = [ "don" ]; {
keepEnv = true; users = ["don"];
noPass = true; keepEnv = true;
}]; noPass = true;
}
];
}; };
}; };
@ -135,17 +149,17 @@ in {
userServices = true; userServices = true;
}; };
}; };
bpftune = { enable = true; }; bpftune = {enable = true;};
flatpak = { enable = true; }; flatpak = {enable = true;};
fstrim = { enable = true; }; fstrim = {enable = true;};
fwupd = { enable = true; }; fwupd = {enable = true;};
locate = { locate = {
enable = true; enable = true;
package = pkgs.mlocate; package = pkgs.mlocate;
}; };
logind = { logind = {
lidSwitchDocked = "ignore"; # lidSwitchDocked = "ignore";
lidSwitchExternalPower = "ignore"; # lidSwitchExternalPower = "ignore";
settings = { settings = {
Login = { Login = {
HandleLidSwitchDocked = "ignore"; HandleLidSwitchDocked = "ignore";
@ -153,7 +167,7 @@ in {
}; };
}; };
}; };
nscd = { enableNsncd = true; }; nscd = {enableNsncd = true;};
openssh = { openssh = {
enable = true; enable = true;
settings = { settings = {
@ -161,34 +175,34 @@ in {
KbdInteractiveAuthentication = false; KbdInteractiveAuthentication = false;
}; };
}; };
pcscd = { enable = true; }; pcscd = {enable = true;};
pipewire = { pipewire = {
enable = true; enable = true;
alsa = { alsa = {
enable = true; enable = true;
support32Bit = true; support32Bit = true;
}; };
pulse = { enable = true; }; pulse = {enable = true;};
}; };
printing = { printing = {
enable = true; enable = true;
drivers = [ pkgs.hplipWithPlugin ]; drivers = [pkgs.hplipWithPlugin];
}; };
pulseaudio = { enable = false; }; pulseaudio = {enable = false;};
tailscale = { enable = true; }; tailscale = {enable = true;};
udev = { udev = {
extraRules = '' extraRules = ''
ACTION=="add|change", KERNEL=="sd[a-z]*[0-9]*|mmcblk[0-9]*p[0-9]*|nvme[0-9]*n[0-9]*p[0-9]*", ENV{ID_FS_TYPE}=="ext4", ATTR{../queue/scheduler}="none" ''; ACTION=="add|change", KERNEL=="sd[a-z]*[0-9]*|mmcblk[0-9]*p[0-9]*|nvme[0-9]*n[0-9]*p[0-9]*", ENV{ID_FS_TYPE}=="ext4", ATTR{../queue/scheduler}="none" '';
}; };
udisks2 = { enable = true; }; udisks2 = {enable = true;};
}; };
hardware = { hardware = {
bluetooth = { enable = true; }; bluetooth = {enable = true;};
sane = { sane = {
enable = true; enable = true;
extraBackends = [ pkgs.sane-airscan ]; extraBackends = [pkgs.sane-airscan];
disabledDefaultBackends = [ "escl" "v4l" ]; disabledDefaultBackends = ["escl" "v4l"];
}; };
}; };
security.rtkit.enable = true; security.rtkit.enable = true;
@ -215,8 +229,7 @@ in {
isNormalUser = true; isNormalUser = true;
initialPassword = "changeme"; initialPassword = "changeme";
description = "Don Harper"; description = "Don Harper";
extraGroups = extraGroups = ["networkmanager" "wheel" "scanner" "lp" "video" "mlocate" "disk"];
[ "networkmanager" "wheel" "scanner" "lp" "video" "mlocate" "disk" ];
openssh.authorizedKeys.keys = [ openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINd8AdVbQQ/Fmw+b9mI8EMYqIoRkwmSwAOtmlte3incL don@loki" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINd8AdVbQQ/Fmw+b9mI8EMYqIoRkwmSwAOtmlte3incL don@loki"
]; ];
@ -235,9 +248,9 @@ in {
config = { config = {
allowUnfree = true; allowUnfree = true;
allowUnfreePredicate = true; allowUnfreePredicate = true;
permittedInsecurePackages = [ "libsoup-2.74.3" "qtwebengine-5.15.19" ]; permittedInsecurePackages = ["libsoup-2.74.3" "qtwebengine-5.15.19"];
allowInsecurePredicate = pkg: allowInsecurePredicate = pkg:
builtins.elem (lib.getName pkg) [ "broadcom-sta" ]; builtins.elem (lib.getName pkg) ["broadcom-sta"];
}; };
}; };
@ -302,7 +315,6 @@ in {
# toot # toot
udiskie udiskie
wireplumber wireplumber
wlsunset
xdg-utils xdg-utils
xfce.thunar xfce.thunar
xsane xsane
@ -310,10 +322,10 @@ in {
]; ];
programs = { programs = {
dconf = { enable = true; }; dconf = {enable = true;};
light = { enable = true; }; light = {enable = true;};
mtr = { enable = true; }; mtr = {enable = true;};
kdeconnect = { enable = true; }; kdeconnect = {enable = true;};
gnupg = { gnupg = {
agent = { agent = {
enable = true; enable = true;
@ -325,14 +337,14 @@ in {
nixpkgs.overlays = [ nixpkgs.overlays = [
(final: prev: { (final: prev: {
qutebrowser = prev.qutebrowser.override { enableWideVine = true; }; qutebrowser = prev.qutebrowser.override {enableWideVine = true;};
}) })
(final: super: { (final: super: {
khal = super.khal.overridePythonAttrs (_: { doCheck = false; }); khal = super.khal.overridePythonAttrs (_: {doCheck = false;});
}) })
]; ];
nix.nixPath = [ "nixpkgs=${inputs.nixpkgs}" ]; nix.nixPath = ["nixpkgs=${inputs.nixpkgs}"];
# This value determines the NixOS release from which the default # This value determines the NixOS release from which the default
# settings for stateful data, like file locations and database versions # settings for stateful data, like file locations and database versions
@ -363,6 +375,5 @@ in {
"x-scheme-handler/about" = "org.qutebrowser.qutebrowser.desktop"; "x-scheme-handler/about" = "org.qutebrowser.qutebrowser.desktop";
"x-scheme-handler/unknown" = "org.qutebrowser.qutebrowser.desktop"; "x-scheme-handler/unknown" = "org.qutebrowser.qutebrowser.desktop";
}; };
environment.sessionVariables.DEFAULT_BROWSER = environment.sessionVariables.DEFAULT_BROWSER = "${pkgs.qutebrowser}/bin/qutebrowser";
"${pkgs.qutebrowser}/bin/qutebrowser";
} }