Compare commits

..

1 commit

Author SHA1 Message Date
89391c31ac flake.lock: Update
Flake lock file updates:

• Updated input 'ghostty':
    'git+ssh://git@github.com/ghostty-org/ghostty?ref=refs/heads/main&rev=674e2980e2f26f9f0db4a1afa8b4acf8c3bc1340' (2024-12-12)
  → 'git+ssh://git@github.com/ghostty-org/ghostty?ref=refs/heads/main&rev=34dca8149b6d096e02ab2767aca1b106a4ba87e1' (2024-12-17)
• Updated input 'hyprland':
    'git+https://github.com/hyprwm/Hyprland/?ref=refs/tags/v0.45.2&rev=12f9a0d0b93f691d4d9923716557154d74777b0a' (2024-11-19)
  → 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=5f1df55fcb45a72e92258113685aa9064f6ebf3e' (2024-12-17)
• Updated input 'hyprland/aquamarine':
    'github:hyprwm/aquamarine/4468981c1c50999f315baa1508f0e53c4ee70c52' (2024-11-18)
  → 'github:hyprwm/aquamarine/a132fa41be7ebe797ad758e84d9df068151a723b' (2024-12-17)
• Updated input 'hyprland/hyprcursor':
    'github:hyprwm/hyprcursor/0264e698149fcb857a66a53018157b41f8d97bb0' (2024-10-11)
  → 'github:hyprwm/hyprcursor/f388aacd22be4a6e4d634fbaf6f75eb0713d239a' (2024-12-16)
• Added input 'hyprland/hyprgraphics':
    'github:hyprwm/hyprgraphics/fb2c0268645a77403af3b8a4ce8fa7ba5917f15d' (2024-12-08)
• Added input 'hyprland/hyprgraphics/hyprutils':
    follows 'hyprland/hyprutils'
• Added input 'hyprland/hyprgraphics/nixpkgs':
    follows 'hyprland/nixpkgs'
• Added input 'hyprland/hyprgraphics/systems':
    follows 'hyprland/systems'
• Added input 'hyprland/hyprland-qtutils':
    'github:hyprwm/hyprland-qtutils/3833097e50473a152dd614d4b468886840b4ea78' (2024-12-11)
• Added input 'hyprland/hyprland-qtutils/hyprutils':
    follows 'hyprland/hyprutils'
• Added input 'hyprland/hyprland-qtutils/nixpkgs':
    follows 'hyprland/nixpkgs'
• Added input 'hyprland/hyprland-qtutils/systems':
    follows 'hyprland/systems'
• Updated input 'hyprland/hyprlang':
    'github:hyprwm/hyprlang/f054f2e44d6a0b74607a6bc0f52dba337a3db38e' (2024-10-05)
  → 'github:hyprwm/hyprlang/16e59c1eb13d9fb6de066f54e7555eb5e8a4aba5' (2024-12-16)
• Updated input 'hyprland/hyprutils':
    'github:hyprwm/hyprutils/e911361a687753bbbdfe3b6a9eab755ecaf1d9e1' (2024-11-15)
  → 'github:hyprwm/hyprutils/e6cf45cd1845368702e03b8912f4cc44ebba3322' (2024-12-16)
• Updated input 'hyprland/hyprwayland-scanner':
    'github:hyprwm/hyprwayland-scanner/500c81a9e1a76760371049a8d99e008ea77aa59e' (2024-09-20)
  → 'github:hyprwm/hyprwayland-scanner/90e87f7fcfcce4862826d60332cbc5e2f87e1f88' (2024-12-16)
• Updated input 'hyprland/nixpkgs':
    'github:NixOS/nixpkgs/5e4fbfb6b3de1aa2872b76d49fafc942626e2add' (2024-11-15)
  → 'github:NixOS/nixpkgs/3566ab7246670a43abd2ffa913cc62dad9cdf7d5' (2024-12-13)
• Updated input 'hyprland/pre-commit-hooks':
    'github:cachix/git-hooks.nix/3308484d1a443fc5bc92012435d79e80458fe43c' (2024-11-19)
  → 'github:cachix/git-hooks.nix/0bb4be58f21ff38fc3cdbd6c778eb67db97f0b99' (2024-12-16)
