update

flake.lock

@@ -10,11 +10,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1760836749,
+        "lastModified": 1762618334,
         "narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "2f0f812f69f3eb4140157fe15e12739adf82e32a",
+        "rev": "fcdea223397448d35d9b31f798479227e80183f6",
         "type": "github"
       },
       "original": {
@@ -29,7 +29,8 @@
           "devenv"
         ],
         "flake-compat": [
-          "devenv"
+          "devenv",
+          "flake-compat"
         ],
         "git-hooks": [
           "devenv",
@@ -41,11 +42,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1752264895,
-        "narHash": "sha256-1zBPE/PNAkPNUsOWFET4J0cjlvziH8DOekesDmjND+w=",
+        "lastModified": 1760971495,
+        "narHash": "sha256-IwnNtbNVrlZIHh7h4Wz6VP0Furxg9Hh0ycighvL5cZc=",
         "owner": "cachix",
         "repo": "cachix",
-        "rev": "47053aef762f452e816e44eb9a23fbc3827b241a",
+        "rev": "c5bfd933d1033672f51a863c47303fc0e093c2d2",
         "type": "github"
       },
       "original": {
@@ -63,11 +64,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1761420116,
-        "narHash": "sha256-k8v/AvYeJmiKMjDd4xw6oG8idyXYYxKEsObB+Dkv6N4=",
+        "lastModified": 1768598221,
+        "narHash": "sha256-09F+4yMnno3yI1us7t0Gt/wEbyZNk5U8EW9IE9HGXg8=",
         "owner": "9001",
         "repo": "copyparty",
-        "rev": "4fcd2c41932d731b052bf1be6879b4310f4d3e10",
+        "rev": "72c59405e7a49686389414913787245aa8e66164",
         "type": "github"
       },
       "original": {
@@ -105,16 +106,17 @@
         "flake-parts": "flake-parts",
         "git-hooks": "git-hooks",
         "nix": "nix",
+        "nixd": "nixd",
         "nixpkgs": [
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1761427990,
-        "narHash": "sha256-MnrJFwdkwt0FHvRj6vbVfCBWoAPW9O9+HOldMM1yeR8=",
+        "lastModified": 1768597968,
+        "narHash": "sha256-WdkoFB2QyMkZOmsi/08394clBRyEtNseH+jYGUs9eDU=",
         "owner": "cachix",
         "repo": "devenv",
-        "rev": "7419c04fc798d5d5918413d4cb6c8629f9d4e8a3",
+        "rev": "92ad9c70fad164e8f4a3656dec91717a5c42cd98",
         "type": "github"
       },
       "original": {
@@ -126,11 +128,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1747046372,
-        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
+        "lastModified": 1761588595,
+        "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
+        "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",
         "type": "github"
       },
       "original": {
@@ -163,11 +165,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1756770412,
-        "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=",
+        "lastModified": 1760948891,
+        "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "4524271976b625a4a605beefd893f270620fd751",
+        "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04",
         "type": "github"
       },
       "original": {
@@ -176,6 +178,21 @@
         "type": "github"
       }
     },
+    "flake-root": {
+      "locked": {
+        "lastModified": 1723604017,
+        "narHash": "sha256-rBtQ8gg+Dn4Sx/s+pvjdq3CB2wQNzx9XGFq/JVGCB6k=",
+        "owner": "srid",
+        "repo": "flake-root",
+        "rev": "b759a56851e10cb13f6b8e5698af7b59c44be26e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "srid",
+        "repo": "flake-root",
+        "type": "github"
+      }
+    },
     "flake-utils": {
       "locked": {
         "lastModified": 1678901627,
@@ -255,11 +272,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1758108966,
-        "narHash": "sha256-ytw7ROXaWZ7OfwHrQ9xvjpUWeGVm86pwnEd1QhzawIo=",
+        "lastModified": 1760663237,
+        "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "54df955a695a84cd47d4a43e08e1feaf90b1fd9b",
+        "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37",
         "type": "github"
       },
       "original": {
@@ -298,11 +315,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1760925941,
-        "narHash": "sha256-M+EJsr6z05heKk6iuh3RWZS+9gAMBwG9IyryACVpOy0=",
+        "lastModified": 1766068170,
+        "narHash": "sha256-gsG+gYgr9GJX+RAAACK+46nWoJzcAtcrrjPZKd9mbbs=",
         "owner": "tailscale",
         "repo": "golink",
-        "rev": "42765dea97afa9f9f5ea167fb0df6f5372d78481",
+        "rev": "e6795d11f3b2d7a90678e1ea471967e8137b36ef",
         "type": "github"
       },
       "original": {
@@ -339,11 +356,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1761468550,
-        "narHash": "sha256-nY4vyN1QdHhC5Gj3545fI2Y7FSr/gs8ID4gPmF8HPww=",
+        "lastModified": 1768598210,
+        "narHash": "sha256-kkgA32s/f4jaa4UG+2f8C225Qvclxnqs76mf8zvTVPg=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "1830716059bfee7cbcfbfcc38d7be98e482a5762",
+        "rev": "c47b2cc64a629f8e075de52e4742de688f930dc6",
         "type": "github"
       },
       "original": {
@@ -361,11 +378,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1752603129,
-        "narHash": "sha256-S+wmHhwNQ5Ru689L2Gu8n1OD6s9eU9n9mD827JNR+kw=",
+        "lastModified": 1767104570,
+        "narHash": "sha256-GKgwu5//R+cLdKysZjGqvUEEOGXXLdt93sNXeb2M/Lk=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e8c19a3cec2814c754f031ab3ae7316b64da085b",
+        "rev": "e4e78a2cbeaddd07ab7238971b16468cc1d14daf",
         "type": "github"
       },
       "original": {
@@ -422,20 +439,47 @@
         ]
       },
       "locked": {
-        "lastModified": 1758763079,
-        "narHash": "sha256-Bx1A+lShhOWwMuy3uDzZQvYiBKBFcKwy6G6NEohhv6A=",
+        "lastModified": 1768491252,
+        "narHash": "sha256-ZlIPlKCYXwQJsw9WYVeyCapF5Y8JZL2Hctf22+IbHqo=",
         "owner": "cachix",
         "repo": "nix",
-        "rev": "6f0140527c2b0346df4afad7497baa08decb929f",
+        "rev": "9f0da1cd90b271569752a4c83f3ff700b8fcbe12",
         "type": "github"
       },
       "original": {
         "owner": "cachix",
-        "ref": "devenv-2.30.5",
+        "ref": "devenv-2.32",
         "repo": "nix",
         "type": "github"
       }
     },
