From 10508b9916d6b3d810c1d409254cff9de43a63fa Mon Sep 17 00:00:00 2001 From: Menno van Leeuwen Date: Fri, 11 Jul 2025 00:17:52 +0000 Subject: [PATCH] updated nix to 25.05 and fixed setup.sh Signed-off-by: Menno van Leeuwen --- config/ansible/tasks/global/global.yml | 9 +-- config/ansible/tasks/global/utils.yml | 3 + .../ansible/tasks/global/utils/helloworld.go | 7 --- config/ansible/tasks/servers/juicefs.yml | 1 + config/ansible/tasks/servers/server.yml | 30 +++++++++ .../tasks/servers/services/services.yml | 2 +- config/ansible/templates/juicefs.service.j2 | 2 +- config/home-manager/flake.lock | 22 +++---- config/home-manager/flake.nix | 4 +- config/home-manager/home.nix | 2 +- .../home-manager/packages/common/packages.nix | 2 +- secrets/ssh_config/dev.conf.gpg | 12 ++-- secrets/ssh_config/personal.conf.gpg | 20 +++--- secrets/ssh_config/prod.conf.gpg | 14 ++--- secrets/ssh_keys/mennos-2025.pem.gpg | 22 +++---- secrets/ssh_keys/mennos-2025.pub.gpg | 10 +-- secrets/transip-discountoffice.pem.gpg | 62 +++++++++---------- secrets/wireguard/work.wg0.conf.gpg | 18 +++--- secrets/yubico/u2f.personal.keys.gpg | 14 ++--- secrets/yubico/u2f.work.keys.gpg | 20 +++--- setup.sh | 4 +- 21 files changed, 154 insertions(+), 126 deletions(-) delete mode 100644 config/ansible/tasks/global/utils/helloworld.go diff --git a/config/ansible/tasks/global/global.yml b/config/ansible/tasks/global/global.yml index f4df357..dc862af 100644 --- a/config/ansible/tasks/global/global.yml +++ b/config/ansible/tasks/global/global.yml @@ -27,10 +27,6 @@ ansible.builtin.import_tasks: tasks/global/openssh-server.yml become: true -- name: Include Utils tasks - ansible.builtin.import_tasks: tasks/global/utils.yml - become: true - - name: Ensure common packages are installed ansible.builtin.package: name: @@ -45,6 +41,7 @@ - python3-venv - pylint - black + - pipx # Package manager wrapper - nala # Go @@ -52,6 +49,10 @@ state: present become: true +- name: Include Utils tasks + ansible.builtin.import_tasks: tasks/global/utils.yml + become: true + - name: Ensure ~/.hushlogin exists ansible.builtin.stat: path: ~/.hushlogin diff --git a/config/ansible/tasks/global/utils.yml b/config/ansible/tasks/global/utils.yml index d6f1558..004c946 100644 --- a/config/ansible/tasks/global/utils.yml +++ b/config/ansible/tasks/global/utils.yml @@ -2,18 +2,21 @@ - name: Load DOTFILES_PATH environment variable ansible.builtin.set_fact: dotfiles_path: "{{ lookup('env', 'DOTFILES_PATH') }}" + become: false - name: Ensure ~/.local/bin exists ansible.builtin.file: path: "{{ ansible_env.HOME }}/.local/bin" state: directory mode: "0755" + become: false - name: Scan utils folder and create symlinks in ~/.local/bin ansible.builtin.find: paths: "{{ dotfiles_path }}/config/ansible/tasks/global/utils" file_type: file register: utils_files + become: false - name: Create symlinks for utils scripts ansible.builtin.file: diff --git a/config/ansible/tasks/global/utils/helloworld.go b/config/ansible/tasks/global/utils/helloworld.go deleted file mode 100644 index a3dd973..0000000 --- a/config/ansible/tasks/global/utils/helloworld.go +++ /dev/null @@ -1,7 +0,0 @@ -package main - -import "fmt" - -func main() { - fmt.Println("Hello, World!") -} diff --git a/config/ansible/tasks/servers/juicefs.yml b/config/ansible/tasks/servers/juicefs.yml index de42c1f..561a64b 100644 --- a/config/ansible/tasks/servers/juicefs.yml +++ b/config/ansible/tasks/servers/juicefs.yml @@ -68,6 +68,7 @@ - name: Include JuiceFS Redis tasks ansible.builtin.include_tasks: services/redis/redis.yml + when: inventory_hostname == 'mennos-cloud-server' - name: Enable and start JuiceFS service ansible.builtin.systemd: diff --git a/config/ansible/tasks/servers/server.yml b/config/ansible/tasks/servers/server.yml index 3d32718..5113398 100644 --- a/config/ansible/tasks/servers/server.yml +++ b/config/ansible/tasks/servers/server.yml @@ -17,31 +17,61 @@ services: - name: caddy enabled: true + hosts: + - mennos-cloud-server - name: karakeep enabled: true + hosts: + - mennos-cloud-server - name: golink enabled: true + hosts: + - mennos-cloud-server - name: immich enabled: true + hosts: + - mennos-cloud-server - name: gitea enabled: true + hosts: + - mennos-cloud-server - name: jellyfin enabled: true + hosts: + - mennos-cloud-server - name: seafile enabled: true + hosts: + - mennos-cloud-server - name: uptime-kuma enabled: true + hosts: + - mennos-cloud-server - name: factorio enabled: true + hosts: + - mennos-cloud-server - name: dozzle enabled: true + hosts: + - mennos-cloud-server - name: beszel enabled: true + hosts: + - mennos-cloud-server - name: downloaders enabled: true + hosts: + - mennos-cloud-server - name: wireguard enabled: true + hosts: + - mennos-cloud-server - name: echoip enabled: true + hosts: + - mennos-cloud-server - name: arr-stack enabled: false + hosts: + - mennos-cloud-server diff --git a/config/ansible/tasks/servers/services/services.yml b/config/ansible/tasks/servers/services/services.yml index 7033420..78ca815 100644 --- a/config/ansible/tasks/servers/services/services.yml +++ b/config/ansible/tasks/servers/services/services.yml @@ -5,7 +5,7 @@ - name: Include service tasks ansible.builtin.include_tasks: "{{ item.name }}/{{ item.name }}.yml" loop: "{{ services }}" - when: item.enabled|bool + when: item.enabled|bool and (inventory_hostname in item.hosts) loop_control: label: "{{ item.name }}" tags: diff --git a/config/ansible/templates/juicefs.service.j2 b/config/ansible/templates/juicefs.service.j2 index 4bb11d3..9901907 100644 --- a/config/ansible/templates/juicefs.service.j2 +++ b/config/ansible/templates/juicefs.service.j2 @@ -5,7 +5,7 @@ Before=docker.service [Service] Type=simple -ExecStart=/usr/local/bin/juicefs mount redis://:{{ redis_password }}@localhost:6379/0 /mnt/object_storage \ +ExecStart=/usr/local/bin/juicefs mount redis://:{{ redis_password }}@mennos-cloud-server:6379/0 /mnt/object_storage \ --cache-dir=/var/jfsCache \ --buffer-size=4096 \ --prefetch=16 \ diff --git a/config/home-manager/flake.lock b/config/home-manager/flake.lock index f717b29..60c0109 100644 --- a/config/home-manager/flake.lock +++ b/config/home-manager/flake.lock @@ -7,43 +7,43 @@ ] }, "locked": { - "lastModified": 1747688870, - "narHash": "sha256-ypL9WAZfmJr5V70jEVzqGjjQzF0uCkz+AFQF7n9NmNc=", + "lastModified": 1752175309, + "narHash": "sha256-g/f7sW8EH5qRRJF95+hwWj+AzOMlw4zs04Ei5DWSRlU=", "owner": "nix-community", "repo": "home-manager", - "rev": "d5f1f641b289553927b3801580598d200a501863", + "rev": "524da5f6c0bf11bb0d5590046276423a28b9453e", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.11", + "ref": "release-25.05", "repo": "home-manager", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1750151854, - "narHash": "sha256-3za+1J9FifMetO7E/kwgyW+dp+8pPBNlWKfcBovnn6M=", + "lastModified": 1751943650, + "narHash": "sha256-7orTnNqkGGru8Je6Un6mq1T8YVVU/O5kyW4+f9C1mZQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ad5c70bcc5cc5178205161b7a7d61a6e80f6d244", + "rev": "88983d4b665fb491861005137ce2b11a9f89f203", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.11", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1750134718, - "narHash": "sha256-v263g4GbxXv87hMXMCpjkIxd/viIF7p3JpJrwgKdNiI=", + "lastModified": 1751984180, + "narHash": "sha256-LwWRsENAZJKUdD3SpLluwDmdXY9F45ZEgCb0X+xgOL0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9e83b64f727c88a7711a2c463a7b16eedb69a84c", + "rev": "9807714d6944a957c2e036f84b0ff8caf9930bc0", "type": "github" }, "original": { diff --git a/config/home-manager/flake.nix b/config/home-manager/flake.nix index d74ca01..b4927cc 100644 --- a/config/home-manager/flake.nix +++ b/config/home-manager/flake.nix @@ -2,11 +2,11 @@ description = "menno's dotfiles"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; home-manager = { - url = "github:nix-community/home-manager/release-24.11"; + url = "github:nix-community/home-manager/release-25.05"; inputs.nixpkgs.follows = "nixpkgs"; }; }; diff --git a/config/home-manager/home.nix b/config/home-manager/home.nix index a87e839..5d2aff3 100644 --- a/config/home-manager/home.nix +++ b/config/home-manager/home.nix @@ -30,7 +30,7 @@ home = { username = "menno"; homeDirectory = "/home/menno"; - stateVersion = "24.11"; + stateVersion = "25.05"; sessionVariables = { PATH = "${config.home.homeDirectory}/go/bin:$PATH"; }; diff --git a/config/home-manager/packages/common/packages.nix b/config/home-manager/packages/common/packages.nix index 35fd63d..c0830e6 100644 --- a/config/home-manager/packages/common/packages.nix +++ b/config/home-manager/packages/common/packages.nix @@ -69,7 +69,7 @@ choose # Modern cut jq # JSON processor yq # YAML processor - xsv # CSV processor + xan # CSV processor (xsv is no longer maintained) ncdu # Disk usage analyzer # System monitoring and process management diff --git a/secrets/ssh_config/dev.conf.gpg b/secrets/ssh_config/dev.conf.gpg index 62cca1e..2f76d0d 100644 --- a/secrets/ssh_config/dev.conf.gpg +++ b/secrets/ssh_config/dev.conf.gpg @@ -1,9 +1,9 @@ -----BEGIN PGP MESSAGE----- -jA0ECQMIkykGu3qZJRr/0sARAbGCAuB8sou+PWCSpaKloliLGKHByVg8tsXUMKzK -FDUv9HgOfzGVwMXyRznD3iWm/ikCi4YZmX6YOeXGzg0loWT8xqhgL66Q24fZ5cu1 -PilvJ7CfFYxr62Ku9iC3SRy10cL32iinF4V/HRx1uO2LDsUpmJVdbjDGo1/tYYgs -X+z/FIhhE1NOLXgCB2BN9k4sqYgmW33ddtkUi+V/njAaQcNH6/0Jk8bw+toriIJY -9/F7oUBl3hYkXvhDWzcCT2EHYC0VN7fwIXrUCYAwXWX0Nks= -=9V4e +jA0ECQMI3XfE3Qqkt0r/0sAQAVx2bwXdRLINBTGf80YU5AJ1tiO4fGpImCad4wz5 +K9y6rU9l+2hoJCHwf9QXg06dmpwHGWk+UzXQtcZatWIoDp6lQIUKn+AM9E7TE+p7 +XsO6Uk3xicSqRcoiwkgjNjkDl8KibCW1kN1tBk3xi3rYqo00rwI5nI0nfiNAyEmy +Mc+JqbRb+AmMiJQCtUPsH5NE5gNLWwjSBZsIwanPxZr2NuGvRAHk9f37m+rT4i08 +K0OJ6kV1EhycZAKHNq2pfLVk8h68kBXq+rrP5HrVHDtn9w== +=G6/v -----END PGP MESSAGE----- diff --git a/secrets/ssh_config/personal.conf.gpg b/secrets/ssh_config/personal.conf.gpg index c4f4640..14e60d1 100644 --- a/secrets/ssh_config/personal.conf.gpg +++ b/secrets/ssh_config/personal.conf.gpg @@ -1,13 +1,13 @@ -----BEGIN PGP MESSAGE----- -jA0ECQMIoYDi7gX56AH/0sDGAR9lknep3lba3qW1v/uYsxSDdYDtmX6zlqxOj28O -Wzsn56j22wVE1X+DCsRTTAz0gmr5qBfP1qDR/kHCdks4Rrzcc/gaufDOzhcc6li2 -PCdRIjNf1b+Rg20GDPWttYHYtytxHr+s9p9qyaV5JWqNqOeHU9B1MaAHkcB61oMp -b3hiy3/M398vfbloKw+mBMUYiP6DRopRUCjwKcexvljMYBLw84fHuRU6hF2X/3W6 -yvtIXYxdNjp0IVmM3003gPilWNezcpVRT4iQ8I6TKISiYajCD/ayow4O/M0lsL0g -/AhureIfNo41gylw0bIoRrO82KKzyW2foI2MQBDEi9pYRpgZIoncu26CR9/zCCfw -GMGB+3Uw6kYzVhjKM1zmsFhmc6VWMltS52Vbio6xiLhGH7tRl7rTY5aiSwvtaVWB -0ZtAjJOUxqmCzrmiarT84v8EzVZuyBZ2nGmW8nkZFCU3trJi5HxPq4ya7g6cdiz2 -yyYlMT3fGGhtgno2cvuegW00NkSsTwaW -=gk8Q +jA0ECQMIYS1QEcQEzlT/0sDQAXX2nSMD59FG9gycY8OfEKV5TI9/AfHzllgBvEGB +tPdVBFEQwEtysH+XcXgfJABmzZkkY27CPv0k1NNit5i5+QAyr13NZPItdAWHJikZ +vljjT3pC2qmIbdaV51nN2xjz1Tmj0D2PD+N9Hnf+Rq9b+6muoWGqHjS2v3QSd102 +o+Wte4Tm6bg7sqzzCY9lcNRXz4uiIbCG4CI9AHL8WFigz/yHmmTySiBlRww5We6C +rPjYUl4e7y5BZm/mZhS4+m57JaAFobiEnWtbiruNm/AY/bhld9+qEe0sZwMv2ynj +THQbT/RWLWR9wBH9uR82Zo9MX6zQEfSC1dd4Ih0LXKMWhpPEOWc00+9xhKxS5er/ +F5kDUfMKr7jXUiqaTaFQAGIazPZTWPVmgZluqwZtmvN66KCjypcltpHtoj87IclI +1nG1hVPYYJNnjDQhf9CvNUs9E8JdnM8jsl3xCMiTtvn3LH1dScfGGB3HZY0m8F7Q +LiM5UybEXFM8elokQNubSwuDRRLFh5nCQ+bX765H1sHAHA== +=8Ty9 -----END PGP MESSAGE----- diff --git a/secrets/ssh_config/prod.conf.gpg b/secrets/ssh_config/prod.conf.gpg index 7de7dee..9c033a8 100644 --- a/secrets/ssh_config/prod.conf.gpg +++ b/secrets/ssh_config/prod.conf.gpg @@ -1,10 +1,10 @@ -----BEGIN PGP MESSAGE----- -jA0ECQMIZdwcS80hM57/0sAsARQWk+Wy0/WBjLKSEQEEH4ny1P7NoyDhWCSiKsG8 -Uhe0KrEe2I8e5mCPzhFVYTfKqdZHdjLNa9vAj9FZLww6HilAa6KHvki+6++LW0nU -t1y+KWO/l8JyL1pwBLvTQoMEByJ2PbupUBglRvaQmllpnIsahlVXy93iJuC/bB/b -IwsATpbg3/eUTjtHXGja9uyWArZQ+kcHavBaC2YaDui/7OqsZvCQRk7oTNFxAglP -UHjEbu4lY0Ntr1tRcRzzlCHjPpJOP8WkbzOzyjZ13xXtJ/lw3NC3yBQIY2+mumit -mF//S3yRdSH2KgtkhLw= -=mJLc +jA0ECQMIS3UdJJLH7/P/0sArAbM4Zqcv/762tMMCR9CCWDaIWIJ5+qcOIE9AaFT6 +6mxxGjGrKzyDSF4YG7xYeBI9jc50j0K7civE30EeQBQ7W6z62L/DOIuviiUru4fF +b0Y/jwwV8hIDrhOcbnAGyZePdd242iicc045ecNPBMhQ37Qfwd4KpCGeN0r1jeWI +654lNSEGQToUibvPJTdjPSrz/80WAgg3a2IZc0Q2WI+TptEN2jQoDt9l9T/SHIje +88dhG7t9o94HjemmCtD3kOYUzfvKKfhy8qL2y4ndD2F5dzqujAU91Wm9aZfeNXco +Y9B90IIf5FtIm9tUKA== +=M9cZ -----END PGP MESSAGE----- diff --git a/secrets/ssh_keys/mennos-2025.pem.gpg b/secrets/ssh_keys/mennos-2025.pem.gpg index ac6df0c..f914476 100644 --- a/secrets/ssh_keys/mennos-2025.pem.gpg +++ b/secrets/ssh_keys/mennos-2025.pem.gpg @@ -1,14 +1,14 @@ -----BEGIN PGP MESSAGE----- -jA0ECQMI7o++qCHU40L/0sDsAYN0bt93G/ceYFtCUI6R/DEvMB9GSzISN2pi5XbB -ll5Ghz5EsbgShG1mFbWsvWki0b8K+v4OEhXXxJjskBimLW4zJphfS/LWJqPoU4sY -gpZNrjF2+BnmzZ8R3JQmWhXaACddZECgYUGjGrCrs3OW256cQcP7hnrUqDtRYR7a -lA9xIKGJEu5Bx2SjezOIIHjCSEwpNcQWnCpsCFMzst/Wa+1yRHthdg+QRWtyrYzD -qqSbNSJEfJaBtmcXNwjzLUVMhaGQgca+bhfEo9j1Ma/C3su0i/r/6LoeDAHjWnqB -UIqf7h6CGoVL+K3IqfoZtXi9EsnJLDd9CvfaK7/uJkNoIVQEHu+oFaxuHIjH6E4M -NTJo99mZVEqY7r4pBeyJ0mdmaOTuC/JNwL5ticAVWAUOzdI4f20lgdI3Gtab4bIh -eEM6T0+LmjIaLRZ3urL9RacV2T4O4s2f01Yltyuh1zpxcYFCJkGTl7N1VVb9ZjyY -SwFeNO7ucd7WSwRc05EXveSETjffa9YFANyMF4pkUzHhk4mtlM4yWIYrgcl5i0Mt -6ba0fxRKwAzSJrnl3Fs= -=Ugjj +jA0ECQMI552H37TRBAb/0sDqAXEjXr4FQoiibIvZJnQrjipoIK0WKbAUqSSGkpGJ +m3yy6Mh8WRH8tCu6Q3HV9FR4BhP0QkgmcXCk6fgsRft+qW7lWmS4urfScDTyifd3 +L+rNRxQPE1RE2NntIL5dnOkU5uHQv87sWo+G9ffoY8zy0ConxFItzzbVj/wwu9Yr +ZVeHCvZMuKMzcfMnCIVPxJ1Fy0iwN9BjPw1ykASM7ZFBl/RMzqp89gnByDu25Xnq +aAda9jjW31Ly3B+Lb3lZKTnA1mTFIPhgXo/e7Q4u4em18biGShCB5CcV0/H6pNii +uODLAFSlTceloz34pFxfRRtfEJ7bk+4tRtG717KxWKsGktHGGIaISlMa4Oh6O9gx +zGeytZOFE3AlJmGhVDy16RpN6QRGUHjaygx7/EQ23t6ELeUi7KxgXZw3bv+n2FVG +g9Mz56qbA8bmLBC+7DFmlme38cg8t7t7d22oSDG5eaWDFh/K0IK/iks9uH/Yq7xM +7i8l8TWUhnrMw+VxPnUs2cviKwSByru/UgOQ9fpLotEGo5fougdICOlHKZfcdS5+ +MmAGJ+J46mxQm6Na +=+p8L -----END PGP MESSAGE----- diff --git a/secrets/ssh_keys/mennos-2025.pub.gpg b/secrets/ssh_keys/mennos-2025.pub.gpg index 5292c37..eff54fe 100644 --- a/secrets/ssh_keys/mennos-2025.pub.gpg +++ b/secrets/ssh_keys/mennos-2025.pub.gpg @@ -1,8 +1,8 @@ -----BEGIN PGP MESSAGE----- -jA0ECQMIiiOoV7V1Baj/0p0BN0vbH+0DDxppbEvuRu1GSmFq+5ImE+2MqcHf8nn7 -N+r6EkidkZFHpoQxy8Dy7uf5UpfamfxGP/OvFOPLIMNAvAkz8dYHihBQyWnNdgcV -c9QSOV2CDd2zElkRyJsdr4mf9YJFO6s70PjjKJXtd9stTQpo7VUDNfjCRpmBNATl -qqONDGtohquBhBbAQn9/3cJ3ueUfuVdeJr2Omy1g -=Ep+K +jA0ECQMIdfWQMldX4v3/0p0B/9DHZ452kh/ofRO2mYobq97VZZmm2yK+EGK6eoIA +rH7LsRt12iMtlCCwPxiwTQtuiQCEbIwpYKFk3+7dW3NlXjbP09H+YTR46yJwJNDF +9YdC9eERU18e4ut8+F3pJIKS84GmDuw7CBAaTQcdI2NbF0HP1yPACquPe+ZZsgcI +l8/yMhjcCwducCWHtQDmikx43MWsz4GN+hbKwhsk +=OG1d -----END PGP MESSAGE----- diff --git a/secrets/transip-discountoffice.pem.gpg b/secrets/transip-discountoffice.pem.gpg index e4add08..15070a1 100644 --- a/secrets/transip-discountoffice.pem.gpg +++ b/secrets/transip-discountoffice.pem.gpg @@ -1,34 +1,34 @@ -----BEGIN PGP MESSAGE----- -jA0ECQMIBBgcWvSGPT3/0uoBlYW70t2tacrg5ryzWSV/O0t5G99SUhqf0EiXYuez -0neGiEANjXqys/9LtqFjtzGOmeoji/RItg59NfZbvX6t61GrDnpWL0CptXZCXmqc -A9dZc4Yayr1XwIH2ujJpuPmCeHSdlq1tiWYiupMP547L94SHQ/nLzwoTM1troD7U -F2MaKH/B4uyfTThFb1+wBxWAOXV2o1OJLJanj4HugoUw3GNtAG5pPecCZKwcKJ// -ufHWSCJXDUo7ae8TK9fZ5qGmFKuPOMP5AjQq1BJhAfLwszRaFnu2DVdIn1jTmGqF -7Fa7sBop/ol0/7Ri5tjhr9XuUfoC/IGB+FQ2vcJG7HSfW+yneQrdobQWAVhPwp2g -J66aJgmw55ttXTEG+jvedVfVkoAHkXhk6gYkU5rqIM1tZDZYI9uQ8sSbORTvGGZi -UazxwBGA+g8k9UlEOrb9duhbTDOk4WXq04xrJkNYMH1GQ85snWgYwsKG2MCz5x0Y -duDsUuymq4DB1DVJ6T6bIaIp2hXPlMhoPQYrNeVwPPHkH72W6+zQ5r/HGUKUtOK9 -iH4iQwDE+//bMcxeDtlMBWEeqqxQsEaQo/raYeMzz4fBVpanNohBQMsp0IuhztsA -QxNpBduAB7or0CNEIMt913lPPAtZy9acTjqPIl9IhGlmGwplJylxrc08eFZN6/nJ -waMjexeDwJbeObJdhRctOqxQagDl4GsndaAMVBE7xMtpjUWBo+6tvtja4V7Owi1R -B1ipG4L4VtZXWDL5UoxBQ4ZcWqm5KP5ohs6/HwtBg3HbAyA1jerPReFIks9rN1s0 -uIW8GEu+j60PRWRQv5j/nmedtMfRpPdei0xIPo7wvk64MSKtxIE/IU5hifUyeEgL -Bz2bkbI01Z/iZQtsRkEDjybTevwJLIspk/P7sS+Q5+DmK3fR2y+Stch9Cam34KuW -CgyLGyVt1/gpJQuGGHPirHWnyoq5qZ//Td85+tsPbVRtGcFCuAkGfQqFnL2tV/Rw -62nku7DwDcjgJZGHFijaXfrrhPN+Hy8Lpgms8KRwvV+PZ/HTGU9PK4KvCLGcBl65 -SG2QS6RCbb3Gf7PhwK/uEhPxx4EBbKdiHTmjOHSf7wIw+bkpVpXORydfgiBQ/MHD -4x3D5DvmxhY09qIkDsaQcX11d0mSml4RQXpWM/1oxJygygCwco6FWPWxiMvBz9c0 -hHnTH2nz8m0eLC8jjiV9H59wN6hOUOYpZilAfq1oMRvlQ/MM6GMyBpnSu0Vy2pAN -nnhjDEIMYEqb0SS2d7x9UUuBJRuVgkGTwYmXVGbxW9lM35GkRA3fPhOzLhXr+ZwJ -ykhkNO1r+pcELEhmVAuNvEIM5DXkL7UK6bM9s/W0ks+wwK7Ld40uymGQ/cKpbVhc -3VLpx/rFbaXduNLkGj/dyCRwkk21I90vfedO045bKv6IRl77B5GHul33NqAMlWe5 -5jBhu7tT+F1qqfSFf813qCluTLTLcTqiCs7sSGrfNrU0bZ3QwnW+Txh20Jo59sLz -JAIEJewdDZYu/7ZnvvaZ1esmOmHDC/iqBapYJvqMJN0cwH/Ug+TuvF2uzH1KsUnt -KbbBSx7ftLu2xGU0vP4aeRRDOshRWUXpArLMIKHiAWNGfnVtRLrUHS6p53ANyAR3 -YrUU74PrCo//py797uaKHjaMEUXqcmmSFsN3n/0eqWARqGghoasnMKqg6APA/xaJ -Lo4osLsK0YRawthkRWa+Xd27Ee+YhUcIboe5n8oNm5MME1Wu4zOmdLUkCFrIZBnM -xlG7N7ba3gOk29ItSvTXmk9bguEH2CFTPbTuD8JIKwPDK1y0MwnhQ6xhSBaOYAOB -6Wy3YjZH1Ep+zeNfFX/peDw= -=ky7Q +jA0ECQMIphgrieTk+8X/0uoBNZVbDO1IExp2PKBulcirMNK31fqTgEoa15IEWc1K +kQD7d38xyWCeTiHmaluxSy0jNbeaNJFS9T3mm58d44yu70yRiiRDW2iixYa6LJAO +wBP/LQC2q8vpyM24qJFghkXRDLZe3F+90tbQg/puFCDc/YjNkDjZU3xCiuzEf47V +0ATrPBc9U4r2vUndMWsFwVf5v7OYzmbMVna/YmAYPlohu5Bpla1AAWr2flXo6g36 +WqecrZJo84ao/SIc0mCx4jdAbOWK7tKqgdbkKvhjOPpEhSs0RFu3LnNVFiHQWkPB +BE3NjlGIf6oUpFarIF6MJ6bLmtNx9zF1N/HPj9rAhG6/c2tAX9KPGF/lzcfYIgZq +D1cp5vVkYhB/hOs+ovQYgyJE28KA3IFYfRGBzgVoVbyuAyqQnb03a/IpKileR/cM +g1G3nx728y443WUyTdRtgEVJ4Ei19rDy0HNv+tYRIRVsQnaMixOv0n+i4B2QZWKg ++kM8KUZhR4jvWPvHV4s5rXPFWmkUsge2nyPr3dmLrmn41+/EEpJGw2C65t1j/M2q +Ft5uOc15pNEXF2OK0V38pJspN3ODkWMQw7UM96rOZ0hvS6aEr3HnuGPtXYc1cGiq +oxMpj5o3gi6g6KSAW32K94qdLR6/pHJ07FRS0Z1wExFQv7845x1FddocDxNMyQbE ++TQSbiPLZKXt9Xs2jWuiWToyPQCh6SFSHxcs24zFBh5ei4Lui7CivAlZYRlHAYze +AppZTN1URcM1l9sx8+P9lynItArbpsveqyFTuNDGhFWMPHRbr7Z+n9O7kSjWYarO +NMVZTtBnXHPtnU/02PtohBkhFB3M5VsPDMkA7IP95mDPBSRrn851Zx57NI4nZ9Hg +rzihi9EMiiPetswVorKRre3XLklYO1UGWj1rRqQIbClI6WtfSJmVNe1FFt5wZJvV +qc38qKKxFauizGkZwJRy6/tH2v4ZtRH8KMpCaQoneK5fIL5rvTzo2TrQ54gYCi6e +3Ha++eYh2trL+bJYp4e5QAELgTFRydEJdJHQxoKabG4ixOuGuoMYYLU/EQSJqNlL +7GbYGAN7WesVQyh67lhCK2Vzq7JUAmCDAzreGaYDdey6jJyT6SqIadTdvBkZu1Wc +CRJxUXQ8bc9PpJ3h2wfAo3ue9Wm3N3cxELq6yAIm9sOD7rjuEKFdazneEkHtVLTT +VDMOrBolK0U7Mzp4DQgUpuYsO3hHuoyyEWVLpY+at9vAsifnKpadsGGjrTljApqj +z15vv57WyX+hcVdML21H8mGepbHSGCr1NddhUv77hcmWJVfagIUWO2ZwwvkRfcib +Gx6Ux1UwqOIei88bWr0Yf+S8//HyUpzip2CygICI7Ia/wKiyRZ+dnXPaW1j91cXM +z4fEeLRgG4y2BT8ZLtQCawDIzm7Qbg1TjRJWTZw+JlswX258WSSgCmmED5/0FuuV +io0h5rbhaVyzDQd0HAYM23fuaaxa/79eeduJJpJ6RtMx13Kp8YWb2EZe5wccS4BH +VjndRCMAzF4f9fRx+AQrh+zLGYOBC+M7YqjbH50W2cGhSYhuaWugybFgnbObeUmU +CD/80zduvznW6g+qGYkm4Nzcgf2HwTNKbF4uA0Gsscu6szOel189QA189dvZLF66 +OgKrwW4E2tWHXqcyGViSHWU6HAX1rAZvN1KTy9ctpT6ct1joA5dcM01DX8jcokXi +f85UjUCaOhYARwkU6TLOXU6C7bTozjERNwsypt+sQVFPPFB6fTQkwPNbD8qS/TQB +ll7BlEaC2CfC0LbQqnjIkQ1p+oYGvC0/X+sAv2QNgMrpV5s3KwT1T9QqvubeJ17g +0lmMIEDP0++T9dU= +=1c5F -----END PGP MESSAGE----- diff --git a/secrets/wireguard/work.wg0.conf.gpg b/secrets/wireguard/work.wg0.conf.gpg index 2847838..8afb34a 100644 --- a/secrets/wireguard/work.wg0.conf.gpg +++ b/secrets/wireguard/work.wg0.conf.gpg @@ -1,12 +1,12 @@ -----BEGIN PGP MESSAGE----- -jA0ECQMIHn8cI/5lQ/X/0sCWAVktrqgI2rFaoVa8WBwvrtTKcJSyZQRSN3yeDSwf -vYCPf5reM4L078Jcr8teG21BrzT8SpaMcVE/kNiy7nyrS+4piB9lICuFeXEUHOU9 -r2E/xyeNKP3RY6sVay2c4s0QyNOnosa2iNwTGGEtZNimxV2IcEB9kI2mVKNDkm/p -rmFF9/HtOu7KNBj7mtIwqez82heZnaQXd8PWadaO4f3qenuNPDltjcgHi0dApAY9 -4TR9h2fAqiQ8QjZanRKtvnsFT+/fytL+q364oxg4UiiZ6jvXtVCzF3nFjN4CiAaK -/LYfzV7wOnxgK/zg+wH/wZRZb5Y1w8gYKeLbG1joiSNjnVgmJaBSngV5DYWhNoxu -pknE+ryxGAMPJxIA6x3ZZ/XbOVIF63BIfb1nEsoTH1nEqQjw4LHYNoaodyVEptq0 -C2PYnKDEkMBbMxRWj4buDspQghYlOC4y -=RaOd +jA0ECQMINhVMB5bJU2v/0sCUAd22Gs1svmVsc3JLiH/uB7wOoW1tQdWdlznfGkft +wmuOUyZ92LO9PkQ5x6i2BgBOLszNTVbjGaH8hYhGHdSG+LKXX42TQT+E+m9PdHTW +FbeFd1hPvsfWvKAzTpPK3kv49erYnX4qd2nwx8jg9RJ1u8m8Y+1kvxAtBqEK0jlE +SUfEjT4pJVahprzl3bZgTyW03fZgoNGvAl1mpz3m0ni4Q3/C7N+IBikrnd7BXM3U +CTnLcLM7iFzHQ+FSDsNEDeZqoGEg9/Qzg61FS4VpbA8Sljev+zs/ArjUG92HZsET +XFwmW//CVF6kP8EcrNXZvtUvv0SRorKPPMEZF+JaJvMf8nTcU7j9mSOU6Jd01UJ0 ++msltfdMnFQkRl9A2Hf/qO7ghfOXxCnmZaElRjFhiK76cNjVngRf58pS1X5lpaab +TCuGQKAUOGWeZJiMLLsnVMmRHtnv/Q== +=Ojnm -----END PGP MESSAGE----- diff --git a/secrets/yubico/u2f.personal.keys.gpg b/secrets/yubico/u2f.personal.keys.gpg index 53ec03e..1afcb2e 100644 --- a/secrets/yubico/u2f.personal.keys.gpg +++ b/secrets/yubico/u2f.personal.keys.gpg @@ -1,10 +1,10 @@ -----BEGIN PGP MESSAGE----- -jA0ECQMI6ilVuKluy9z/0sBBAY2C0GhxMxdKZFeZwFZVFOlBfNfLMa0Jpubl9YU9 -3v4oS9LF9PXTE9Dv5O/2WWlEcZ5cTw5Ur86L+w1YIxDE6EOITgc8nKXwzPqj7Nkx -qPFE/5K7kIPzsw0My3flol+PLDHmFcKsZknxBSQKKOjkBHGthvlFkR44Mg+gs7oc -hsVLLnvt4TH6dndEId5+5J1y5i6MtCuCpemCjmY22ZmYnaMkuxTiRWDw2+GD5YRo -AmSHSEyQ8uLq1N4Tpin68z+0iUIfgR/UbHRq5B46K0AxEsA5BpHIDpBGf52Y4hBE -y27F1Yr1AypgakMD524YBvRmaiuBJw4WAjxrwLHjZnrJpIg= -=LF00 +jA0ECQMIKN+vzIZBbGX/0sA+Aca2+aIsUjLOAt2GnZurn5J54QaYPGQtCTo8BCWF +FR+Xl1I8tyXiFpkbI9IONyPfL3rTOM3m3vUbn5Gm/0mD7gpUjITAl9Fb2tApTV6R +TFb6mWd3PfTiZTfsFFIc9BRXPuHcN6t4ts4q0nBOsYXSmWbaCK7vGio96hli/0Sm +rzLAh/cqIRW1hayUaRSJJZ8beABECLUZW4cK8dM4u3Yub+nYkmSsKuWpluW8nmpx +YBxzA6nZc9o8uTa2aBf0AdbVmiIujLljZsWQct8W7Gc1W3pFYFuwbGsF7B54DuDC +cpaQbmtcgMlU475XTBCJPkKFm4rnNix57cUAEXyoYWU= +=VFC/ -----END PGP MESSAGE----- diff --git a/secrets/yubico/u2f.work.keys.gpg b/secrets/yubico/u2f.work.keys.gpg index 2c810aa..708e9d8 100644 --- a/secrets/yubico/u2f.work.keys.gpg +++ b/secrets/yubico/u2f.work.keys.gpg @@ -1,13 +1,13 @@ -----BEGIN PGP MESSAGE----- -jA0ECQMIwaGoV3WTcgH/0sDMARL6H1Ec+ap2yUA7C9c1Jg9MN84vcnT3U6Kzk6CK -CgqZ5jQTIuikmH9ZigftZpZMgrtuXx5JNqpN4H57w3SqUbfXLcfwlleb0Q55LCHg -EzmXqgB/3b8uJ6DUJiLKWyiPclhqA6JaWCIoXb0nMiPwFPLmZFg1MgytuZPDBBWn -u5iMcQUQPZw5f5CVBpUGZrycfVf52xq/EbKFlGPLychWIJATFiAR8//WRQzM7Sdk -kmIxeKIBM8ABUO25qeR8vOOlBkdsBdxRw61Y8oGFcCVjVW4/2rV86VsYfVnBe04Q -TGlLCXNX0gvPg1u9PxLrGfx0zJO1aR5LPfU8qjTi2oAiaucxtpMPzGibTyEDY5rP -yrcj4w4W9j2eCMrJoiZ8BXjO1tRSTispQukp+pT2uNoIsrhp42J//J9dGKkFfrFG -qvuSGgedqs/vnjtSJk21GUXztGCMdACv1BnaJLaj2oNXSpPg4s6GWQ4oyEYvrvn5 -sMy76QEG95UjBdZaPah+pfoPcpM6tGEVv0RAoWHB -=rzNt +jA0ECQMIpr4nbEgpIU//0sDJAWaeL2tZUP+ukVPrdDAE0oNA9Qae9V4/XFhw5mVF +zaQ9lUXAYJ7Otaq645l1cIEhE35N/37pjdj9cCZM0oFkNy8zwhhjD2liYmuBUu5S +4Uxwct1WkVkLErKQvx9WKoa9TfTDcxhzhpFevWrfV24abJ7C9fuWZWg4iE8zknkR +GGJh5wUVAS5EsSwVfFkrCMqpha11eb36b1U3Pa5csBFstK8GY/08EzZttE3JjDcM +JW4irhSnE7UMEWcsmguSCMqvGlzj6unn6LVg7tfAr8a58NVQEczHWc3QOPyt+LIh +d8tKTG+Q10uFoBhW/NI9+qAdwlilNRp7b0DEDna7AMwe57ihC8Vc1Wi5xg9vEJix +JIpTUgjn80eQlMjBhPZRh01902K8RsPGOyOPexYVFj/26zTo3UcMzxXJGtlroLtY +9Wva+JYZyhTpiA11ucmQRbtotfbEU6KbHwAsKtAScZveizevKQuarHG5ftXv8aHc +G6/cP3q2PS2NpHZMsO8VtjKTwqJLSxYxjoJ1 +=4whX -----END PGP MESSAGE----- diff --git a/setup.sh b/setup.sh index c84b62e..2ce70ac 100755 --- a/setup.sh +++ b/setup.sh @@ -4,7 +4,7 @@ set -euo pipefail IFS=$'\n\t' # Constants -readonly NIXOS_RELEASE="24.11" # Home Manager release version (Must match NixOS version) +readonly NIXOS_RELEASE="25.05" # Home Manager release version (Must match NixOS version) readonly GIT_REPO="https://git.mvl.sh/vleeuwenmenno/dotfiles.git" # Dotfiles repository URL readonly DOTFILES_PATH="${HOME}/.dotfiles" # Dotfiles directory readonly SETUP_MARKER="${HOME}/.dotfiles-setup" # Setup marker file indicates setup has been run @@ -221,7 +221,7 @@ install_nix() { fi log_info "Nix not detected, installing Nix..." - curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/nix -o install-nix.sh || \ + curl --proto '=https' --tlsv1.2 -sSf -L "https://install.determinate.systems/nix?version=${NIXOS_RELEASE}" -o install-nix.sh || \ die "Failed to download Nix installer" sh install-nix.sh install --no-confirm || die "Failed to install Nix"