• Updated input 'hyprland/xdph':
    'github:hyprwm/xdg-desktop-portal-hyprland/8070f36deec723de71e7557441acb17e478204d3' (2024-11-15)
  → 'github:hyprwm/xdg-desktop-portal-hyprland/3e884d941ca819c1f2e50df8bdae0debded1ed87' (2024-12-17)
• Updated input 'nix-index-database':
    'github:nix-community/nix-index-database/f1e477a7dd11e27e7f98b646349cd66bbabf2fb8' (2024-12-08)
  → 'github:nix-community/nix-index-database/311d6cf3ad3f56cb051ffab1f480b2909b3f754d' (2024-12-15)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/bc27f0fde01ce4e1bfec1ab122d72b7380278e68' (2024-12-09)
  → 'github:nixos/nixpkgs/71a6392e367b08525ee710a93af2e80083b5b3e2' (2024-12-13)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/16242f93092dc6d28e36612410dfb3fc43258acd' (2024-12-12)
  → 'github:nix-community/nixpkgs-wayland/31b60284243f8b077894371f1ab3753dc26653c7' (2024-12-17)
• Updated input 'nixpkgs-wayland/lib-aggregate':
    'github:nix-community/lib-aggregate/f710791be27b31ea1ee9c40a94d08bcbba99b3c0' (2024-12-08)
  → 'github:nix-community/lib-aggregate/46bedda9e45f2735f41ec3c01cba2b8ce7ba9808' (2024-12-15)
• Updated input 'nixpkgs-wayland/lib-aggregate/nixpkgs-lib':
    'github:nix-community/nixpkgs.lib/f4dc9a6c02e5e14d91d158522f69f6ab4194eb5b' (2024-12-08)
  → 'github:nix-community/nixpkgs.lib/538697b664a64fade8ce628d01f35d1f1fd82d77' (2024-12-15)
• Updated input 'nixpkgs-wayland/nixpkgs':
    'github:nixos/nixpkgs/a73246e2eef4c6ed172979932bc80e1404ba2d56' (2024-12-09)
  → 'github:nixos/nixpkgs/3566ab7246670a43abd2ffa913cc62dad9cdf7d5' (2024-12-13)
• Updated input 'stable':
    'github:nixos/nixpkgs/7109b680d161993918b0a126f38bc39763e5a709' (2024-12-09)
  → 'github:nixos/nixpkgs/bcba2fbf6963bf6bed3a749f9f4cf5bff4adb96d' (2024-12-14)
• Updated input 'tsm':
    'github:daylinmorgan/tsm/478186507145ef130d4d3c67c28169c6c82b8ab9?dir=nix' (2024-11-14)
  → 'github:daylinmorgan/tsm/7a479425201ab3d3ff6c268f9bfdefa25eb0b531?dir=nix' (2024-12-13)
2024-12-18 00:48:46 +00:00
4 changed files with 39 additions and 38 deletions

View file