+    "nixd": {
+      "inputs": {
+        "flake-parts": [
+          "devenv",
+          "flake-parts"
+        ],
+        "flake-root": "flake-root",
+        "nixpkgs": [
+          "devenv",
+          "nixpkgs"
+        ],
+        "treefmt-nix": "treefmt-nix"
+      },
+      "locked": {
+        "lastModified": 1763964548,
+        "narHash": "sha256-JTRoaEWvPsVIMFJWeS4G2isPo15wqXY/otsiHPN0zww=",
+        "owner": "nix-community",
+        "repo": "nixd",
+        "rev": "d4bf15e56540422e2acc7bc26b20b0a0934e3f5e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixd",
+        "type": "github"
+      }
+    },
     "nixgl": {
       "inputs": {
         "flake-utils": "flake-utils_3",
@@ -444,11 +488,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1752054764,
-        "narHash": "sha256-Ob/HuUhANoDs+nvYqyTKrkcPXf4ZgXoqMTQoCK0RFgQ=",
+        "lastModified": 1762090880,
+        "narHash": "sha256-fbRQzIGPkjZa83MowjbD2ALaJf9y6KMDdJBQMKFeY/8=",
         "owner": "guibou",
         "repo": "nixGL",
-        "rev": "a8e1ce7d49a149ed70df676785b07f63288f53c5",
+        "rev": "b6105297e6f0cd041670c3e8628394d4ee247ed5",
         "type": "github"
       },
       "original": {
@@ -459,11 +503,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1761373498,
-        "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=",
+        "lastModified": 1768564909,
+        "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce",
+        "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f",
         "type": "github"
       },
       "original": {
@@ -579,6 +623,28 @@
         "type": "github"
       }
     },
