Compare commits

..

No commits in common. "dfbc3540e6df3661d34f2b000dd234d64a14beb7" and "5a08f180b2961c4feffb2fc6700594ea338028f0" have entirely different histories.

7 changed files with 1 additions and 68 deletions

View File

@ -4,7 +4,6 @@
{ {
imports = [ imports = [
./boot.nix ./boot.nix
./dev.nix
./fonts.nix ./fonts.nix
./gdm.nix ./gdm.nix
./gnomeBoxes.nix ./gnomeBoxes.nix

View File

@ -1,39 +0,0 @@
{
config,
lib,
pkgs,
...
}:
with lib;
let
cfg = config.modules.dev;
in
{
config = mkIf cfg.enable {
# Runs dynamically linked executables intended for generic Linux (e.g. Python
# binaries downloaded by uv) by providing the standard loaders in /lib/*
programs.nix-ld = {
enable = true;
libraries = with pkgs; [
zlib
zstd
stdenv.cc.cc
curl
openssl
attr
libssh
bzip2
libxml2
acl
libsodium
util-linux
xz
systemd
glib
libelf
];
};
environment.systemPackages = with pkgs; [ uv ];
};
}

View File

@ -1,19 +1,12 @@
{ {
host, host,
config,
lib,
pkgs, pkgs,
... ...
}: }:
{ {
networking = { networking = {
hostName = "${host}"; hostName = "${host}";
networkmanager = { networkmanager.enable = true;
enable = true;
# resolved is only enabled when tailscale is; pointing NM at a
# systemd-resolved that isn't running would break DNS entirely
dns = lib.mkIf config.services.resolved.enable "systemd-resolved";
};
wireless.enable = true; wireless.enable = true;
}; };

View File

@ -10,12 +10,5 @@ in
{ {
config = mkIf cfg.enable { config = mkIf cfg.enable {
services.tailscale.enable = true; services.tailscale.enable = true;
# systemd-resolved is needed for tailscale's MagicDNS to work properly
services.resolved.enable = true;
# tailscaled applies its DNS config (split DNS, MagicDNS) to
# systemd-resolved over D-Bus, which is polkit-guarded
security.polkit.enable = true;
}; };
} }

View File

@ -5,7 +5,6 @@
imports = [ imports = [
./discord.nix ./discord.nix
./dictation.nix ./dictation.nix
./dev.nix
./display.nix ./display.nix
./gnomeBoxes.nix ./gnomeBoxes.nix
./gpg.nix ./gpg.nix

View File

@ -1,10 +0,0 @@
{
lib,
...
}:
with lib;
{
options.modules.dev = {
enable = mkEnableOption "Python development with uv and nix-ld";
};
}

View File

@ -15,8 +15,6 @@
modules.localsend.enable = true; modules.localsend.enable = true;
modules.dev.enable = true;
modules.zsh.enable = true; modules.zsh.enable = true;
modules.shell.defaultShell = "zsh"; modules.shell.defaultShell = "zsh";