From 67243bad118531eb49e9184bd421ade1b0f8eb86 Mon Sep 17 00:00:00 2001
From: Haak Saxberg <haak.erling@gmail.com>
Date: Tue, 6 Jan 2026 10:02:59 -0800
Subject: [PATCH] Cleanup of some configuration: jellyfin, nvim, systems

---
 nix/home/programs/jellyfin/default.nix | 4 +---
 nix/home/programs/nvim/init.vim        | 1 -
 nix/system/svalbard/configuration.nix  | 9 ++++-----
 nix/system/xps11/configuration.nix     | 4 +++-
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/nix/home/programs/jellyfin/default.nix b/nix/home/programs/jellyfin/default.nix
index 50fadbc..d0c09db 100644
--- a/nix/home/programs/jellyfin/default.nix
+++ b/nix/home/programs/jellyfin/default.nix
@@ -3,9 +3,6 @@
 {
   networking.firewall = {
     allowedTCPPorts = [
-      # jellyfin frontend
-      8096
-      8920
       #nginx
       80
       443
@@ -22,6 +19,7 @@
   # 2. override default hardening measure from NixOS - this is default since 22.05
   systemd.services.jellyfin.serviceConfig.PrivateDevices = lib.mkForce false;
 
+  ## Expose jelly to "the world"
   services.nginx = {
     virtualHosts."${lib.strings.fileContents ../../../../secrets/letsencrypt/mediaserver/domain}" = {
       forceSSL = true;
diff --git a/nix/home/programs/nvim/init.vim b/nix/home/programs/nvim/init.vim
index 854bfd8..a3c9351 100644
--- a/nix/home/programs/nvim/init.vim
+++ b/nix/home/programs/nvim/init.vim
@@ -6,7 +6,6 @@ filetype plugin indent on
 let g:netrw_liststyle = 3
 set nobackup
 set noswapfile
-set pastetoggle=<F3>
 set nowrap
 
 set background=dark
diff --git a/nix/system/svalbard/configuration.nix b/nix/system/svalbard/configuration.nix
index 323bc50..57b0e51 100644
--- a/nix/system/svalbard/configuration.nix
+++ b/nix/system/svalbard/configuration.nix
@@ -42,7 +42,7 @@
     (pkgs.writeTextFile {
       name = "dev-device-no-auto-name";
       text = ''
-        SUBSYSTEM=="net", ACTION=="add", DEVTYPE!=="?*", ATTR{address}=="04:7c:16:10:27:5e", NAME="eth0"
+        SUBSYSTEM=="net", ACTION=="add", ENV{DEVTYPE}!="?*", ATTR{address}=="04:7c:16:10:27:5e", NAME="eth0"
       '';
 
       destination = "/etc/udev/rules.d/70-persistent-net.rules";
@@ -50,12 +50,12 @@
   ];
 
   # Select internationalisation properties.
-  i18n.defaultLocale = "en_US.utf8";
+  i18n.defaultLocale = "en_US.UTF-8";
 
   # Configure keymap in X11
   services.xserver = {
-    layout = "us";
-    xkbVariant = "";
+    xkb.layout = "us";
+    xkb.variant = "";
   };
 
   # Allow unfree packages
@@ -94,5 +94,4 @@
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
   system.stateVersion = "22.05"; # Did you read the comment?
-
 }
diff --git a/nix/system/xps11/configuration.nix b/nix/system/xps11/configuration.nix
index e274c57..bf3ca8f 100644
--- a/nix/system/xps11/configuration.nix
+++ b/nix/system/xps11/configuration.nix
@@ -82,7 +82,7 @@
       name = "dev-device-no-auto-name";
       # xps11 uses a usb device as an ethernet port
       text = ''
-        SUBSYSTEM=="net", ACTION=="add", DEVTYPE!=="?*", ATTR{address}=="00:e0:4c:68:13:bf", NAME="eth0"
+        SUBSYSTEM=="net", ACTION=="add", ENV{DEVTYPE}!="?*", ATTR{address}=="00:e0:4c:68:13:bf", NAME="eth0"
       '';
 
       destination = "/etc/udev/rules.d/70-persistent-net.rules";
@@ -116,4 +116,6 @@
   # servers. You should change this only after NixOS release notes say you
   # should.
   system.stateVersion = "20.03"; # Did you read the comment?
+  # postgres 11 has EOL'd
+  services.postgresql.package = pkgs.postgresql_15;
 }