+    "treefmt-nix": {
+      "inputs": {
+        "nixpkgs": [
+          "devenv",
+          "nixd",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1734704479,
+        "narHash": "sha256-MMi74+WckoyEWBRcg/oaGRvXC9BVVxDZNRMpL+72wBI=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "65712f5af67234dad91a5a4baee986a8b62dbf8f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
+    },
     "zen-browser": {
       "inputs": {
         "home-manager": "home-manager_3",
@@ -587,11 +653,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1761471016,
-        "narHash": "sha256-sCiTEdvR5bnsAKmm0BcR6DLN4YKSUa43xLopA0VHYww=",
+        "lastModified": 1768379550,
+        "narHash": "sha256-z94S29l5V86h11LZbPIMbHTJyksDG63aqISsZkTTuJY=",
         "owner": "0xc000022070",
         "repo": "zen-browser-flake",
-        "rev": "9876658e1abf52bafa06bec7b0c2ba7e03931b0e",
+        "rev": "06f61b4e4f4f6ba8027c96a5611c63dc0db12b90",
         "type": "github"
       },
       "original": {
@@ -607,11 +673,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1760747435,
-        "narHash": "sha256-wNB/W3x+or4mdNxFPNOH5/WFckNpKgFRZk7OnOsLtm0=",
+        "lastModified": 1768565720,
+        "narHash": "sha256-PUDjT7pkY4WaKjS7flnjfwd8Q2piVsrNH/t/D+iYQ0g=",
         "owner": "mitchellh",
         "repo": "zig-overlay",
-        "rev": "d0f239b887b1ac736c0f3dde91bf5bf2ecf3a420",
+        "rev": "27fb45c107ca8c2eda2b6f255bdd33bb82f3026c",
         "type": "github"
       },
       "original": {

hosts/common/default.nix

@@ -109,7 +109,7 @@ in {
     };
 
     tailscale = {
-      enable = true;
+      enable = lib.mkDefault true;
     };
   };
 }

hosts/common/graphical/default.nix

@@ -10,7 +10,7 @@
   hardware.graphics.enable32Bit = true;
   hardware.bluetooth.enable = true;
   services.pulseaudio.enable = false;
-  services.blueman.enable = true;
+  services.blueman.enable = lib.mkDefault true;
   programs.partition-manager.enable = true;
 
   networking = {
@@ -43,11 +43,11 @@
       fraunces
       noto-fonts
       noto-fonts-cjk-sans
-      noto-fonts-emoji
+      noto-fonts-color-emoji
       nerd-fonts.iosevka
       monocraft
       source-code-pro
-      ubuntu_font_family
+      ubuntu-classic
     ];
 
     fontDir.enable = true;
@@ -55,11 +55,12 @@
 
   programs = {
     sway.enable = true;
-    niri.enable = true;
 
     steam = {
       enable = true;
     };
+
+    thunar.enable = true;
   };
 
   services = {
@@ -73,13 +74,17 @@
     };
 
     displayManager.sddm = {
-      enable = false;
-      package = pkgs.kdePackages.sddm;
+      enable = true;
+      package = lib.mkDefault pkgs.kdePackages.sddm;
       wayland.enable = true;
       # extraPackages = with pkgs; [(catppuccin-sddm.override {flavor = "macchiato";})];
       theme = "maldives";
     };
 
+    # desktopManager.plasma6 = {
+    #   enable = true;
+    # };
+
     pipewire = {
       enable = true;
       pulse.enable = true;

hosts/leviathan/configuration.nix

@@ -37,21 +37,12 @@ in {
     hostName = "leviathan";
     hostId = "abcd1234";
     interfaces.enp1s0.useDHCP = true;
-    interfaces.br0.useDHCP = true;
+
     nameservers = [
       "1.1.1.1"
     ];
 
     firewall.allowedTCPPorts = [8000 8123 8095];
-
-    bridges.br0.interfaces = ["enp1s0"];
-    # interfaces.br0 = {
-    #   useDHCP = false;
-    #   ipv4.addresses = [{
-    #     address = "192.168.1.200";
-    #     prefixLength = 24;
-    #   }];
-    # };
   };
 
   environment.systemPackages = with pkgs; [

hosts/pingbox/configuration.nix

@@ -26,12 +26,14 @@
     enable = true;
     extraPackages = with pkgs; [
       intel-media-driver
-      vaapiIntel
+      intel-vaapi-driver
     ];
   };
 
   programs.kdeconnect.enable = true;
 
+  programs.niri.enable = true;
+
   # programs.virt-manager.enable = true;
 
   # users.groups.libvirtd.members = ["daniel"];
@@ -45,6 +47,8 @@
     interfaces.wlp170s0.useDHCP = true;
   };
 
+  environment.pathsToLink = ["/share/xdg-desktop-portal" "/share/applications"];
+
   services = {
     fprintd.enable = true;
 
@@ -76,6 +80,13 @@
     logind = {
       lidSwitch = "suspend-then-hibernate";
     };
+
+    avahi = {
+      enable = true;
+      nssmdns4 = true;
+      openFirewall = true;
+    };
+    printing.enable = true;
   };
 
   systemd.sleep.extraConfig = ''

hosts/sidon/configuration.nix

@@ -38,6 +38,17 @@
     wlr-randr
   ];
 
+  specialisation = {
+    niri.configuration = {
+      programs.niri.enable = true;
+    };
+    plasma.configuration = {
+      boot.loader.systemd-boot.sortKey = "default";
+      services.blueman.enable = false;
+      services.desktopManager.plasma6.enable = true;
+    };
+  };
+
   security.pam.u2f = {
     enable = true;
   };

modules/backups/pingbox/default.nix

@@ -0,0 +1,58 @@
+{
+  pkgs,
+  config,
+  ...
+}: {
+  age.secrets = {
+    pingbox_backup_s3_creds.file = ../../../secrets/pingbox_backup_s3_creds.age;
+    pingbox_backup_repo_password.file = ../../../secrets/pingbox_backup_repo_password.age;
+  };
+
+  services.restic.backups = {
+    "system" = {
+      initialize = true;
+      passwordFile = config.age.secrets.pingbox_backup_repo_password.path;
+      timerConfig = {
+        OnCalendar = "daily";
+        Persistent = true;
+        RandomizedDelaySec = "15m";
+      };
+      repository = "s3:s3.eu-central-003.backblazeb2.com/pingbox-backup";
+      environmentFile = config.age.secrets.pingbox_backup_s3_creds.path;
+      progressFps = 0.1;
+
+      paths = [
+        "/etc/ssh"
+        "/etc/NetworkManager/system-connections"
+
+        "/home"
+        "/var/backup"
+      ];
+
+      exclude = [
+        "/home/*/.cache"
+        "/home/*/.local/share/Trash"
+        "/var/cache"
+        "/var/tmp"
+
+        "/home/*/.nix-profile"
+        "/home/*/.nix-defexpr"
+
+        "/home/*/.rustup"
+        "/home/*/.cargo/registry"
+        "/home/*/.cargo/git"
+        "/home/*/.npm"
+        "/home/*/.bun"
+        "/home/*/.hex"
+        "/home/*/.go/pkg"
+        "/home/*/.android/avd"
+
+        "/home/*/.steam/root/steamapps"
+        "/home/*/.local/share/Steam/steamapps"
+        "/home/*/.steam/steam/steamapps"
+      ];
+      backupPrepareCommand = ''
+      '';
+    };
+  };
+}

modules/default.nix

@@ -24,6 +24,9 @@
   sidon = {};
 
   pingbox = {
+    imports = [
+      ./backups/pingbox
+    ];
   };
 
   ranni = {

secrets/bigding_backup_repo_password.age

@@ -1,17 +1,17 @@
 age-encryption.org/v1
--> ssh-ed25519 eYYv1Q EAZDNmNVPn4csM/YdGJFlORxQDMMtO5Dn7x2XfFRaFU
-vuduGWTaLD//qz0GlOdArY7i4n3Uhwi4+nFr4jj8P3Y
--> ssh-ed25519 Bp5IaA XOy6sVXfaDVKhN81OZOtVlroHKIxpKgMwnJxcQ+i8Gs
-dxXJCjBLmLru9L/sJEBmp8wA563MBc4nZYhXkE5P3zY
--> ssh-ed25519 T/DpgA XKdq7MGI+Gl+NYrwuMBPs0Wy4Z2/ewdItW3YhgEW/xY
-SSeYZXSqY+FOv4A6+oxKgu2CzUI8DPEXiI2iMDXCkS4
--> ssh-ed25519 qMgRFg 6uBriCnYizzXcQ9Sj+PBHHHKajsBICdErIAN/m5zCwM
-HiNfRVS3omZA9UopFXXlK7KzaLU5q78/murhClxw3Hk
--> ssh-ed25519 dMZXNw R7mVtYIYqYGRJ6T1u07eStvfXJPZRT/0yOc0a2haFAo
-JNzKXxhW+MxJKCSlI6lJqpCbR3QYI+FAHlnXUpzW5pk
--> ssh-ed25519 +shbwg zIiwiExg9YyJ4ihqr10WPRv0deNFjj2on6EFFTnSFSU
-WYem7R3Mwi8OBZPOqd/m0v+A8k9HUC0+e7BwlTbdIQc
--> ssh-ed25519 70Nt2Q VacvBAJYuKDhLKpoDsdoFtPB9po/Bq/lC6EKG7C3oSg
-DrifwWRcqhHjt/yAcDrxKEPpY3ceL5VJy3BNPH7v4q8
---- vwailf0HFStDtxF94IGxV1jHWyhLjagTFAROxkCqnv4
-<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>P<><1F>6<EFBFBD><36>i<EFBFBD>bɿ<62><C9BF>
\
+-> ssh-ed25519 eYYv1Q oXddewWnllLv73h4eMljoP35QKuQ1rUsAMoE6tu8XTg
+zgoOxEdZQ7feixPSzcLWKS5T+23wfGrCSr19s891sJc
+-> ssh-ed25519 Bp5IaA NxT+LEXxDV++CYL973CsB2Tt2pBFjkvs6kOnxmHQ+AQ
+AH1OmpmY899Ov3j4texm96/tIIxCYzdtb/HoZ1pXVuk
+-> ssh-ed25519 T/DpgA FgKrOJEI+YlBfxagb9YOu1feBXtZvGUnescAP5pKITA
+FAvD1d87Ne66a75LmkEIUG7UKV6bIsRs4an8IFeh3MQ
+-> ssh-ed25519 qMgRFg Q5VNMErDZucmpQnLDKzssklxNpaGXBN4pfEOiheFL2Y
+cN4D/lzi44MdP5IsWG8o0fB5a06FCuJ8fUyF7fHLAao
+-> ssh-ed25519 dMZXNw qqUxq8I5jwKflFaLQ3T2qyIM2eQKTTMxIqg+hmTYsXU
+ezU+fnbRxzkwu1ws7YwYU+ZLERGeiqIXyBZPe786RaE
+-> ssh-ed25519 +shbwg uIAE/ULfFSDjeCdw3Cfk/sov6prSBTsBT8SY7XHQhDU
+umVDIXt7lDjUYMszoi2ti48la1Hqh3LfKgfXwx2rH8I
+-> ssh-ed25519 70Nt2Q kyQVdOCOGR/IFyG67cQQyH2j3YPv8R5Y5JNb09XFuwU
+5mUcmoAiO3XgZXxHTqRg02IBz9eejCYro6O07uoflQc
+--- 3y+/TDRrG+APpNJSBYzci5s2WtjUHsc8lGvtISn/gcg
+<EFBFBD>Jʯ<4A>f<EFBFBD>8uBj<42>F<0C>yU<79><55>W<EFBFBD>ZĆC<C486><43><EFBFBD>5M<>5S<35>iô<69>ߎ*<1B>S<1B>/<10>

secrets/caddy_porkbun_api_env.age

@@ -1,20 +1,19 @@
 age-encryption.org/v1
--> ssh-ed25519 eYYv1Q HLv7VwiVXzh/uYmcwjMa0eZw7sJ+QDd1O2pKELLwi3s
-Gv05590x4magr/A8oi1yAwFrwEZ5VXK1jFl8ojLabng
--> ssh-ed25519 Bp5IaA yuIBqQ+wKpMH9tOOXG8sWF8dVrElBtAAtIFv27XiZlU
-+LYw0xUKS8340E0e3B9z3ijydbM/EJk4jEXqToOl4Uk
--> ssh-ed25519 T/DpgA ZVI8HGiPa0L8ACjz3L/qCFjShimO2xlF1iEJ8D+VNUo
-jUqRKYaNLzNUAHj3U7lGEhJjHYp6Zge3pX9ogv7OTzs
--> ssh-ed25519 qMgRFg kWK3YMixuoNaCLvfqvxkIyVt7X/Fe1RnTU+9LgxyH3I
-lv4DI+XrKOU89bdR1VEFv7BtMMKOaQCVkG1ntENDhOQ
--> ssh-ed25519 dMZXNw +A8bV+j+yrc6PurfbawA1cXwJFoW+SK7IMZvE62TkH4
-fvawY41qd1/mj6yvYcl3j0hOEhao+rCyCVSOki8Xh2E
--> ssh-ed25519 +shbwg kbmKDfoo+Vh5EBxENBHfrBjP1cW9YjOEhPnMSSrspQU
-2n0w1x/ZdpZBSJteCjNnleA3Am6xukaXGieBtfINYxk
--> ssh-ed25519 70Nt2Q F17IHEPl6iZKRIwRkZbtE9ekNobZf3uF8E47gZzM5QE
-2poTmZo+Tkpsq0f5SigLajIaw3Ug+roWvkRZIJRd7vA
--> ssh-ed25519 YAvvLw 33rh0onpSuvq5RBZIOdb9vHKqxqFBYMVZ9tRQlwB9A0
-FbALwt60o6hj4B/fPlVqBKOW9BPv04H+z2/mz+3pYK8
---- 1OPzsgbGklGa39hKcitpdDhUAhiy3U83PSh1OKNHP9Y
-9<EFBFBD>XM<>PH<05><1D>1<><31>Y<EFBFBD>,M<>L<EFBFBD><4C><EFBFBD><EFBFBD><EFBFBD><EFBFBD>b<><62>2<EFBFBD>ɍR<C98D><03><><EFBFBD>0<EFBFBD>3<EFBFBD><33>5<EFBFBD>^h⫍
-<EFBFBD><EFBFBD><EFBFBD>rix[d<><64>M<EFBFBD><0C>6<1B>l<EFBFBD><6C>;P,<2C>nX6@N~<7E><>iȃ<69>i2<69><32><16>o<EFBFBD><6F>
+-> ssh-ed25519 eYYv1Q mCtMgzmP7HxB46ER6twUtUi3SJKK66DHQP77otrg2XU
+sTXftZwgeZk+KDP/l5fXR9Og/3AcYPLGBg1AzuVxkRw
+-> ssh-ed25519 Bp5IaA czaqh5ZgiSd4h2Oe3PNIfDwsPWVft8ZP1Cc6o7fTRU0
+bQ6r4M37tDjhD4s9LcPonsmbLlU/cgO7nSQrUi+rUSk
+-> ssh-ed25519 T/DpgA v1wZ6YO0cwtuN1mrxW8/axRKpAPa+V5g79KNMxrELWU
+MS6NZMHViOzib4RT06Bz3TgL+/gJk/hUzdzMljqJhKQ
+-> ssh-ed25519 qMgRFg BCzcZk3UlZV1EQQtP/na+Ed8lQ2mFKFIA29zX2Wsw3k
+psdMhWStulJ+heqvyFER4zpuXp8i84PJIJWZnKlEvrs
+-> ssh-ed25519 dMZXNw VabNLOAFFZK5bNzQ85co2/7NNHal5SjhktCWLoWWznY
+hHB671B0Q5gqktZ7BTq4Ny+KUXZ1EHQGuffzusJVSPI
+-> ssh-ed25519 +shbwg UfJ2qk6tN65rOiSUIATVbPYD+kDCrJVKMrZBSeOtqlI
+2CVDA0/ag1PS8ANLRXQ1WvX5Nzd8FLM7d4qX+jXCsZ8
+-> ssh-ed25519 70Nt2Q ambd6Z2wkhMxyCFAuFZjtp+QSMPyeSrfyACJlxTh7EQ
+ONURlDlrO9bdnCFm+We0733DgKBhfUyZRXwIOS5Jed8
+-> ssh-ed25519 YAvvLw RWhx1m4FF5mMfx41RkatBH9HfBFcWCXTkmWCHGCWk2c
+lKmFwwsqtF0lL+EIDzwUW+P+gqEi/d4fd+qQZ5P8A1g
+--- FcmYlyW5nSD7yAY0lJYWnemJZIujuy0yRK25GJcG1M4
+<0B><><EFBFBD>

secrets/pingbox_backup_repo_password.age

@@ -0,0 +1,17 @@
+age-encryption.org/v1
+-> ssh-ed25519 eYYv1Q MOnAF1gIBzvuitiC6Nw4/SJppyOQff9j4gHPAcKmO1o
++G3RsKGN09DVOmQ7ma4lRoRFiYYCiCY2WoV6l5JKucM
+-> ssh-ed25519 Bp5IaA 1ftyP4x5WfRsZvOVYLUpiR5Q1hQgRU78j0Yuwv07OGw
+wtVAKEglVVu9B1yQwBp4AutzjDiTAAHbsrJJSMQPjLI
+-> ssh-ed25519 T/DpgA x/1vUD1VHZYBWwXzBO4c7P6WtLkTYu6KD8RglBtrsl8
+PRM6akgeJ64OHBV94jLojVJlHjwWiv0tLpJF2QnqXX4
+-> ssh-ed25519 qMgRFg fBlwYeWq+XwRgOclr/IK18QHbdwXr0kD+/b9HnQZ2yY
+52mokhUVu1AjcHBrWvJ3AS8Zr4o19ijhHxdo+tYQiuk
+-> ssh-ed25519 dMZXNw SobQAY/O2iJ4MKMtbDXyDEbwQpTvuoKvG8UKYWoEEF8
+eueMl+WoEMJOUSJ9hnt80w4lZXiWxPNJ1jXtGudFXVQ
+-> ssh-ed25519 +shbwg 0EPWn6B2GVHrw/eXWC9ugGIDFvXSCPfhFrg5F8GgeEA
+ql8+axPwSj9eQuGp4J9UjuK70TZqGsCXhFSczsQQUg8
+-> ssh-ed25519 RD8X/A nZXLx5Ujbu+h+odPK5kpLJUlegn117xQSEdiEDHWx14
+O/ftoh0wTit0RvlW+176vTE8r7yIrXK8GfL81pn1epk
+--- G1sqmtJfli22DKFmP90EzmGJNqkcxeFQlQ3WskR9dkQ
+<EFBFBD>쨺<EFBFBD>.<2E><><EFBFBD><14>D<<3C><>Q(JA<4A>}qOZ<4F><5A><EFBFBD>+t<>D<EFBFBD><44>im<69>]<5D>ޛj4<10>ڿ @s (EfF<18><>4#<23>dnޠ<6E><DEA0>4<EFBFBD><34><EFBFBD>n<EFBFBD>4eL{

secrets/pingbox_backup_s3_creds.age

@@ -0,0 +1,18 @@
+age-encryption.org/v1
+-> ssh-ed25519 eYYv1Q 4CKDsgu9sWc8ndynGaeVn5pGi00Q7MH1d10B+u/y6V4
+xoV29lRzNuiuUGb53LmAEtLAZqVPuasHhkAsYDV1vHI
+-> ssh-ed25519 Bp5IaA T/KQa0GccaU4+VWz6RkaJYy+xW64TtTrWmwTZaQhnSs
+M6Xeo00CnoTS2S0fxro3cR1jmMhhAgRYkUBvERVPDdg
+-> ssh-ed25519 T/DpgA RXD/DvpKiRAroiIHzeGvEvxu0Wqo9OTVEzGb7rALhQQ
+QMLi3YvEgcQnX3wbdvOMepxFFv8fVYV6gAT9xDgtlZk
+-> ssh-ed25519 qMgRFg gRd/ujAUy3cwfhOxqPG43g78C0JoanVeuTNgqkWdrGQ
+6jrqVbZVnJjfLt9Gty2W46uAXe1I1zRB8hZUYlT4f4U
+-> ssh-ed25519 dMZXNw Hi5EgfUVrLKEDk1X0dKw/E45wPnp/8m3AArlx6uVMAE
+cFNiWQc7l08OmyB92WEAiJBq81EwXrBahPF0Obra+iU
+-> ssh-ed25519 +shbwg HHQj8eV9/oX9bPfhdHGNqIs+/0PpdHZaqOtbddKqEV4
+cWja5Ik+cqWZEprdNsdYQX4bBLIr0SSlIvIq7E1Swa4
+-> ssh-ed25519 RD8X/A S0Ye1A3tg4oJxVOFYl7FCnx0M1WxV+KUYT2iJHvL7mA
+9eEP5uRWpkIfpnhzaAyYnXn7Mh6VlqsBVfbp+ojPOfk
+--- t8POWURQ6sCpE3t9cG6EdGlp4kymFepstZYyj07JWnI
+<EFBFBD>pj<EFBFBD><EFBFBD>t<EFBFBD>sr<><1E><><EFBFBD>T<EFBFBD><54>W<EFBFBD>PM<50><4D><EFBFBD><EFBFBD>]<0E><17><><EFBFBD>Nd7<64>&`<60><>bCɴ
+u<EFBFBD>a<EFBFBD><EFBFBD>)c9d<39><64>j<17>dɬK<C9AC><4B><EFBFBD>i@L<><4C><EFBFBD><EFBFBD><EFBFBD><EFBFBD>`<1D>`<60><>S<EFBFBD>zs<><73><EFBFBD>|<7C><>C0pG<70><13>.Ǭx<C7AC>e.<2E><>j

secrets/rclone_password1.age

@@ -1,19 +1,21 @@
 age-encryption.org/v1
--> ssh-ed25519 eYYv1Q DqaKeDDz87lxpd5vMK4bcnq/3S7V116rZ6TdWMHNMjI
-XUe76IIiS6vZ+WuX/geMimGr6VBQvZCU0xgGV+Juhh8
--> ssh-ed25519 Bp5IaA T1I5f0biigGMBg4YXGZF3WiY1X1N+3fh1zbwo/8UuHM
-oksdQ76Ag6LpXy8cfezQPOxxvy/qZkzhmTy9sqNItqw
--> ssh-ed25519 T/DpgA 9qc1fni0oFqFeE3l0pCAdHyMtn+pPOnH23rn8qVbPFE
-2POXvcfNW2zXzBu7QCbGEw4pqGj8aTrHIfczPWl5RpI
--> ssh-ed25519 qMgRFg q9M8wnO9MsaWpM941pwVaFF2RwKeON2cW+n8s8uRDBA
-R9fwzp6S4L8cFXaFi5Du+GcQickV0+SOU/b7Q8Nyrfc
--> ssh-ed25519 dMZXNw Aphy90he30P6uyIJdvpiegBncnBNIoMpahg2XYrOPCU
-1BroEQo4SHy11PwVcTluq7XM7DZql+LfZX4DxWCPHBY
--> ssh-ed25519 +shbwg XX8o4B57nZ5teIicWs1LJysdM/irTe3wUpegSia2P2E
-Wh+vzzl2f+vO7KNIex/UY4wcEtmq7NG0z4I5OtUfiGM
--> ssh-ed25519 GzHGXw 5rV4pXv5FpnOAGUkLcmFUnUwJv2xqh6NkbNUsPOhtlE
-wMHuKNeCXcz8e3zG1RaLQA6hKo7Cg/E6h7FfLUkQKuQ
--> ssh-ed25519 70Nt2Q N3MFptnU524HZBZrmzsHtATJWT/H2xegBQMr+0NS134
-Ta1AszHsbQhzqqPfCePaOB8fT1OJQMzpoPCAKDM9J2E
---- VkzSldNpvwIE4KGzPt+CVOHsXylmJ/L3KdjMlPgVfVI
-<EFBFBD><EFBFBD><EFBFBD>X<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ae<08><11><>?
0<><30><EFBFBD><EFBFBD>h<EFBFBD><15>zT<7A><54>x"<22><> <20>l<EFBFBD>P<EFBFBD><12><><02><><EFBFBD>Ӄ<EFBFBD><D383><EFBFBD>Q`<60><><EFBFBD>C<EFBFBD><43><EFBFBD>p<1D>2<EFBFBD><32>#35<33><35>
+-> ssh-ed25519 eYYv1Q 6vOBCYYulq/yMgZcE4pKNSWpkO615wAyBqCDcCvS7Qc
+rX/Kw5qtZFSpAncxWVhG/LUzFuFiuEOuHcYUdBfkst8
+-> ssh-ed25519 Bp5IaA EtR1cN2DPBgy+r6hpat+jKSisbdCuLRm1gTLDE1KM0c
+EVaQdf804QSqpAXrV82kL2XwHmqNXihLT42bzv5uIVo
+-> ssh-ed25519 T/DpgA nKRA3fgCa2+8SdLVqI4m6untb8aBlAuNf3zKJmQBAkY
+MEd6efWFuqUtDJPDBgZqkTG2neZQZwA5HzIC7uElyIU
+-> ssh-ed25519 qMgRFg sAuPesGJ54EnRowUbFhAPRgOQxDr/TBPyqsJNcJ3j0A
+DgEouiS8UjzAaQSVKFDObfxM0WijQtCQLzsSu7pFRwM
+-> ssh-ed25519 dMZXNw DBchChRMA5hszqtjJvwvsNGZk9Z0HlvmNHMdx+OFVV4
+U+LIDwbuKFGvuULEDuOPhyiTIcEjwpY9EA+HBes/Y6o
+-> ssh-ed25519 +shbwg hgFratZl3KxZDK08F1CWIMv7JwlDVNIByMAG/JJbjyI
+YBnnlVasOTVYJmes/vchGK9FEWLGe/SS4ZHdwGcE79k
+-> ssh-ed25519 GzHGXw lHxuRl5gM+DPABDkiDhaArSgRFkNWV4qbsa+0HGzKU0
+8nZbH5sJI6CGFD7K51xJ2MKr8DHqRrGEe+lQVH4plWY
+-> ssh-ed25519 70Nt2Q 45n/rUffOJu3bzrTBymPToB8aTXcvQWOeFPVmLzB9WY
+QyewneIRy7KXqCXWZpzt9bTL65dtM41BPDx8bedZcUU
+--- LWbHHVWdceA60roQicg72sJxBWPNvu4s8K1WNcorMpU
+<EFBFBD>CP?̮<>Dͳ˚<CDB3>V<EFBFBD><56>d<EFBFBD>{<16>-<2D><><0C><>fk9<6B><39>"<22><>٢'<27>\<5C>#̊<>eN`Ẉ
+<EFBFBD><EFBFBD><03>.1<EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD>I<EFBFBD>z<07><>

secrets/rclone_password2.age

@@ -1,20 +1,19 @@
 age-encryption.org/v1
--> ssh-ed25519 eYYv1Q RIMmsWmolEIOQUGgoIQRlmjTWqDLQYInJbPVeB7f/wU
-06vZZhfXi1zqHznmbub9/wqsE8XvTlULe181cCz1oFc
--> ssh-ed25519 Bp5IaA LdaP3AOLKqGe3ala1UGFf0e7EThr9ptn4qUYzYSktz8
-c/6py1I4vJOtmoNRjm/99nlWax+J5pdMhh1GUzpIsMQ
--> ssh-ed25519 T/DpgA xvmg2ZQwPzUM9J6C0ggBPoRbW5R0w92unR3+W6dyo0M
-lNDyhV3PBS56HDXrTECTdcHUVb2rSNA3GsirYdxjhN4
--> ssh-ed25519 qMgRFg OLu/nzVnSnB6PdI5ZO0Nfp0Ga8ekWa5sWmqXhwYQ5VQ
-x2LlyRBvB0Pw2yYi43KXeHUgJQ25OQEIX65L8wmcXz4
--> ssh-ed25519 dMZXNw m3ydHsFKsxmbA3e6jcLVoZV60Y+OLmoOb4d05DQQsDU
-MDOCsqlPc9rR3d0+sDbv0tPxr+hX3Kpc+E2HfZo87uo
--> ssh-ed25519 +shbwg eQnubQCP4+mjipTkxIrIEZ8rboOy2A/T5MWLe4Txz0w
-Y6GEm6UZDegoPuUXxbK/LkrqZBY86rHt475anCnoFxg
--> ssh-ed25519 GzHGXw Z8Ut75VgG0ttf2LLjgfUb9TbxpW8nfSTLvx7FJoXDA0
-pjfgN5XokETssMCbolQ0nr2+4sTa1C0+oxg4IUIEgVw
--> ssh-ed25519 70Nt2Q Vmm5Dw+N8OVT9JawsVnYoC1FIOX7bKEb54Gb1cYMFC8
-/FNGoN4CbLahBtxj8zaNRjE7wM/3hXVJSFsfP0AJxc8
---- HOnH0WA6bQZ0y9HEjgzmOo+P3hRosz1fM5tRVrYZ09A
-<EFBFBD>,<2C>
-<EFBFBD>9<EFBFBD><1A><03>Or4<72><34><EFBFBD><EFBFBD>ǔխ<17>H<>ě7<C49B>pkR<1E>+m<><0B>w<16>RS<02>)<29>&
+-> ssh-ed25519 eYYv1Q x9YHnQrHk/+xuNB3Dgds2YXl6snJw0BF/vy7h6+0USk
+b3VaHkqpDOJlAahOx6zaKLaTouJqJ45tubz/jf05s38
+-> ssh-ed25519 Bp5IaA Vz/hj6Ghlec3tRUY5tZ3is/uE+AT9GMPl93o0LppBiw
+guTE7llA2Y4MT+v6bHT7nmqrKdxDeyvAdJMfbk4aUXM
+-> ssh-ed25519 T/DpgA tWDjI6k2AcEFPqX8K4Zwf5jtpvRDDCVSM4g+12cZOEI
+bqq3UGc0tHm0OO8Y+rmUX38iN685BKz0F719DZo/plA
+-> ssh-ed25519 qMgRFg fRuc+LYFQnHG9zhu6uK4aGdWu/crjXl27tnTE98bLiA
+JFkTAqDWygs8UXnYeZ05MXJ35lgtRy4LTOLLS0STkXQ
+-> ssh-ed25519 dMZXNw sdLzOdQ7R+0AFpjb3CSH2djvdT7qedS1io7LxcbHeCM
+tPWjCR+sim3lJmIBbRBdjZ/5WCQWZ5OlMA8Rere2GHY
+-> ssh-ed25519 +shbwg JzFxfwYd2EHJklt1edx21IKPkBwNIEXekVPm0CtFTXw
+SVYAq6wZm+HqL+zRLkkQETaUrgaq6UCKmai1+AIQ2mU
+-> ssh-ed25519 GzHGXw G8XbVaclLKQmpg0rcz5NjJoREpBqkfZSIJ1BXmUOwQ0
+xNwiO1Mo6WdfCEgAYtUHbC9oRhaKzXCuARazCHc93gU
+-> ssh-ed25519 70Nt2Q WNZK+p/no7glfDohKMmi6fGXC2TikrnyvvkvBORRXyw
+7Gu0e2jzECq21S8djgW1YRTK98EmU03Gk0cRtF0/pgo
+--- 14oASxLoERqbPTjBVECRCgo6bTG5MXb1WR5NTGB41UU
+<EFBFBD>.ÝVi<11><>f\<5C><>7<EFBFBD><14>Z<EFBFBD><5A>i	<09><07>rVayZ"<22>p<EFBFBD>Խ<EFBFBD>fp<66>a<18><><EFBFBD>ji<08><><EFBFBD>

secrets/secrets.nix

@@ -37,4 +37,6 @@ in {
   "danflix_env_file.age".publicKeys = users ++ [system4 system5];
   "danflix_rclone_config.age".publicKeys = users ++ [system4 system5];
   "caddy_porkbun_api_env.age".publicKeys = users ++ [system4 system5];
+  "pingbox_backup_s3_creds.age".publicKeys = users ++ [system3];
+  "pingbox_backup_repo_password.age".publicKeys = users ++ [system3];
 }

users/configs/desktop/default.nix

@@ -11,5 +11,5 @@
     ./waybar
   ];
 
-  zen-browser.enable = true;
+  programs.zen-browser.enable = true;
 }

