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