vleeuwenmenno/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: add mennos-cloud-server configuration and update related tasks
Some checks failed
Nix Format Check / check-format (push) Failing after 39s
Details

Browse Source
This commit is contained in:
Menno van Leeuwen 2025-03-12 11:12:22 +01:00
parent 150b6a209e
commit 9f8cca411a
Signed by: vleeuwenmenno
SSH Key Fingerprint: SHA256:OJFmjANpakwD3F2Rsws4GLtbdz1TJ5tkQF0RZmF0TRE
10 changed files with 50 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/ansible/inventory.ini
View File

@ -4,6 +4,7 @@ mennos-desktop ansible_connection=local
[servers]
mennos-server ansible_connection=local
mennos-cloud-server ansible_connection=local
mennos-hobbypc ansible_connection=local
mennos-vm ansible_connection=local
dotfiles-test ansible_connection=local

2
config/ansible/playbook.yml
View File

@ -15,4 +15,4 @@
- name: Include server tasks
ansible.builtin.import_tasks: tasks/servers/server.yml
when: hostname in ['mennos-server', 'mennos-hobbypc', 'mennos-vm', 'dotfiles-test']
when: hostname in ['mennos-server', 'mennos-cloud-server', 'mennos-hobbypc', 'mennos-vm', 'dotfiles-test']

2
config/ansible/tasks/global/symlinks.yml
View File

@ -28,6 +28,7 @@
mennos-desktop: "$DOTFILES_PATH/config/git/gitconfig.linux"
mennos-laptop: "$DOTFILES_PATH/config/git/gitconfig.linux"
mennos-server: "$DOTFILES_PATH/config/git/gitconfig.mennos-server"
mennos-cloud-server: "$DOTFILES_PATH/config/git/gitconfig.mennos-server"
mennos-vm: "$DOTFILES_PATH/config/git/gitconfig.mennos-server"
mennos-hobbypc: "$DOTFILES_PATH/config/git/gitconfig.linux"
dotfiles-test: "$DOTFILES_PATH/config/git/gitconfig.mennos-server"
@ -44,6 +45,7 @@
mennos-desktop: "$DOTFILES_PATH/config/ssh/authorized_keys/mennos-desktop"
mennos-laptop: "$DOTFILES_PATH/config/ssh/authorized_keys/mennos-laptop"
mennos-server: "$DOTFILES_PATH/config/ssh/authorized_keys/mennos-server"
mennos-cloud-server: "$DOTFILES_PATH/config/ssh/authorized_keys/mennos-server"
mennos-vm: "$DOTFILES_PATH/config/ssh/authorized_keys/mennos-server"
mennos-hobbypc: "$DOTFILES_PATH/config/ssh/authorized_keys/mennos-hobbypc"
dotfiles-test: "$DOTFILES_PATH/config/ssh/authorized_keys/mennos-server"

6
config/ansible/tasks/servers/server.yml
View File

@ -9,7 +9,7 @@
- name: Include ZFS tasks
ansible.builtin.include_tasks: zfs.yml
when: ansible_hostname == "mennos-server" or ansible_hostname == "dotfiles-test"
when: ansible_hostname == "mennos-server" or ansible_hostname == "dotfiles-test" or ansible_hostname == "mennos-cloud-server"
- name: Check if datapool exists
ansible.builtin.command: zpool list datapool
@ -17,7 +17,7 @@
ignore_errors: true
become: true
changed_when: false
when: ansible_hostname == "mennos-server" or ansible_hostname == "dotfiles-test"
when: ansible_hostname == "mennos-server" or ansible_hostname == "dotfiles-test" or ansible_hostname == "mennos-cloud-server"
- name: Include services tasks
ansible.builtin.include_tasks: services/services.yml
@ -26,7 +26,7 @@
golink_enabled: false
immich_enabled: false
when:
- ansible_hostname == "mennos-server" or ansible_hostname == "dotfiles-test"
- ansible_hostname == "mennos-server" or ansible_hostname == "dotfiles-test" or ansible_hostname == "mennos-cloud-server"
- datapool_check is defined
- datapool_check.rc is defined
- datapool_check.rc == 0