users/configs/desktop/niri/config.kdl

@@ -29,7 +29,7 @@ input {
         // dwtp
         natural-scroll
         scroll-factor 0.5
-        // accel-speed 0.2
+        accel-speed 0.4
         accel-profile "flat"
         // scroll-method "two-finger"
         // disabled-on-external-mouse
@@ -38,8 +38,8 @@ input {
     mouse {
         // off
         // natural-scroll
-        // accel-speed 0.2
-        // accel-profile "flat"
+        accel-speed 0.2
+        accel-profile "flat"
         // scroll-method "no-scroll"
     }
 
@@ -98,6 +98,17 @@ output "eDP-1" {
     // position x=1280 y=0
 }
 
+output "DP-3" {
+    scale 1.33
+    position x=0 y=600
+}
+
+output "HDMI-A-1" {
+    scale 1.33
+    transform "90"
+    position x=2880 y=0
+}
+
 // Settings that influence how windows are positioned and sized.
 // Find more information on the wiki:
 // https://github.com/YaLTeR/niri/wiki/Configuration:-Layout
@@ -212,6 +223,9 @@ layout {
 // which may be more convenient to use.
 // See the binds section below for more spawn examples.
 // spawn-at-startup "alacritty" "-e" "fish"
+spawn-at-startup "dbus-update-activation-environment" "--systemd" "DISPLAY" "WAYLAND_DISPLAY" "XDG_CURRENT_DESKTOP"
+spawn-at-startup "systemctl" "--user" "import-environment" "PATH" "DISPLAY" "WAYLAND_DISPLAY"
+
 spawn-at-startup "waybar"
 spawn-at-startup "xwayland-satellite"
 

users/configs/system/ghostty/config

@@ -1,33 +0,0 @@
-font-family = Iosevka Nerd Font
-font-size = 12
-
-theme = catppuccin-macchiato
-
-cursor-style = block
-
-shell-integration-features = no-cursor
-
-window-theme = ghostty
-window-decoration = false
-working-directory = home
-
-unfocused-split-opacity = 1
-
-keybind = ctrl+shift+enter>ctrl+shift+h=new_split:left
-keybind = ctrl+shift+enter>ctrl+shift+l=new_split:right
-keybind = ctrl+shift+enter>ctrl+shift+k=new_split:up
-keybind = ctrl+shift+enter>ctrl+shift+j=new_split:down
-keybind = ctrl+shift+enter>h=new_split:left
-keybind = ctrl+shift+enter>l=new_split:right
-keybind = ctrl+shift+enter>k=new_split:up
-keybind = ctrl+shift+enter>j=new_split:down
-
-keybind = ctrl+shift+f=toggle_split_zoom
-keybind = ctrl+shift+h=goto_split:left
-keybind = ctrl+shift+l=goto_split:right
-keybind = ctrl+shift+k=goto_split:top
-keybind = ctrl+shift+j=goto_split:bottom
-
-keybind = ctrl+shift+m=toggle_tab_overview
-
-keybind = ctrl+shift+alt+r=reset

users/configs/system/ghostty/default.nix

@@ -4,11 +4,47 @@
   hostname,
   ...
 }: {
-  home.file.".config/ghostty/config" = {
-    source = ./config;
-  };
-
   programs.ghostty = {
     enable = true;
+    settings = {
+      font-family = "Iosevka Nerd Font";
+      font-size = 12;
+
+      theme = "Catppuccin Macchiato";
+
+      cursor-style = "block";
+
+      shell-integration-features = "no-cursor";
+      window-theme = "ghostty";
+      window-decoration =
+        if hostname == "pingbox"
+        then "none"
+        else "auto";
+      working-directory = "home";
+
+      unfocused-split-opacity = 1;
+
+      keybind = [
+        "ctrl+shift+enter>ctrl+shift+h=new_split:left"
+        "ctrl+shift+enter>ctrl+shift+l=new_split:right"
+        "ctrl+shift+enter>ctrl+shift+k=new_split:up"
+        "ctrl+shift+enter>ctrl+shift+j=new_split:down"
+        "ctrl+shift+enter>h=new_split:left"
+        "ctrl+shift+enter>l=new_split:right"
+        "ctrl+shift+enter>k=new_split:up"
+        "ctrl+shift+enter>j=new_split:down"
+
+        "ctrl+shift+f=toggle_split_zoom"
+        "alt+enter=toggle_split_zoom"
+        "ctrl+shift+h=goto_split:left"
+        "ctrl+shift+l=goto_split:right"
+        "ctrl+shift+k=goto_split:top"
+        "ctrl+shift+j=goto_split:bottom"
+
+        "ctrl+shift+m=toggle_tab_overview"
+
+        "ctrl+shift+alt+r=reset"
+      ];
+    };
   };
 }

users/daniel/default.nix

@@ -10,10 +10,10 @@
   cliPackages = with pkgs; [
     age
     direnv
-    elixir_1_17
+    elixir
     elixir-ls
     entr
-    erlang_26
+    erlang
     gnumake
     go
     gopls
@@ -47,7 +47,6 @@
     _1password-cli
     _1password-gui
     calibre
-    deadbeef
     discord
     feh
     fraunces
@@ -131,6 +130,7 @@ in {
     extraPortals = with pkgs; [
       xdg-desktop-portal-gtk
       xdg-desktop-portal-wlr
+      xdg-desktop-portal-gnome
     ];
     xdgOpenUsePortal = true;
     config = {
@@ -142,6 +142,10 @@ in {
     };
   };
 
+  services.udiskie = {
+    enable = true;
+  };
+
   programs = {
     # Let Home Manager install and manage itself.
     home-manager.enable = true;
@@ -157,10 +161,11 @@ in {
 
     git = {
       enable = true;
+      lfs.enable = true;
       package = pkgs.gitFull;
-      userName = "Daniel Patterson";
-      userEmail = "me@danielpatterson.dev";
-      extraConfig = {
+      settings = {
+        user.name = "Daniel Patterson";
+        user.email = "me@danielpatterson.dev";
         pull.rebase = true;
         init.defaultBranch = "main";
         format.signOff = "yes";