6 files changed, 43 insertions(+), 9 deletions(-)

M flake.lock
M flake.nix
M hosts/desktop/default.nix
M hosts/laptop/default.nix
M modules/services/syncthing.nix
M modules/services/wireguard.nix

@@ 165,6 165,19 @@
         "type": "github"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1697059129,
+        "narHash": "sha256-9NJcFF9CEYPvHJ5ckE8kvINvI84SZZ87PvqMbH6pro0=",
+        "path": "/nix/store/xjviahzwa7x51vl51kc3c1k1n1jmhpd5-source",
+        "rev": "5e4c2ada4fcd54b99d56d7bd62f384511a7e2593",
+        "type": "path"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "type": "indirect"
+      }
+    },
     "nur": {
       "locked": {
         "lastModified": 1697215604,


@@ 188,7 201,26 @@
         "nixgl": "nixgl",
         "nixpkgs": "nixpkgs",
         "nixpkgs-stable": "nixpkgs-stable",
-        "nur": "nur"
+        "nur": "nur",
+        "semi-secrets": "semi-secrets"
+      }
+    },
+    "semi-secrets": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "lastModified": 1697366661,
+        "narHash": "sha256-KHjt9B1ErMPrQry85NG70I9cKGrMgkcwbSJOcxSoF+I=",
+        "ref": "refs/heads/main",
+        "rev": "2a6756dc9390401e8c64ee94514719ef3d548d85",
+        "revCount": 1,
+        "type": "git",
+        "url": "file:///home/ruther/.semi-secrets"
+      },
+      "original": {
+        "type": "git",
+        "url": "file:///home/ruther/.semi-secrets"
       }
     },
     "systems": {

@@ 14,6 14,8 @@
       nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
       nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.05";
 
+      semi-secrets.url = "git+file:///home/ruther/.semi-secrets";
+
       home-manager = {                                                      # User Package Management
         url = "github:nix-community/home-manager/master";
         inputs.nixpkgs.follows = "nixpkgs";

@@ 18,7 18,7 @@
 #           └─ default.nix
 #
 
-{ pkgs, lib, user, config, ... }:
+{ inputs, pkgs, lib, user, config, location, ... }:
 
 {
   imports =                                               # For now, if applying to other system, swap files


@@ 68,7 68,6 @@
   environment = {                               # Packages installed system wide
     systemPackages = with pkgs; [               # This is because some options need to be configured.
       wacomtablet
-      xorg.xf86videoamdgpu
     ];
   };
 

@@ 16,7 16,7 @@
 #           └─ default.nix
 #
 
-{ config, pkgs, lib, user, ... }:
+{ inputs, config, pkgs, lib, user, ... }:
 
 {
   imports =                                               # For now, if applying to other system, swap files

@@ 1,4 1,4 @@
-{ config, lib, pkgs, user, ... }:
+{ inputs, config, lib, pkgs, user, ... }:
 
 {
   networking.firewall = {

@@ 1,4 1,4 @@
-{ config, lib, pkgs, user, ... }:
+{ inputs, config, lib, pkgs, user, location, ... }:
 
 {
   networking.firewall = {


@@ 7,7 7,7 @@
 
   networking = {
     nameservers = [
-      "${inputs.semi-secrets.wg.lan.serverIp}"
+      inputs.semi-secrets.wg.lan.serverIp
       "1.1.1.1"
       "1.0.0.1"
     ];


@@ 31,10 31,11 @@
       peers = [
         {
           publicKey = "Mui5wOV21QTer4NK2dUcBOgaW9UFzFzwmxOn/458ByI=";
-          endpoint = "${inputs.semi-secrets.wg.serverEndpoint}";
+          endpoint = inputs.semi-secrets.wg.serverEndpoint;
+
             # The ip is not refreshed, as the kernel cannot perform DNS resolution. Use dynamicEndpointRefreshSeconds,
             # in case the ip is refreshed often. If not, sync after refresh should be alright.
-          allowedIPs = [ "${inputs.semi-secrets.wg.allowedIp}" ];
+          allowedIPs = [ inputs.semi-secrets.wg.allowedIp ];
           persistentKeepalive = 25;
         }
       ];