From bcd48fc9e479e48611c85ec6feb0be6d1df03092 Mon Sep 17 00:00:00 2001 From: Patrick Spek Date: Tue, 25 Apr 2023 21:21:03 +0200 Subject: Add configurations tested on anoia --- data.d/etc-nixos/apps/vpn-tinc.nix | 24 ++++++++-------- data.d/etc-nixos/env/global.nix | 5 ++++ data.d/etc-nixos/env/workstation.nix | 34 +++++++++++------------ data.d/etc-nixos/wm/awesome.nix | 30 ++++++++++++++++++++ data.d/etc-nixos/wm/kde.nix | 53 ++++++++++++++++++++++++++++++++++++ 5 files changed, 117 insertions(+), 29 deletions(-) create mode 100644 data.d/etc-nixos/wm/awesome.nix create mode 100644 data.d/etc-nixos/wm/kde.nix diff --git a/data.d/etc-nixos/apps/vpn-tinc.nix b/data.d/etc-nixos/apps/vpn-tinc.nix index 5255fb7..0634ecc 100644 --- a/data.d/etc-nixos/apps/vpn-tinc.nix +++ b/data.d/etc-nixos/apps/vpn-tinc.nix @@ -72,19 +72,19 @@ anoia_tyil_net = '' Subnet = 10.57.100.3/32 - Ed25519PublicKey = 7jy41lK2S4BzhUVSAmULDSiZ9NQM4eQ0Geg2+F9pTpG + Ed25519PublicKey = 04G6200IYDzDT3H0Yj6ZjQUIUc8tCIvzPaXmyk36e2M -----BEGIN RSA PUBLIC KEY----- - MIICCgKCAgEAvcW/20fxgdGdNelD/eMwEpLChI03rvDbPHAp9en3cwlYaND40udO - VxjRXj0rE9IA4N0f+o8oJdmG+mzl5Dd3rKXVnBnRymKzpNJ2w+cILPm1sQa6IO85 - F+7Q5v7lb5yFuy3JVi+tg4nqL+xHSZL6w/oPX667bR90oBJEd7C+U7p7r8DXvyHq - cg9U1maDmZ0IzZtl6BxsjyfUr0o6xBtw+pCSIvOXW5xd4mfBPgvp+3nIcux6nek3 - VR6SJ85aXlYZxER23N13Vi3dGUJSIaBPN5MuS3IHBbAP/Feeyo8p4SCzl0AMfo/K - +ZGcheL/NX7EVGg4XcZNgFaTBpusScOfxiRlzAeImomiQwKIywXp1otCn6dKIDj0 - jj146Dodf2nHRbTQj7H/2zyiRDjY/tpis/xTVA5AJu+p5aaXBA/eSb4H1OKL5qYs - 38/bUiUJTSbpWvC9WiHq/xi5GSs+3ehDara89yXXhunWLsqvSZOZacqeZQw8k+ip - pNcnXbbtS0zqNQie3OEKY9qqOGKzjUiYu8yWJ4eo370XzlQ9sUgGfKmwCcc2c2jX - Rrhjck+4DGeRA10oJpoxKArPaWrGWezIHJ49Jrc+xiTJ5EMVqOpuGvL5lrKn7g6y - qYk1u6x0We1nCkMNN2LxrmL6j3p6PKRbWg7bczqPO4uEyT/575Ih2ssCAwEAAQ== + MIICCgKCAgEAt+7D3zRySAfd9cYnMSNhp/yRnBygmnfLdKm/dH9X7QbJ1BNcQpTP + I1RmC9lNlWABhB46DJUqQAQeGlZPUHxbCnmdDN6HyDaSA45m/yGUbVhN/ClK7iap + EXfNmxZbtE4eBHDz5DsFe7i2nla4gogyiUQsvRgIP2b2v9qzBhqf2kXwv0X+n7hv + HvQOdN60x/xm1+Vh6wsdX2HYatEh3dy1pfj+1RCQIWV1FDS1YVbFZFb1UJz917G/ + DIpM/Cb/3txH0ffVh2NVqFBW3kd60Cs42/6htpHucBQ1dRVZUCKKWz1sgi5H4nty + HdPDPwOphrvNE7kXjvhkPIif1KtCr2SLwOK0UXR9iZtWuDH/Uxn2v7ofa0a3zKGf + yPrVwzhciv2cdbXPiTFyAS8YbpQUQTcuqDVi1AxE8Z0KmuvgBtTtAzMDyoTLOfzS + yZ3a0qQhX3nvLkXWh7cA7cquuP4LgP5iY1vJSRO2EZA61/WdKs8asl0EN8Zn8EEz + opnvcM3M0ptBZy1Dz2X6Lz0QliQrzajmSRhfUMTOq3ARvnLsES14ZqehavH5Ntms + G1OVdVnd7fqibMhWz/dKiB3uG+1e39isTPW3+22MEm4R0ngfF6olZ8SdHrIWFPW8 + bvdzf7ebFrjuqi6qN/NdUwrzWdDGU83W2xEBsHHbHcoKaB2uwcCKvjcCAwEAAQ== -----END RSA PUBLIC KEY----- ''; diff --git a/data.d/etc-nixos/env/global.nix b/data.d/etc-nixos/env/global.nix index 608630d..9bf9882 100644 --- a/data.d/etc-nixos/env/global.nix +++ b/data.d/etc-nixos/env/global.nix @@ -29,6 +29,11 @@ i18n = { defaultLocale = "en_US.UTF-8"; + supportedLocales = [ + "C.UTF-8/UTF-8" + "en_US.UTF-8/UTF-8" + "nl_NL.UTF-8/UTF-8" + ]; }; networking = { diff --git a/data.d/etc-nixos/env/workstation.nix b/data.d/etc-nixos/env/workstation.nix index db3ca1f..8ca64a0 100644 --- a/data.d/etc-nixos/env/workstation.nix +++ b/data.d/etc-nixos/env/workstation.nix @@ -13,15 +13,10 @@ pass plantuml shellcheck + ntfy-sh # GUI utils - dunst - physlock - redshift - rofi - sxhkd xclip - xcompmgr xdotool xprintidle @@ -39,22 +34,27 @@ ]; }; - services = { - xserver = { + hardware = { + pulseaudio = { enable = true; - displayManager = { - startx = { - enable = true; - }; - }; - windowManager = { - awesome = { - enable = true; - }; + }; + }; + + programs = { + gnupg = { + agent = { + enable = true; + enableSSHSupport = true; }; }; }; + services = { + pcscd = { + enable = true; + }; + }; + users = { users = { tyil = { diff --git a/data.d/etc-nixos/wm/awesome.nix b/data.d/etc-nixos/wm/awesome.nix new file mode 100644 index 0000000..b427f4a --- /dev/null +++ b/data.d/etc-nixos/wm/awesome.nix @@ -0,0 +1,30 @@ +{ config, pkgs, ... }: + +{ + environment = { + systemPackages = with pkgs; [ + dunst + physlock + redshift + rofi + sxhkd + xcompmgr + ]; + }; + + services = { + xserver = { + enable = true; + displayManager = { + startx = { + enable = true; + }; + }; + windowManager = { + awesome = { + enable = true; + }; + }; + }; + }; +} diff --git a/data.d/etc-nixos/wm/kde.nix b/data.d/etc-nixos/wm/kde.nix new file mode 100644 index 0000000..00e5380 --- /dev/null +++ b/data.d/etc-nixos/wm/kde.nix @@ -0,0 +1,53 @@ +{ config, pkgs, ... }: + +{ + environment = { + systemPackages = with pkgs; [ + arc-kde-theme + kmymoney + plasma-pass + pinentry-qt + libsForQt5.kaccounts-integration + libsForQt5.kaccounts-providers + libsForQt5.kweather + libsForQt5.kalendar + ]; + }; + + networking = { + firewall = { + allowedTCPPortRanges = [ { from = 1714; to = 1764; } ]; # kdeconnect + allowedUDPPortRanges = [ { from = 1714; to = 1764; } ]; # kdeconnect + }; + }; + + programs = { + dconf = { + enable = true; + }; + gnupg = { + agent = { + pinentryFlavor = "qt"; + }; + }; + kdeconnect = { + enable = true; + }; + }; + + services = { + xserver = { + enable = true; + displayManager = { + sddm = { + enable = true; + }; + }; + desktopManager = { + plasma5 = { + enable = true; + }; + }; + }; + }; +} -- cgit v1.1