diff --git a/.editorconfig b/.editorconfig
index da4d133..5ddd8c2 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -9,7 +9,7 @@ end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
 
-[{*.yml,*.fish,*.jsonnet,*.libsonnet}]
+[{*.yml,*.fish,*.jsonnet,*.libsonnet,*.nix}]
 indent_size = 2
 
 [{Makefile,*.sh}]
diff --git a/TODO.md b/TODO.md
index f357bb5..861e2c5 100644
--- a/TODO.md
+++ b/TODO.md
@@ -5,6 +5,8 @@ Plans for the future of this dotfiles.
 ## General
 
 - [ ] Add [GuixWL](https://guixwl) workflow
+- [ ] Disk layout declarative configuration using [disko](https://github.com/nix-community/disko)
+  - Update README instruction to include AlpineLinux installation
 
 ## System
 
diff --git a/disks/thorin.nix b/disks/thorin.nix
new file mode 100644
index 0000000..55016f2
--- /dev/null
+++ b/disks/thorin.nix
@@ -0,0 +1,7 @@
+{
+  devices.disk = {
+    nvme0n1 = { };
+
+    sda = { };
+  };
+}
diff --git a/flake.lock b/flake.lock
new file mode 100644
index 0000000..5b061f1
--- /dev/null
+++ b/flake.lock
@@ -0,0 +1,82 @@
+{
+  "nodes": {
+    "disko": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1711934712,
+        "narHash": "sha256-sBDe+QmX/QohlnKeSEzrftcXyZL5FY09OMjZ59Rpyy4=",
+        "owner": "nix-community",
+        "repo": "disko",
+        "rev": "611c9ea53250f7bb22286b3d26872280a0e608f9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "disko",
+        "type": "github"
+      }
+    },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1711715736,
+        "narHash": "sha256-9slQ609YqT9bT/MNX9+5k5jltL9zgpn36DpFB7TkttM=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "807c549feabce7eddbf259dbdcec9e0600a0660d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "disko": "disko",
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}
diff --git a/flake.nix b/flake.nix
new file mode 100644
index 0000000..84515d5
--- /dev/null
+++ b/flake.nix
@@ -0,0 +1,40 @@
+{
+  description = "folliehiyuki's dotfiles using Ansible";
+
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
+
+    disko = {
+      url = "github:nix-community/disko";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+  };
+
+  outputs = { flake-utils, nixpkgs, ... }:
+    let
+      inherit (nixpkgs) lib;
+      diskConfigs = lib.filterAttrs
+        (name: type: type == "regular" && lib.hasSuffix ".nix" name)
+        (builtins.readDir ./disks);
+    in
+    flake-utils.lib.eachSystem [ "x86_64-linux" "aarch64-linux" ]
+      (system:
+        let
+          pkgs = nixpkgs.legacyPackages."${system}";
+        in
+        {
+          devShells.default = with pkgs; mkShellNoCC {
+            packages = [
+              ansible
+            ];
+          };
+        }) // {
+      diskoConfigurations = lib.mapAttrs'
+        (name: _:
+          lib.nameValuePair
+            (lib.removeSuffix ".nix" name)
+            (import ./disks/${name}))
+        diskConfigs;
+    };
+}
diff --git a/roles/config/tasks/amfora.yml b/roles/config/tasks/amfora.yml
deleted file mode 100644
index 3c20ace..0000000
--- a/roles/config/tasks/amfora.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-- name: amfora | Create config directory
-  file:
-    path: '{{ xdg_dir.config_home }}/amfora'
-    state: directory
-    mode: '755'
-
-- name: amfora | Copy config
-  template:
-    src: amfora/config.j2
-    dest: '{{ xdg_dir.config_home }}/amfora/config.toml'
-    mode: '644'
diff --git a/roles/config/tasks/main.jsonnet b/roles/config/tasks/main.jsonnet
index d23a7dd..b4a43f5 100644
--- a/roles/config/tasks/main.jsonnet
+++ b/roles/config/tasks/main.jsonnet
@@ -17,7 +17,6 @@ local task(name) =
 
 local modules = [
   'aerc',
-  'amfora',
   'animdl',
   'bash',
   'bat',
diff --git a/roles/config/tasks/main.yml b/roles/config/tasks/main.yml
index 8eb2ff8..c888ecc 100644
--- a/roles/config/tasks/main.yml
+++ b/roles/config/tasks/main.yml
@@ -48,9 +48,6 @@
 - import_tasks: "aerc.yml"
   name: "Configure aerc"
   tags: "aerc"
-- import_tasks: "amfora.yml"
-  name: "Configure amfora"
-  tags: "amfora"
 - import_tasks: "animdl.yml"
   name: "Configure animdl"
   tags: "animdl"
diff --git a/roles/config/templates/amfora/config.j2 b/roles/config/templates/amfora/config.j2
deleted file mode 100644
index e388d65..0000000
--- a/roles/config/templates/amfora/config.j2
+++ /dev/null
@@ -1,482 +0,0 @@
-# This is the default config file.
-# It also shows all the default values, if you don't create the file.
-
-# All URL values may omit the scheme and/or port, as well as the beginning double slash
-# Valid URL examples:
-# gemini://example.com
-# //example.com
-# example.com
-# example.com:123
-
-
-[a-general]
-# Press Ctrl-H to access it
-home = "gemini://geminispace.info"
-
-# Follow up to 5 Gemini redirects without prompting.
-# A prompt is always shown after the 5th redirect and for redirects to protocols other than Gemini.
-# If set to false, a prompt will be shown before following redirects.
-auto_redirect = false
-
-# What command to run to open a HTTP(S) URL.
-# Set to "default" to try to guess the browser, or set to "off" to not open HTTP(S) URLs.
-# If a command is set, than the URL will be added (in quotes) to the end of the command.
-# A space will be prepended to the URL.
-#
-# The best way to define a command is using a string array.
-# Examples:
-# http = ['firefox']
-# http = ['custom-browser', '--flag', '--option=2']
-# http = ['/path/with spaces/in it/firefox']
-#
-# Note the use of single quotes, so that backslashes will not be escaped.
-# Using just a string will also work, but it is deprecated, and will degrade if
-# you use paths with spaces.
-http = 'xdg-open'
-
-# Any URL that will accept a query string can be put here
-search = "gemini://geminispace.info/search"
-
-# Whether colors will be used in the terminal
-color = true
-
-# Whether ANSI color codes from the page content should be rendered
-ansi = true
-
-# Whether to replace list asterisks with unicode bullets
-bullets = true
-
-# Whether to show link after link text
-show_link = true
-
-# A number from 0 to 1, indicating what percentage of the terminal width the left margin should take up.
-left_margin = 0.1
-
-# The max number of columns to wrap a page's text to. Preformatted blocks are not wrapped.
-max_width = 100
-
-# 'downloads' is the path to a downloads folder.
-# An empty value means the code will find the default downloads folder for your system.
-# If the path does not exist it will be created.
-# Note the use of single quotes, so that backslashes will not be escaped.
-downloads = ''
-
-# Max size for displayable content in bytes - after that size a download window pops up
-page_max_size = 2097152  # 2 MiB
-# Max time it takes to load a page in seconds - after that a download window pops up
-page_max_time = 10
-
-# When a scrollbar appears. "never", "auto", and "always" are the only valid values.
-# "auto" means the scrollbar only appears when the page is longer than the window.
-scrollbar = "auto"
-
-# Underline non-gemini URLs
-# This is done to help color blind users
-underline = true
-
-[auth]
-# Authentication settings
-# Note the use of single quotes for values, so that backslashes will not be escaped.
-
-[auth.certs]
-# Client certificates
-# Set domain name equal to path to client cert
-# "example.com" = 'mycert.crt'
-
-[auth.keys]
-# Client certificate keys
-# Set domain name equal to path to key for the client cert above
-# "example.com" = 'mycert.key'
-
-
-[keybindings]
-# If you have a non-US keyboard, use bind_tab1 through bind_tab0 to
-# setup the shift-number bindings: Eg, for US keyboards (the default):
-# bind_tab1 = "!"
-# bind_tab2 = "@"
-# bind_tab3 = "#"
-# bind_tab4 = "$"
-# bind_tab5 = "%"
-# bind_tab6 = "^"
-# bind_tab7 = "&"
-# bind_tab8 = "*"
-# bind_tab9 = "("
-# bind_tab0 = ")"
-
-# Whitespace is not allowed in any of the keybindings! Use 'Space' and 'Tab' to bind to those keys.
-# Multiple keys can be bound to one command, just use a TOML array.
-# To add the Alt modifier, the binding must start with Alt-, should be reasonably universal
-# Ctrl- won't work on all keys, see this for a list:
-# https://github.com/gdamore/tcell/blob/cb1e5d6fa606/key.go#L83
-
-# An example of a TOML array for multiple keys being bound to one command is the default
-# binding for reload:
-# bind_reload = ["R","Ctrl-R"]
-# One thing to note here is that "R" is capitalization sensitive, so it means shift-r.
-# "Ctrl-R" means both ctrl-r and ctrl-shift-R (this is a quirk of what ctrl-r means on
-# an ANSI terminal)
-
-# The default binding for opening the bottom bar for entering a URL or link number is:
-# bind_bottom = "Space"
-# This is how to get the Spacebar as a keybinding, if you try to use " ", it won't work.
-# And, finally, an example of a simple, unmodified character is:
-# bind_edit = "e"
-# This binds the "e" key to the command to edit the current URL.
-
-# The bind_link[1-90] options are for the commands to go to the first 10 links on a page,
-# typically these are bound to the number keys:
-# bind_link1 = "1"
-# bind_link2 = "2"
-# bind_link3 = "3"
-# bind_link4 = "4"
-# bind_link5 = "5"
-# bind_link6 = "6"
-# bind_link7 = "7"
-# bind_link8 = "8"
-# bind_link9 = "9"
-# bind_link0 = "0"
-
-# All keybindings:
-#
-# bind_bottom
-# bind_edit
-# bind_home
-# bind_bookmarks
-# bind_add_bookmark
-# bind_save
-# bind_reload
-# bind_back
-# bind_forward
-# bind_moveup
-# bind_movedown
-# bind_moveleft
-# bind_moveright
-# bind_pgup
-# bind_pgdn
-# bind_new_tab
-# bind_close_tab
-# bind_next_tab
-# bind_prev_tab
-# bind_quit
-# bind_help
-# bind_sub: for viewing the subscriptions page
-# bind_add_sub
-# bind_copy_page_url
-# bind_copy_target_url
-# bind_beginning: moving to beginning of page (top left)
-# bind_end: same but the for the end (bottom left)
-
-[url-handlers]
-# Allows setting the commands to run for various URL schemes.
-# E.g. to open FTP URLs with FileZilla set the following key:
-#   ftp = ['filezilla']
-# You can set any scheme to 'off' or '' to disable handling it, or
-# just leave the key unset.
-#
-# DO NOT use this for setting the HTTP command.
-# Use the http setting in the "a-general" section above.
-#
-# NOTE: These settings are overridden by the ones in the proxies section.
-#
-# The best way to define a command is using a string array.
-# Examples:
-# magnet = ['transmission']
-# foo = ['custom-browser', '--flag', '--option=2']
-# tel = ['/path/with spaces/in it/telephone']
-#
-# Note the use of single quotes, so that backslashes will not be escaped.
-# Using just a string will also work, but it is deprecated, and will degrade if
-# you use paths with spaces.
-
-# This is a special key that defines the handler for all URL schemes for which
-# no handler is defined.
-# It uses the special value 'default', which will try and use the default
-# application on your computer for opening this kind of URI.
-other = 'default'
-
-
-# [[mediatype-handlers]] section
-# ---------------------------------
-#
-# Specify what applications will open certain media types.
-# By default your default application will be used to open the file when you select "Open".
-# You only need to configure this section if you want to override your default application,
-# or do special things like streaming.
-#
-# Note the use of single quotes for commands, so that backslashes will not be escaped.
-#
-#
-# To open jpeg files with the feh command:
-#
-# [[mediatype-handlers]]
-# cmd = ['feh']
-# types = ["image/jpeg"]
-#
-# Each command that you specify must come under its own [[mediatype-handlers]]. You may
-# specify as many [[mediatype-handlers]] as you want to setup multiple commands.
-#
-# If the subtype is omitted then the specified command will be used for the
-# entire type:
-#
-# [[mediatype-handlers]]
-# command = ['vlc', '--flag']
-# types = ["audio", "video"]
-#
-# A catch-all handler can by specified with "*".
-# Note that there are already catch-all handlers in place for all OSes,
-# that open the file using your default application. This is only if you
-# want to override that.
-#
-# [[mediatype-handlers]]
-# cmd = ['some-command']
-# types = [
-#         "application/pdf",
-#         "*",
-# ]
-#
-# You can also choose to stream the data instead of downloading it all before
-# opening it. This is especially useful for large video or audio files, as
-# well as radio streams, which will never complete. You can do this like so:
-#
-# [[mediatype-handlers]]
-# cmd = ['vlc', '-']
-# types = ["audio", "video"]
-# stream = true
-#
-# This uses vlc to stream all video and audio content.
-# By default stream is set to off for all handlers
-#
-#
-# If you want to always open a type in its viewer without the download or open
-# prompt appearing, you can add no_prompt = true
-#
-# [[mediatype-handlers]]
-# cmd = ['feh']
-# types = ["image"]
-# no_prompt = true
-#
-# Note: Multiple handlers cannot be defined for the same full media type, but
-# still there needs to be an order for which handlers are used. The following
-# order applies regardless of the order written in the config:
-#
-# 1. Full media type: "image/jpeg"
-# 2. Just type: "image"
-# 3. Catch-all: "*"
-
-[cache]
-# Options for page cache - which is only for text pages
-# Increase the cache size to speed up browsing at the expense of memory
-# Zero values mean there is no limit
-
-max_size = 0  # Size in bytes
-max_pages = 30 # The maximum number of pages the cache will store
-
-# How long a page will stay in cache, in seconds.
-timeout = 1800 # 30 mins
-
-[proxies]
-# Allows setting a Gemini proxy for different schemes.
-# The settings are similar to the url-handlers section above.
-# E.g. to open a gopher page by connecting to a Gemini proxy server:
-#   gopher = "example.com:123"
-#
-# Port 1965 is assumed if no port is specified.
-#
-# NOTE: These settings override any external handlers specified in
-# the url-handlers section.
-#
-# Note that HTTP and HTTPS are treated as separate protocols here.
-
-
-[subscriptions]
-# For tracking feeds and pages
-
-# Whether a pop-up appears when viewing a potential feed
-popup = true
-
-# How often to check for updates to subscriptions in the background, in seconds.
-# Set it to 0 to disable this feature. You can still update individual feeds
-# manually, or restart the browser.
-#
-# Note Amfora will check for updates on browser start no matter what this setting is.
-update_interval = 1800 # 30 mins
-
-# How many subscriptions can be checked at the same time when updating.
-# If you have many subscriptions you may want to increase this for faster
-# update times. Any value below 1 will be corrected to 1.
-workers = 3
-
-# The number of subscription updates displayed per page.
-entries_per_page = 20
-
-
-[theme]
-# This section is for changing the COLORS used in Amfora.
-# These colors only apply if 'color' is enabled above.
-# Colors can be set using a W3C color name, or a hex value such as "#ffffff".
-
-# Note that not all colors will work on terminals that do not have truecolor support.
-# If you want to stick to the standard 16 or 256 colors, you can get
-# a list of those here: https://jonasjacek.github.io/colors/
-# DO NOT use the names from that site, just the hex codes.
-
-# Definitions:
-#   bg = background
-#   fg = foreground
-#   dl = download
-#   btn = button
-#   hdg = heading
-#   bkmk = bookmark
-#   modal = a popup window/box in the middle of the screen
-
-# EXAMPLES:
-# hdg_1 = "green"
-# hdg_2 = "#5f0000"
-
-# Available keys to set:
-
-# bg: background for pages, tab row, app in general
-# tab_num: The number/highlight of the tabs at the top
-# tab_divider: The color of the divider character between tab numbers: |
-# bottombar_label: The color of the prompt that appears when you press space
-# bottombar_text: The color of the text you type
-# bottombar_bg
-
-# hdg_1
-# hdg_2
-# hdg_3
-# amfora_link: A link that Amfora supports viewing. For now this is only gemini://
-# foreign_link: HTTP(S), Gopher, etc
-# link_number: The silver number that appears to the left of a link
-# regular_text: Normal gemini text, and plaintext documents
-# quote_text
-# preformatted_text
-# list_text
-
-# btn_bg: The bg color for all modal buttons
-# btn_text: The text color for all modal buttons
-
-# dl_choice_modal_bg
-# dl_choice_modal_text
-# dl_modal_bg
-# dl_modal_text
-# info_modal_bg
-# info_modal_text
-# error_modal_bg
-# error_modal_text
-# yesno_modal_bg
-# yesno_modal_text
-# tofu_modal_bg
-# tofu_modal_text
-# subscription_modal_bg
-# subscription_modal_text
-
-# input_modal_bg
-# input_modal_text
-# input_modal_field_bg: The bg of the input field, where you type the text
-# input_modal_field_text: The color of the text you type
-
-# bkmk_modal_bg
-# bkmk_modal_text
-# bkmk_modal_label
-# bkmk_modal_field_bg
-# bkmk_modal_field_text
-
-{% if theme == 'nord' %}
-bg = "{{ colors.background }}"
-fg = "{{ colors.foreground }}"
-tab_num = "{{ colors.cyan }}"
-tab_divider = "{{ colors.grey3 }}"
-bottombar_label = "{{ colors.cyan }}"
-bottombar_text = "{{ colors.foreground }}"
-bottombar_bg = "{{ colors.grey1 }}"
-
-hdg_1 = "{{ colors.dark_blue }}"
-hdg_2 = "{{ colors.blue }}"
-hdg_3 = "{{ colors.yellow }}"
-amfora_link = "{{ colors.cyan }}"
-foreign_link = "{{ colors.purple }}"
-link_number = "{{ colors.green }}"
-regular_text = "{{ colors.foreground }}"
-quote_text = "{{ colors.blue }}"
-preformatted_text = "{{ colors.teal }}"
-list_text = "{{ colors.foreground }}"
-
-btn_bg = "{{ colors.grey3 }}"
-btn_text = "{{ colors.foreground }}"
-
-dl_choice_modal_bg = "{{ colors.grey1 }}"
-dl_choice_modal_text = "{{ colors.foreground }}"
-dl_modal_bg = "{{ colors.grey1 }}"
-dl_modal_text = "{{ colors.foreground }}"
-info_modal_bg = "{{ colors.grey1 }}"
-info_modal_text = "{{ colors.foreground }}"
-error_modal_bg = "{{ colors.red }}"
-error_modal_text = "{{ colors.foreground }}"
-yesno_modal_bg = "{{ colors.grey1 }}"
-yesno_modal_text = "{{ colors.foreground }}"
-tofu_modal_bg = "{{ colors.grey1 }}"
-tofu_modal_text = "{{ colors.foreground }}"
-subscription_modal_bg = "{{ colors.grey1 }}"
-subscription_modal_text = "{{ colors.foreground }}"
-
-input_modal_bg = "{{ colors.grey1 }}"
-input_modal_text = "{{ colors.foreground }}"
-input_modal_field_bg = "{{ colors.grey3 }}"
-input_modal_field_text = "{{ colors.foreground }}"
-
-bkmk_modal_bg = "{{ colors.grey1 }}"
-bkmk_modal_text = "{{ colors.foreground }}"
-bkmk_modal_label = "{{ colors.foreground }}"
-bkmk_modal_field_bg = "{{ colors.grey3 }}"
-bkmk_modal_field_text = "{{ colors.foreground }}"
-{% elif theme == 'onedark' %}
-bg = "{{ colors.background }}"
-fg = "{{ colors.foreground }}"
-tab_num = "{{ colors.foreground }}"
-tab_divider = "{{ colors.foreground }}"
-bottombar_bg = "{{ colors.foreground }}"
-bottombar_text = "{{ colors.background }}"
-bottombar_label = "{{ colors.background }}"
-
-hdg_1 = "{{ colors.red }}"
-hdg_2 = "{{ colors.orange }}"
-hdg_3 = "{{ colors.purple }}"
-amfora_link = "{{ colors.blue }}"
-foreign_link = "{{ colors.cyan }}"
-link_number = "{{ colors.foreground }}"
-regular_text = "{{ colors.foreground }}"
-quote_text = "{{ colors.green }}"
-preformatted_text = "{{ colors.yellow }}"
-list_text = "{{ colors.foreground }}"
-
-btn_bg = "{{ colors.background }}"
-btn_text = "{{ colors.foreground }}"
-
-dl_choice_modal_bg = "{{ colors.green }}"
-dl_choice_modal_text = "{{ colors.background }}"
-dl_modal_bg = "{{ colors.green }}"
-dl_modal_text = "{{ colors.background }}"
-info_modal_bg = "{{ colors.green }}"
-info_modal_text = "{{ colors.background }}"
-error_modal_bg = "{{ colors.red }}"
-error_modal_text = "{{ colors.background }}"
-yesno_modal_bg = "{{ colors.yellow }}"
-yesno_modal_text = "{{ colors.background }}"
-tofu_modal_bg = "{{ colors.yellow }}"
-tofu_modal_text = "{{ colors.background }}"
-
-input_modal_bg = "{{ colors.green }}"
-input_modal_text = "{{ colors.background }}"
-input_modal_field_bg = "{{ colors.background }}"
-input_modal_field_text = "{{ colors.foreground }}"
-
-bkmk_modal_bg = "{{ colors.green }}"
-bkmk_modal_text = "{{ colors.background }}"
-bkmk_modal_label = "{{ colors.background }}"
-bkmk_modal_field_bg = "{{ colors.background }}"
-bkmk_modal_field_text = "{{ colors.foreground }}"
-
-subscription_modal_bg = "{{ colors.purple }}"
-subscription_modal_text = "{{ colors.background }}"
-{% endif %}
diff --git a/roles/config/templates/fish/config.j2 b/roles/config/templates/fish/config.j2
index 2bf6a34..69512ab 100644
--- a/roles/config/templates/fish/config.j2
+++ b/roles/config/templates/fish/config.j2
@@ -16,6 +16,11 @@ if command -v zoxide >/dev/null
   zoxide init fish | source
 end
 
+# load opam switch env vars
+if command -v opam >/dev/null
+  opam env | source
+end
+
 # gpg-agent
 set -gx GPG_TTY (tty)
 
diff --git a/roles/config/templates/fish/env.j2 b/roles/config/templates/fish/env.j2
index 96cf5b3..07ce4d4 100644
--- a/roles/config/templates/fish/env.j2
+++ b/roles/config/templates/fish/env.j2
@@ -145,7 +145,7 @@ set -gx CHROMIUM_USER_FLAGS "
 
 # make puppeteer use the system's chromium (for mermaid-cli)
 set -gx PUPPETEER_EXECUTABLE_PATH '/usr/bin/chromium-browser'
-set -gx PUPPETEER_SKIP_CHROMIUM_DOWNLOAD true
+set -gx PUPPETEER_SKIP_DOWNLOAD true
 
 # qt5ct
 set -gx QT_QPA_PLATFORMTHEME qt5ct
diff --git a/roles/config/templates/river/by_host/alpine-tp/init.j2 b/roles/config/templates/river/by_host/thorin/init.j2
similarity index 100%
rename from roles/config/templates/river/by_host/alpine-tp/init.j2
rename to roles/config/templates/river/by_host/thorin/init.j2
diff --git a/roles/config/templates/sway/by_host/alpine-tp/config.j2 b/roles/config/templates/sway/by_host/thorin/config.j2
similarity index 100%
rename from roles/config/templates/sway/by_host/alpine-tp/config.j2
rename to roles/config/templates/sway/by_host/thorin/config.j2
diff --git a/roles/config/templates/waybar/by_host/alpine-tp/config.j2 b/roles/config/templates/waybar/by_host/thorin/config.j2
similarity index 100%
rename from roles/config/templates/waybar/by_host/alpine-tp/config.j2
rename to roles/config/templates/waybar/by_host/thorin/config.j2
diff --git a/roles/config/templates/xdg-desktop-portal-wlr/by_host/alpine-tp/config.j2 b/roles/config/templates/xdg-desktop-portal-wlr/by_host/thorin/config.j2
similarity index 100%
rename from roles/config/templates/xdg-desktop-portal-wlr/by_host/alpine-tp/config.j2
rename to roles/config/templates/xdg-desktop-portal-wlr/by_host/thorin/config.j2
diff --git a/roles/scripts/templates/launch_wallpaper.j2 b/roles/scripts/templates/launch_wallpaper.j2
index f6e7da8..eeed530 100644
--- a/roles/scripts/templates/launch_wallpaper.j2
+++ b/roles/scripts/templates/launch_wallpaper.j2
@@ -23,7 +23,7 @@ wallpapers=$(find "$dir" -type f -o -type l \
 	-o -name "*.JPG" \
 	-o -name "*.JPEG" \
 	-o -name "*.WEBP" | \
-	shuf -z -n "$num_outputs")
+	shuf -n "$num_outputs")
 
 num_wallpapers=$(echo "$wallpapers" | wc -l)
 
diff --git a/roles/system/tasks/tlp.yml b/roles/system/tasks/tlp.yml
index 03b1e5d..529bd16 100644
--- a/roles/system/tasks/tlp.yml
+++ b/roles/system/tasks/tlp.yml
@@ -9,7 +9,7 @@
   community.general.apk:
     name: acpi_call-src
     state: present
-  when: ansible_hostname == 'alpine-tp'
+  when: ansible_hostname == 'thorin'
 
 - name: tlp | Copy configuration
   template:
diff --git a/roles/system/templates/tlp/by_host/alpine-tp/config.j2 b/roles/system/templates/tlp/by_host/thorin/config.j2
similarity index 100%
rename from roles/system/templates/tlp/by_host/alpine-tp/config.j2
rename to roles/system/templates/tlp/by_host/thorin/config.j2