36
config/ansible/tasks/servers/zfs.yml
View File

@ -48,16 +48,14 @@
- /mnt/isos
- /mnt/vms
- /mnt/ai
- /mnt/astrophotography
- /mnt/audiobooks
- /mnt/downloads
- /mnt/movies
- /mnt/music
# - /mnt/old_backups
- /mnt/photos
- /mnt/services
- /mnt/stash
- /mnt/audiobooks
- /mnt/music
- /mnt/photos
- /mnt/movies
- /mnt/tvshows
# - /mnt/old_backups
when: datapool_check.rc == 0
- name: Mount ZFS datasets
@ -71,16 +69,14 @@
- { path: /mnt/isos, src: datapool/isos }
- { path: /mnt/vms, src: datapool/vms }
- { path: /mnt/ai, src: datapool/ai }
- { path: /mnt/astrophotography, src: datapool/astro }
- { path: /mnt/audiobooks, src: datapool/audiobooks }
- { path: /mnt/downloads, src: datapool/downloads }
- { path: /mnt/movies, src: datapool/movies }
- { path: /mnt/music, src: datapool/music }
# - { path: /mnt/old_backups, src: datapool/old_backups }
- { path: /mnt/photos, src: datapool/photos }
- { path: /mnt/services, src: datapool/services }
- { path: /mnt/stash, src: datapool/stash }
- { path: /mnt/audiobooks, src: datapool/audiobooks }
- { path: /mnt/music, src: datapool/music }
- { path: /mnt/photos, src: datapool/photos }
- { path: /mnt/movies, src: datapool/movies }
- { path: /mnt/tvshows, src: datapool/tv_shows }
# - { path: /mnt/old_backups, src: datapool/old_backups }
when: datapool_check.rc == 0
- name: Set ownership after mounting
@ -96,14 +92,12 @@
- /mnt/isos
- /mnt/vms
- /mnt/ai
- /mnt/astrophotography
- /mnt/audiobooks
- /mnt/downloads
- /mnt/movies
- /mnt/music
- /mnt/old_backups
- /mnt/photos
- /mnt/services
- /mnt/stash
- /mnt/audiobooks
- /mnt/music
- /mnt/photos
- /mnt/movies
- /mnt/tvshows
# - /mnt/old_backups
when: datapool_check.rc == 0

13
config/home-manager/flake.nix
View File

@ -70,6 +70,19 @@
};
};
"mennos-cloud-server" = home-manager.lib.homeManagerConfiguration {
inherit pkgs;
modules = [ ./home.nix ];
extraSpecialArgs = {
inherit
pkgs
pkgs-unstable
;
isServer = true;
hostname = "mennos-cloud-server";
};
};
"mennos-vm" = home-manager.lib.homeManagerConfiguration {
inherit pkgs;
modules = [ ./home.nix ];

4
config/home-manager/packages/common/hosts/mennos-cloud-server.nix Normal file
View File

@ -0,0 +1,4 @@
{ pkgs-unstable, ... }:
{
home.packages = with pkgs-unstable; [ ];
}

4
config/home-manager/packages/common/hosts/mennos-vm.nix Normal file
View File

@ -0,0 +1,4 @@
{ pkgs-unstable, ... }:
{
home.packages = with pkgs-unstable; [ ];
}

4
config/home-manager/packages/common/packages.nix
View File

@ -15,6 +15,10 @@
[ ./hosts/mennos-server.nix ]
else if hostname == "dotfiles-test" then
[ ./hosts/mennos-server.nix ]
else if hostname == "mennos-cloud-server" then
[ ./hosts/mennos-cloud-server.nix ]
else if hostname == "mennos-vm" then
[ ./hosts/mennos-vm.nix ]
else
[ ./hosts/fallback.nix ];

3
setup.sh
View File

@ -413,6 +413,9 @@ check_compatibility() {
;;
Debian*)
log_success "Detected Debian. Proceeding with setup..."
log_warning "Debian has known issues with ZFS kernel modules, you might need to manually install it to make ZFS work."
log_warning "Continueing in 5 seconds..."
sleep 5
check_command_availibility "apt"
;;
*)