Various changes...

This commit is contained in:
Niten 2021-05-10 18:25:38 -07:00
parent f731ae666b
commit 788a642b6a
4 changed files with 36 additions and 26 deletions

View File

@ -30,6 +30,8 @@ in {
intif2 = { useDHCP = false; }; intif2 = { useDHCP = false; };
}; };
nameservers = [ "10.0.0.1" ];
# FIXME: this should be automatic # FIXME: this should be automatic
firewall.trustedInterfaces = firewall.trustedInterfaces =
[ "intif0" "intif1" "intif2" "lo" "docker0" ]; [ "intif0" "intif1" "intif2" "lo" "docker0" ];
@ -51,7 +53,7 @@ in {
gateway = primary-ip; gateway = primary-ip;
dhcp-interfaces = [ "intif0" ]; dhcp-interfaces = [ "intif0" ];
dns-listen-ips = [ primary-ip "127.0.0.1" "127.0.1.1" "::1" ]; dns-listen-ips = [ primary-ip "127.0.0.1" "127.0.1.1" "::1" ];
recursive-resolver = "1.1.1.1"; recursive-resolver = "${primary-ip} port 5353";
network = site.network; network = site.network;
dhcp-dynamic-network = site.dynamic-network; dhcp-dynamic-network = site.dynamic-network;
search-domains = [ domain-name "fudo.org" ]; search-domains = [ domain-name "fudo.org" ];

View File

@ -18,9 +18,7 @@ in {
]; ];
}; };
system = { system = { autoUpgrade.enable = true; };
autoUpgrade.enable = true;
};
services = { services = {
xserver = mkIf enable-gui { xserver = mkIf enable-gui {
@ -74,6 +72,8 @@ in {
gnome-user-share.enable = mkForce false; gnome-user-share.enable = mkForce false;
}; };
programs.steam.enable = enable-gui;
fonts = mkIf enable-gui { fonts = mkIf enable-gui {
enableFontDir = true; enableFontDir = true;
fontconfig.enable = true; fontconfig.enable = true;

View File

@ -3,7 +3,15 @@
with lib; with lib;
let let
# Available to all users on the system. Keep it minimal. # Available to all users on the system. Keep it minimal.
global-packages = with pkgs; [ bind git heimdal openssh_gssapi vim wget ]; global-packages = with pkgs; [
bind
git
heimdal
openssh_gssapi
tldr
vim
wget
];
in { in {
environment = { environment = {

View File

@ -5,7 +5,22 @@ let
name = "Niten"; name = "Niten";
email = "niten@fudo.org"; email = "niten@fudo.org";
packages = with pkgs; [ hostname = config.instance.hostname;
host-config = config.fudo.hosts.${hostname};
enable-gui = host-config.enable-gui;
gui-packages = with pkgs; [
firefox
jq
openttd
redshift
signal-desktop
spotify
xclip
];
common-packages = with pkgs; [
asdf asdf
atop atop
binutils binutils
@ -18,7 +33,6 @@ let
doomEmacsInit doomEmacsInit
enca enca
file file
firefox
fortune fortune
git git
gnutls gnutls
@ -28,7 +42,6 @@ let
ipfs ipfs
iptables iptables
jdk jdk
jq
leiningen leiningen
libisofs libisofs
lispPackages.quicklisp lispPackages.quicklisp
@ -43,21 +56,17 @@ let
nmap nmap
openldap openldap
openssl openssl
openttd
pciutils pciutils
pv pv
pwgen pwgen
ruby ruby
rustc rustc
sbcl sbcl
signal-desktop
spotify
stdenv stdenv
telnet telnet
texlive.combined.scheme-basic texlive.combined.scheme-basic
tmux tmux
unzip unzip
xclip
youtube-dl youtube-dl
yubikey-manager yubikey-manager
yubikey-personalization yubikey-personalization
@ -84,7 +93,7 @@ in {
}; };
}; };
xresources.properties = { xresources.properties = mkIf enable-gui {
"Xft.antialias" = 1; "Xft.antialias" = 1;
"Xft.autohint" = 0; "Xft.autohint" = 0;
"Xft.dpi" = 192; "Xft.dpi" = 192;
@ -96,7 +105,8 @@ in {
services.gpg-agent.enable = true; services.gpg-agent.enable = true;
home = { home = {
packages = packages; packages =
if enable-gui then common-packages ++ gui-packages else common-packages;
file = { file = {
".doom.d" = { ".doom.d" = {
@ -105,18 +115,8 @@ in {
onChange = "${pkgs.doomEmacsInit}/bin/doom-emacs-init.sh"; onChange = "${pkgs.doomEmacsInit}/bin/doom-emacs-init.sh";
}; };
".local/share/openttd/baseset" = { ".local/share/openttd/baseset" =
source = "${pkgs.openttd-data}/data"; mkIf enable-gui { source = "${pkgs.openttd-data}/data"; };
};
# ".k5login" = {
# source = pkgs.writeText "niten-k5login" ''
# niten@FUDO.ORG
# niten/root@FUDO.ORG
# niten@INFORMIS.LAND
# niten/root@INFORMIS.LAND
# '';
# };
}; };
sessionVariables = { sessionVariables = {