@ -279,11 +279,11 @@
"zig": "zig"
},
"locked": {
"lastModified": 1734645776,
"narHash": "sha256-vMqnVGZJDr79CNvDYmDkrgbC9+uJ4BgHub7F2rhzFDQ=",
"lastModified": 1734473861,
"narHash": "sha256-NP9E/8lMsHevtV3K3inojYGnLnumAkAROCeQoh9G6hc=",
"ref": "refs/heads/main",
"rev": "d6e76858164d52cff460fedc61ddf2e560912d71",
"revCount": 8331,
"rev": "34dca8149b6d096e02ab2767aca1b106a4ba87e1",
"revCount": 8319,
"type": "git",
"url": "ssh://git@github.com/ghostty-org/ghostty"
},
@ -388,11 +388,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1734639812,
"narHash": "sha256-OxrpnYxFcnh7m6oUeD1zJnqTizTBTsPYz6PjiU1/wuk=",
"lastModified": 1734456362,
"narHash": "sha256-vjAZEoZIZKGV/djEEBy3jj7GKcAXY2FuC5a4fB3fxOY=",
"ref": "refs/heads/main",
"rev": "71dc9f6128b8d2e382b2a574d2d5f15e2d907f3a",
"revCount": 5573,
"rev": "5f1df55fcb45a72e92258113685aa9064f6ebf3e",
"revCount": 5561,
"submodules": true,
"type": "git",
"url": "https://github.com/hyprwm/Hyprland/"
@ -867,11 +867,11 @@
"nixpkgs": "nixpkgs_6"
},
"locked": {
"lastModified": 1734535505,
"narHash": "sha256-D8wxgZaoW/SY70knIM+T8EBBn0UOyW/NaUGJf1qtMy4=",
"lastModified": 1734445283,
"narHash": "sha256-EUiA7xmVzzc8BpGNltmtimACsK9+rM6w12ts3lPemII=",
"owner": "nix-community",
"repo": "nixpkgs-wayland",
"rev": "13cd8a5a5c17fcee8d6398a7c0fcc78f4cc31535",
"rev": "31b60284243f8b077894371f1ab3753dc26653c7",
"type": "github"
},
"original": {
@ -914,11 +914,11 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1734435836,
"narHash": "sha256-kMBQ5PRiFLagltK0sH+08aiNt3zGERC2297iB6vrvlU=",
"lastModified": 1734126203,
"narHash": "sha256-0XovF7BYP50rTD2v4r55tR5MuBLet7q4xIz6Rgh3BBU=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "4989a246d7a390a859852baddb1013f825435cee",
"rev": "71a6392e367b08525ee710a93af2e80083b5b3e2",
"type": "github"
},
"original": {
@ -946,11 +946,11 @@
},
"nixpkgs_6": {
"locked": {
"lastModified": 1734424634,
"narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=",
"lastModified": 1734119587,
"narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33",
"rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5",
"type": "github"
},
"original": {
@ -1073,11 +1073,11 @@
]
},
"locked": {
"lastModified": 1734546875,
"narHash": "sha256-6OvJbqQ6qPpNw3CA+W8Myo5aaLhIJY/nNFDk3zMXLfM=",
"lastModified": 1733965552,
"narHash": "sha256-GZ4YtqkfyTjJFVCub5yAFWsHknG1nS/zfk7MuHht4Fs=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "ed091321f4dd88afc28b5b4456e0a15bd8374b4d",
"rev": "2d73fc6ac4eba4b9a83d3cb8275096fbb7ab4004",
"type": "github"
},
"original": {
@ -1088,11 +1088,11 @@
},
"stable": {
"locked": {
"lastModified": 1734529975,
"narHash": "sha256-ze3IJksru9dN0keqUxY0WNf8xrwfs8Ty/z9v/keyBbg=",
"lastModified": 1734202038,
"narHash": "sha256-LwcGIkORU8zfQ/8jAgptgPY8Zf9lGKB0vtNdQyEkaN8=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "72d11d40b9878a67c38f003c240c2d2e1811e72a",
"rev": "bcba2fbf6963bf6bed3a749f9f4cf5bff4adb96d",
"type": "github"
},
"original": {
@ -1223,11 +1223,11 @@
},
"locked": {
"dir": "nix",
"lastModified": 1734559324,
"narHash": "sha256-CaJT90NyTtH15vE1aZi6+3DhTGgc0EygRJyx4QTo0IQ=",
"lastModified": 1734113352,
"narHash": "sha256-ltxdCp+lfVew6qy6302xVbd2O4XzMFPeSVJ7QLJEETU=",
"owner": "daylinmorgan",
"repo": "tsm",
"rev": "3aa9fb9490426c1d60b93c888026a7a67cb53046",
"rev": "7a479425201ab3d3ff6c268f9bfdefa25eb0b531",
"type": "github"
},
"original": {

View file

@ -1,5 +1,5 @@
restic-othalan: ENC[AES256_GCM,data:HNIya1Rp,iv:8QkDewpXoy+3ahuuaCN/HfbGOgfQQ0Ud5emD7zVPE2s=,tag:bDfumEnt20lun5hnLY+eVA==,type:str]
mullvad-userpass: ENC[AES256_GCM,data:3s26AccrDptHlJBxHbB+j0M/lw==,iv:Qw0zlI1542rZxoQyIrqEs3G8fYEgmJVTv+DxXwmzBBA=,tag:S3+3RmWC9XFsLfOrvRcQhg==,type:str]
mullvad-userpass: ENC[AES256_GCM,data:2gwF8GvnBLDogBb+ePNqnw==,iv:luAfk7C41UKZ6H+TidfIUylP9cDt77HHRl7RgfhU3Xk=,tag:LoqZ2iiaxBd97F7PPO5K/Q==,type:str]
mullvad_ca.crt: ENC[AES256_GCM,data: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,iv:2SPtErk/uh5/RTQpdXEZaHEOkzmHPmJ+y2ICPouJXOg=,tag:8KnPW4MLWgoPMsy2ji4tDg==,type:str]
sops:
kms: []
@ -25,8 +25,8 @@ sops:
Sng0U242THBSZ005MjJ4d0syT2RBNWMK8+a7qrx0l2T5qAqqrRpH0BTAsSlST5/O
HXvwlTZ3m/RITWVPfh9rr2tCYKZYA6a+afjVeQYs+FvGlTCuE1LmUA==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2024-12-17T21:15:47Z"
mac: ENC[AES256_GCM,data:bCmak+PMy6o8XA/GNL2zqK1Allke7Nd+uZxwwLZgldelYMNPfIWtN8ppr87+aP9ObnKDlmuopQ7aRST970NeTod2/24XMVJ4DoPDXCYClc+BPswii/4fkXb3O2Ehh8qz2m0JtnGDN23Hu300ztmmJWJM9CQyHK/EHY/JvGy2xZQ=,iv:9CTFnsMabC70/Z0mgeCLu4xCP5XA2pi5xVrjczSLdPw=,tag:fLqA2F8EpapkmZstrFF3bw==,type:str]
lastmodified: "2024-11-29T04:55:36Z"
mac: ENC[AES256_GCM,data:1gw1iRbSg5iXAAuo1o3Q1bQWfkB4wHs9WfzK2MRKkzBtvZCxbPW4K1r/19mmpjYm45SRw0EH7gj0w5fZX6iAQPkcNR1zXEpM8mt9I0Yrj6Ifhg11nuU5q+mUAvyi/yYc3xDSD1vU+jWcxa33kz500xREHJmGvbBePIoJn4Niljw=,iv:N6LasEb4EgS4ZMNVW29THHA65sBwJ0yoG27rsIkQAgE=,tag:zR8TKReatGctpNhtYUe1mA==,type:str]
pgp: []
unencrypted_suffix: _unencrypted
version: 3.9.2
version: 3.9.1

View file

@ -13,9 +13,9 @@ mkOizysModule config "vpn" {
];
services.openvpn.servers = {
mullvad-us-atl = {
mullvad-chi = {
config = ''
config ${./mullvad_us_atl.conf}
config ${./mullvad_us_chi.conf}
auth-user-pass ${config.sops.secrets.mullvad-userpass.path}
ca ${config.sops.secrets."mullvad_ca.crt".path}
'';

View file

@ -13,12 +13,13 @@ rcvbuf 524288
cipher AES-256-GCM
tls-cipher TLS-DHE-RSA-WITH-AES-256-GCM-SHA384
proto udp
# auth-user-pass mullvad_userpass.txt
# ca mullvad_ca.crt
#auth-user-pass mullvad_userpass.txt
#ca mullvad_ca.crt
script-security 2
# up /etc/openvpn/update-resolv-conf
# down /etc/openvpn/update-resolv-conf
#up update-resolv-conf
#down update-resolv-conf
fast-io
remote-random
remote 45.134.140.156 1301 # us-atl-ovpn-001
remote 45.134.140.169 1301 # us-atl-ovpn-002
remote 68.235.43.34 1195 # us-chi-ovpn-001
remote 68.235.43.98 1195 # us-chi-ovpn-003
remote 68.235.43.66 1195 # us-chi-ovpn-002