From 8596d5809f071f86ec71910d044255bc257c81df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?=
 <geoffrey@frogeye.fr>
Date: Sat, 16 Dec 2023 17:03:59 +0100
Subject: [PATCH 01/24] Fix less colors

---
 hm/common.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/hm/common.nix b/hm/common.nix
index 85276af..8958216 100644
--- a/hm/common.nix
+++ b/hm/common.nix
@@ -54,13 +54,13 @@ in
         TIME_STYLE = "+%Y-%m-%d %H:%M:%S";
         # Less colors
         LESS = "-R";
-        LESS_TERMCAP_mb = "$'\E[1;31m'"; # begin blink
-        LESS_TERMCAP_md = "$'\E[1;36m'"; # begin bold
-        LESS_TERMCAP_me = "$'\E[0m'"; # reset bold/blink
-        LESS_TERMCAP_so = "$'\E[01;44;33m'"; # begin reverse video
-        LESS_TERMCAP_se = "$'\E[0m'"; # reset reverse video
-        LESS_TERMCAP_us = "$'\E[1;32m'"; # begin underline
-        LESS_TERMCAP_ue = "$'\E[0m'"; # reset underline
+        LESS_TERMCAP_mb = "$(echo $'\\E[1;31m')"; # begin blink
+        LESS_TERMCAP_md = "$(echo $'\\E[1;36m')"; # begin bold
+        LESS_TERMCAP_me = "$(echo $'\\E[0m')"; # reset bold/blink
+        LESS_TERMCAP_so = "$(echo $'\\E[01;44;33m')"; # begin reverse video
+        LESS_TERMCAP_se = "$(echo $'\\E[0m')"; # reset reverse video
+        LESS_TERMCAP_us = "$(echo $'\\E[1;32m')"; # begin underline
+        LESS_TERMCAP_ue = "$(echo $'\\E[0m')"; # reset underline
         # Fzf
         FZF_COMPLETION_OPTS = "${lib.strings.concatStringsSep " " config.programs.fzf.fileWidgetOptions}";
       };

From 405a25e2aba190f2cf48728351045ff3d88405cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?=
 <geoffrey@frogeye.fr>
Date: Sat, 16 Dec 2023 17:04:29 +0100
Subject: [PATCH 02/24] Fix boot

---
 curacao/dk.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/curacao/dk.nix b/curacao/dk.nix
index d66bd20..fa2660b 100644
--- a/curacao/dk.nix
+++ b/curacao/dk.nix
@@ -85,7 +85,7 @@ in
                   mountOptions = [
                     "rw"
                     "relatime"
-                    "stripe=4"
+                    # "stripe=4" # For some reason doesn't work on NixOS
                   ];
                 };
               };

From 1840ed67c9eafe84b0dec03f137aef1cb27e148a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?=
 <geoffrey@frogeye.fr>
Date: Sat, 16 Dec 2023 17:04:59 +0100
Subject: [PATCH 03/24] Different screen names under NixOS

Breaks curacao_test though
---
 curacao/options.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/curacao/options.nix b/curacao/options.nix
index 6bed395..f07bbbd 100644
--- a/curacao/options.nix
+++ b/curacao/options.nix
@@ -3,7 +3,7 @@
   frogeye = {
     desktop = {
       xorg = true;
-      x11_screens = [ "HDMI-1-0" "eDP1" ];
+      x11_screens = [ "HDMI-1-0" "eDP-1" ];
       maxVideoHeight = 1440;
       numlock = true;
       phasesBrightness = {

From 064ff2e9ab105ef2ded479c02ed6772d57e98648 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?=
 <geoffrey@frogeye.fr>
Date: Sat, 16 Dec 2023 17:05:36 +0100
Subject: [PATCH 04/24] Actually, shell history is state

---
 hm/common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hm/common.nix b/hm/common.nix
index 8958216..6cf59d9 100644
--- a/hm/common.nix
+++ b/hm/common.nix
@@ -138,7 +138,7 @@ in
       # TODO Maybe make nixpkg wrapper instead? So it also works from dmenu
       # Could also accept my fate... Home-manager doesn't necessarily make it easy to put things out of the home directory
       historySize = 100000;
-      historyFile = "${config.xdg.cacheHome}/shell_history";
+      historyFile = "${config.xdg.stateHome}/shell_history";
     in
     {
 

From 88ef6925a42f2c22c4b88b5b3dd5556bb41fda7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?=
 <geoffrey@frogeye.fr>
Date: Sat, 16 Dec 2023 17:06:04 +0100
Subject: [PATCH 05/24] Fix i3 fonts

---
 hm/desktop.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/hm/desktop.nix b/hm/desktop.nix
index eaf6c20..fda7639 100644
--- a/hm/desktop.nix
+++ b/hm/desktop.nix
@@ -79,9 +79,13 @@ in
               mode_pres_sec = "Presentation (secondary display)";
               mode_screen = "Screen setup [A] Auto [L] Load [S] Save [R] Remove [D] Default";
               mode_temp = "Temperature [R] Red [D] Dust storm [C] Campfire [O] Normal [A] All nighter [B] Blue";
+              fonts = config.stylix.fonts;
             in
             {
               modifier = "Mod4";
+              fonts = {
+                names = [ fonts.sansSerif.name ];
+              };
               terminal = "alacritty";
               colors = let ignore = "#ff00ff"; in
                 with config.lib.stylix.colors.withHashtag; lib.mkForce {
@@ -512,7 +516,7 @@ in
       autorandr = {
         enable = true;
         hooks.postswitch = {
-            background = "${pkgs.feh}/bin/feh --no-fehbg --bg-fill ${config.stylix.image}";
+          background = "${pkgs.feh}/bin/feh --no-fehbg --bg-fill ${config.stylix.image}";
         };
       };
       mpv = {

From c59ee1169668165ba189a7a9a07f9fc18cc611ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?=
 <geoffrey@frogeye.fr>
Date: Sat, 16 Dec 2023 17:07:44 +0100
Subject: [PATCH 06/24] Re-add bluetooth

I forgot
---
 hm/desktop.nix |  1 +
 os/desktop.nix | 30 ++++++++++++++++++------------
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/hm/desktop.nix b/hm/desktop.nix
index fda7639..82250f0 100644
--- a/hm/desktop.nix
+++ b/hm/desktop.nix
@@ -587,6 +587,7 @@ in
       };
     };
     services = {
+      blueman-applet.enable = true;
       unclutter.enable = true;
       dunst =
         {
diff --git a/os/desktop.nix b/os/desktop.nix
index ab3b08c..f361cc0 100644
--- a/os/desktop.nix
+++ b/os/desktop.nix
@@ -3,16 +3,18 @@
   config = lib.mkIf config.frogeye.desktop.xorg {
     # Enable the X11 windowing system
 
-    services.xserver = {
-      enable = true;
-      windowManager.i3.enable = true;
-      displayManager.defaultSession = "none+i3";
+    services = {
+      blueman.enable = true;
+      xserver = {
+        enable = true;
+        windowManager.i3.enable = true;
+        displayManager.defaultSession = "none+i3";
 
-      # Keyboard layout
-      extraLayouts.qwerty-fr = {
-        description = "QWERTY-fr";
-        languages = [ "fr" ];
-        symbolsFile = "${pkgs.stdenv.mkDerivation {
+        # Keyboard layout
+        extraLayouts.qwerty-fr = {
+          description = "QWERTY-fr";
+          languages = [ "fr" ];
+          symbolsFile = "${pkgs.stdenv.mkDerivation {
           name = "qwerty-fr-keypad";
           src = builtins.fetchGit {
             url = "https://github.com/qwerty-fr/qwerty-fr.git";
@@ -27,13 +29,17 @@
             runHook postInstall
           '';
       }}/linux/us_qwerty-fr";
+        };
+        layout = "qwerty-fr";
       };
-      layout = "qwerty-fr";
     };
 
-    # Enable sound
+    # Enable sound & bluetooth
     sound.enable = true;
-    hardware.pulseaudio.enable = true;
+    hardware = {
+        bluetooth.enable = true;
+        pulseaudio.enable = true;
+    };
 
     # UPST
     # TODO Find a way to override packages either at NixOS level or HM level depending on what is used

From a6f706d0880ad1bc4fa0944519a043d3e33c4671 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?=
 <geoffrey@frogeye.fr>
Date: Sat, 16 Dec 2023 17:08:18 +0100
Subject: [PATCH 07/24] Add Signal

---
 hm/extra.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/hm/extra.nix b/hm/extra.nix
index b346f05..253266a 100644
--- a/hm/extra.nix
+++ b/hm/extra.nix
@@ -19,6 +19,9 @@
       # android tools
       android-tools
 
+      # Communication
+      signal-desktop
+
       # downloading
       # transmission TODO Collision if both transmissions are active?
 

From 417ef5a74603f87a0c5641c77420fd62a3e605f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?=
 <geoffrey@frogeye.fr>
Date: Sat, 16 Dec 2023 17:08:29 +0100
Subject: [PATCH 08/24] Fix Wi-Fi config generation

Actually the first thing I did, but last commit because...
why do I bother again?
---
 os/wireless/import.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/os/wireless/import.py b/os/wireless/import.py
index 85ac1d5..d4535be 100755
--- a/os/wireless/import.py
+++ b/os/wireless/import.py
@@ -1,4 +1,6 @@
-#!/usr/bin/env python3
+#!/usr/bin/env nix-shell
+#! nix-shell -i python3
+#! nix-shell -p python3 python3Packages.pyaml
 
 """
 Exports Wi-Fi networks configuration stored in pass into a format readable by Nix.
@@ -19,7 +21,7 @@ import yaml
 
 # passpy doesn't handle encoding properly, so doing this with calls
 
-PASSWORD_STORE = os.path.expanduser("~/.password-store")
+PASSWORD_STORE = os.path.expanduser("~/.local/share/pass")
 SUBFOLDER = "wifi"
 SEPARATE_PASSWORDS = False
 # TODO Find a way to make then env file available at whatever time it is needed

From 926e620b5e03a32d06d2e1dc40af6bcd4a165b1a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?=
 <geoffrey@frogeye.fr>
Date: Sat, 16 Dec 2023 17:29:34 +0100
Subject: [PATCH 09/24] Fix shell title

---
 hm/common.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/hm/common.nix b/hm/common.nix
index 6cf59d9..49d1d94 100644
--- a/hm/common.nix
+++ b/hm/common.nix
@@ -196,7 +196,10 @@ in
           duration = "$( test -n \"$__TIMER\" && echo $(( $EPOCHREALTIME - $\{__TIMER:-EPOCHREALTIME})) || echo 0 )";
           # UPST Implement this properly in home-manager, would allow for bash support
         };
-        extraUpdatePS1 = ''unset __TIMER'';
+        extraUpdatePS1 = ''
+            unset __TIMER
+            echo -en "\033]0; $USER@$HOST $PWD\007"
+        '';
       };
       gpg = {
         enable = true;

From 16ca8b3b1851b3cdb1c5cfddb2b120b67aaba78f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?=
 <geoffrey@frogeye.fr>
Date: Sat, 16 Dec 2023 17:37:04 +0100
Subject: [PATCH 10/24] Fix bsh

---
 hm/scripts/bsh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/hm/scripts/bsh b/hm/scripts/bsh
index 9ad639b..45e21a7 100755
--- a/hm/scripts/bsh
+++ b/hm/scripts/bsh
@@ -1,6 +1,4 @@
-#!/usr/bin/env nix-shell
-#! nix-shell -i bash --pure
-#! nix-shell -p bash openssh coreutils gawk gnused
+#!/usr/bin/env bash
 
 # TODO More integrated with current config
 

From 2515d3e8eaf5903f0079182ad1b12e1c1a53641e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?=
 <geoffrey@frogeye.fr>
Date: Sat, 16 Dec 2023 18:58:13 +0100
Subject: [PATCH 11/24] Don't use lessopen/lesspipe

Broken, will ask for strings.
---
 os/common.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/os/common.nix b/os/common.nix
index 5719d75..bf48d7f 100644
--- a/os/common.nix
+++ b/os/common.nix
@@ -39,6 +39,7 @@
     ccache.enable = true;
     # TODO Not enough, see https://nixos.wiki/wiki/CCache.
     # Might want to see if it's worth using on NixOS
+    less.lessopen = null; # Don't use lessopen
     gnupg.agent.enable = true;
 
     # Let users mount disks

From 6f1121d731caac440e8e1e746f12167a78639444 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?=
 <geoffrey@frogeye.fr>
Date: Sat, 16 Dec 2023 19:00:33 +0100
Subject: [PATCH 12/24] Properly add syncthing

---
 hm/common.nix | 1 -
 hm/extra.nix  | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/hm/common.nix b/hm/common.nix
index 49d1d94..cb0337b 100644
--- a/hm/common.nix
+++ b/hm/common.nix
@@ -465,7 +465,6 @@ in
       khard
       khal
       todoman
-      syncthing
 
       # TODO Lots of redundancy with other way things are defined here
 
diff --git a/hm/extra.nix b/hm/extra.nix
index 253266a..84002cf 100644
--- a/hm/extra.nix
+++ b/hm/extra.nix
@@ -64,5 +64,8 @@
       # https://hydra.nixos.org/job/nixos/release-23.11/nixpkgs.blender.aarch64-linux
       blender
     ]);
+    services = {
+      syncthing.enable = true;
+    };
   };
 }

From 8dfaa80f96c1cda7819aa45e3e79bdbdc8846746 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?=
 <geoffrey@frogeye.fr>
Date: Sat, 16 Dec 2023 19:02:59 +0100
Subject: [PATCH 13/24] Use gitFull

I want gitk
---
 hm/common.nix | 1 +
 hm/dev.nix    | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/hm/common.nix b/hm/common.nix
index cb0337b..e8922ed 100644
--- a/hm/common.nix
+++ b/hm/common.nix
@@ -248,6 +248,7 @@ in
       less.enable = true;
       git = {
         enable = true;
+        package = pkgs.gitFull;
         aliases = {
           "git" = "!exec git"; # In case I write one too many git
         };
diff --git a/hm/dev.nix b/hm/dev.nix
index f98bcf9..648d7a7 100644
--- a/hm/dev.nix
+++ b/hm/dev.nix
@@ -6,7 +6,6 @@
   home.packages = with pkgs; [
     # Common
     perf-tools
-    git
     jq
     yq
     universal-ctags

From 740e10373068d80c69068573d899af3d33e2da03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?=
 <geoffrey@frogeye.fr>
Date: Sat, 16 Dec 2023 19:06:10 +0100
Subject: [PATCH 14/24] Review system packages

---
 os/common.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/os/common.nix b/os/common.nix
index bf48d7f..f3d8836 100644
--- a/os/common.nix
+++ b/os/common.nix
@@ -25,10 +25,8 @@
   environment.systemPackages = with pkgs; [
     wget
     kexec-tools
-    openvpn
-
-    # Needed for all the fetchFromGit in this repo on nixos-rebuild
-    git
+    neovim # So we have a working editor in rescue mode
+    git # Needed for all the fetchFromGit in this repo on nixos-rebuild
   ];
 
   nixpkgs.config.allowUnfree = true;

From a3552634b65d468ff02eb39476d413eba6d0841d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?=
 <geoffrey@frogeye.fr>
Date: Sat, 16 Dec 2023 22:22:14 +0100
Subject: [PATCH 15/24] Add curacao backup stuff

---
 build_hm.sh                |  2 +-
 curacao/backup/backup.sh   | 83 ++++++++++++++++++++++++++++++++++++++
 curacao/backup/default.nix | 64 +++++++++++++++++++++++++++++
 curacao/dk.nix             |  1 -
 curacao/os.nix             |  1 +
 5 files changed, 149 insertions(+), 2 deletions(-)
 create mode 100755 curacao/backup/backup.sh
 create mode 100644 curacao/backup/default.nix

diff --git a/build_hm.sh b/build_hm.sh
index b675d9d..08a672b 100755
--- a/build_hm.sh
+++ b/build_hm.sh
@@ -17,7 +17,7 @@ function help {
     echo "  -h: Display this help message."
 }
 
-while getopts "hvb" OPTION
+while getopts "h" OPTION
 do
     case "$OPTION" in
         h)
diff --git a/curacao/backup/backup.sh b/curacao/backup/backup.sh
new file mode 100755
index 0000000..38448c2
--- /dev/null
+++ b/curacao/backup/backup.sh
@@ -0,0 +1,83 @@
+#!/usr/bin/env bash
+
+set -euxo pipefail
+
+# Parse arguments
+function help {
+    echo "Usage: $0 [-h|-i] volume"
+    echo "Backup BTRFS subvolume on rapido to razmo."
+    echo
+    echo "Arguments:"
+    echo "  volume: Name of the subvolume to backup"
+    echo
+    echo "Options:"
+    echo "  -h: Display this help message."
+    echo "  -i: Don't fail if the receiving subvolume doesn't exist."
+}
+
+init=false
+while getopts "hi" OPTION
+do
+    case "$OPTION" in
+        h)
+            help
+            exit 0
+            ;;
+        i)
+            init=true
+            ;;
+        ?)
+            help
+            exit 2
+            ;;
+    esac
+done
+shift "$((OPTIND - 1))"
+
+if [ "$#" -ne 1 ]
+then
+    help
+    exit 2
+fi
+volume="$1"
+
+# Assertions
+[ -d "/mnt/rapido/${volume}" ]
+[ -d "/mnt/rapido/${volume}.bkp" ] || "$init"
+[ ! -d "/mnt/rapido/${volume}.new" ]
+[ -d "/mnt/razmo/${volume}.bkp" ] || "$init"
+[ -d "/mnt/razmo/${volume}" ] || "$init"
+[ ! -d "/mnt/razmo/${volume}.new" ]
+[ ! -d "/mnt/razmo/${volume}.snapshots" ]
+
+# Taking a snapshot of the running subvolume
+btrfs subvolume snapshot -r "/mnt/rapido/${volume}" "/mnt/rapido/${volume}.new"
+
+# Sending (the difference with) the last backup to the backup disk
+function error_handler() {
+    btrfs subvolume delete "/mnt/rapido/${volume}.new" || true
+    btrfs subvolume delete "/mnt/razmo/${volume}.new" || true
+}
+trap error_handler ERR
+if [ -d "/mnt/rapido/${volume}.bkp" ]
+then
+    btrfs send -p "/mnt/rapido/${volume}.bkp" "/mnt/rapido/${volume}.new" | btrfs receive /mnt/razmo
+else
+    btrfs send "/mnt/rapido/${volume}.new" | btrfs receive /mnt/razmo
+fi
+trap - ERR
+
+# Removing old backups and putting the new one in place
+[ ! -d "/mnt/rapido/${volume}.bkp" ] || btrfs subvolume delete "/mnt/rapido/${volume}.bkp"
+mv "/mnt/rapido/${volume}.new" "/mnt/rapido/${volume}.bkp"
+[ ! -d "/mnt/razmo/${volume}.bkp" ] || btrfs subvolume delete "/mnt/razmo/${volume}.bkp"
+mv "/mnt/razmo/${volume}.new" "/mnt/razmo/${volume}.bkp"
+
+# Create a writeable clone in case we need to boot on the HDD
+# Needs to move away then back the .snapshots folder
+[ ! -d "/mnt/razmo/${volume}/.snapshots" ] || mv "/mnt/razmo/${volume}/.snapshots" "/mnt/razmo/${volume}.snapshots"
+[ ! -d "/mnt/razmo/${volume}" ] || btrfs subvolume delete "/mnt/razmo/${volume}"
+btrfs subvolume snapshot "/mnt/razmo/${volume}.bkp" "/mnt/razmo/${volume}"
+[ ! -d "/mnt/razmo/${volume}.snapshots" ] || mv "/mnt/razmo/${volume}.snapshots" "/mnt/razmo/${volume}/.snapshots"
+
+sync
diff --git a/curacao/backup/default.nix b/curacao/backup/default.nix
new file mode 100644
index 0000000..5041c60
--- /dev/null
+++ b/curacao/backup/default.nix
@@ -0,0 +1,64 @@
+{ pkgs, lib, ... }:
+# MANU Snapper is not able to create the snapshot directory, so you'll need to do this after eventually running the backup script:
+# sudo btrfs subvol create /mnt/razmo/$subvolume/.snapshots
+let
+  backup_subvolumes = [ "nixos" "home.rapido" ];
+  backup_app = pkgs.writeShellApplication {
+    name = "backup-subvolume";
+    runtimeInputs = with pkgs; [ coreutils btrfs-progs ];
+    text = builtins.readFile ./backup.sh;
+  };
+  snapper_subvolumes = [ "nixos" "home.rapido" "home.razmo" ];
+in
+{
+  services =
+    let
+      default = {
+        # filesystem type
+        FSTYPE = "btrfs";
+
+        # run daily number cleanup
+        NUMBER_CLEANUP = true;
+        NUMBER_MIN_AGE = 1800;
+        NUMBER_LIMIT = 25;
+
+        # create hourly snapshots
+        TIMELINE_CREATE = true;
+
+        # cleanup hourly snapshots after some time
+        TIMELINE_CLEANUP = true;
+        TIMELINE_MIN_AGE = 1800;
+        TIMELINE_LIMIT_HOURLY = 24;
+        TIMELINE_LIMIT_DAILY = 31;
+        TIMELINE_LIMIT_WEEKLY = 8;
+        TIMELINE_LIMIT_MONTHLY = 0;
+        TIMELINE_LIMIT_YEARLY = 0;
+
+        # cleanup empty pre-post-pairs
+        EMPTY_PRE_POST_CLEANUP = true;
+      };
+    in
+    {
+      snapper.configs = lib.attrsets.mergeAttrsList (map (s: { "${s}" = default // { SUBVOLUME = "/mnt/razmo/${s}"; }; }) snapper_subvolumes);
+    };
+
+
+  systemd = {
+    services.bkp_rapido = {
+      description = "Make a snapshot of the SSD to the HDD";
+      before = [ "snapper-timeline.service" ];
+      serviceConfig = {
+        Type = "oneshot";
+        ExecStart = map (s: "${backup_app}/bin/backup-subvolume ${s}") backup_subvolumes;
+      };
+      # TODO Harden
+    };
+    timers.bkp_rapido = {
+      description = "Regular snapshot of SSD to HDD";
+      timerConfig = {
+        OnCalendar = "hourly";
+      };
+      wantedBy = [ "timers.target" ];
+    };
+  };
+}
diff --git a/curacao/dk.nix b/curacao/dk.nix
index fa2660b..62323c8 100644
--- a/curacao/dk.nix
+++ b/curacao/dk.nix
@@ -1,5 +1,4 @@
 { passwordFile ? "/should_not_be_needed_in_this_context", ... }:
-# FIXME Subvolumes for backup. If they're not created with the script. Add the script btw.
 # TODO Not relatime everywhere, thank you
 # TODO Default options
 let
diff --git a/curacao/os.nix b/curacao/os.nix
index b92c72c..9e9d2ea 100644
--- a/curacao/os.nix
+++ b/curacao/os.nix
@@ -5,6 +5,7 @@
     ./options.nix
     ./hardware.nix
     ./dk.nix
+    ./backup
   ];
 
   networking.hostName = "curacao";

From a46e7d7bca5d1fd3830997a715f650be03693520 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?=
 <geoffrey@frogeye.fr>
Date: Sat, 16 Dec 2023 22:39:11 +0100
Subject: [PATCH 16/24] Fix backlight

---
 curacao/options.nix                           |  7 ++-
 hm/desktop.nix                                |  6 ++-
 hm/style.nix                                  |  4 +-
 options.nix                                   |  9 ++--
 pindakaas/options.nix                         |  7 ++-
 .../roles/system/files/getty.service          |  2 -
 .../system/files/xorg/intel_backlight.conf    |  5 ---
 .../automatrop/roles/system/tasks/main.yml    | 43 -------------------
 8 files changed, 17 insertions(+), 66 deletions(-)
 delete mode 100644 unprocessed/config/automatrop/roles/system/files/getty.service
 delete mode 100644 unprocessed/config/automatrop/roles/system/files/xorg/intel_backlight.conf

diff --git a/curacao/options.nix b/curacao/options.nix
index f07bbbd..45ab31a 100644
--- a/curacao/options.nix
+++ b/curacao/options.nix
@@ -8,10 +8,9 @@
       numlock = true;
       phasesBrightness = {
         enable = true;
-        backlight = "intel_backlight";
-        jour = 40000;
-        crepuscule = 10000;
-        nuit = 1;
+        jour = "40000";
+        crepuscule = "10000";
+        nuit = "1";
       };
     };
     dev = {
diff --git a/hm/desktop.nix b/hm/desktop.nix
index 82250f0..4a3eb3c 100644
--- a/hm/desktop.nix
+++ b/hm/desktop.nix
@@ -148,6 +148,9 @@ in
                   "XF86AudioPrev" = "exec ${pkgs.mpc-cli}/bin/mpc prev";
                   "XF86AudioPlay" = "exec ${pkgs.mpc-cli}/bin/mpc toggle";
                   "XF86AudioNext" = "exec ${pkgs.mpc-cli}/bin/mpc next";
+                  # Backlight
+                  "XF86MonBrightnessUp" = "exec ${pkgs.brightnessctl}/bin/brightnessctl set +5%";
+                  "XF86MonBrightnessDown" = "exec ${pkgs.brightnessctl}/bin/brightnessctl set 5%-";
                   # Misc
                   "${mod}+F10" = "exec ${ pkgs.writeShellScript "show-keyboard-layout"
             ''
@@ -641,6 +644,8 @@ in
 
     home = {
       packages = with pkgs; [
+        pavucontrol # Because can't use Win+F1X on Pinebook 🙃
+
         # remote
         tigervnc
 
@@ -677,7 +682,6 @@ in
         xclip
         keynav
         xorg.xinit
-        xorg.xbacklight
         # TODO Make this clean. Service?
 
 
diff --git a/hm/style.nix b/hm/style.nix
index a98707b..29a212d 100644
--- a/hm/style.nix
+++ b/hm/style.nix
@@ -47,12 +47,12 @@ in
   dconf.enable = false; # Otherwise standalone home-manager complains it can't find /etc/dbus-1/session.conf on Arch.
   # Symlinking it to /usr/share/dbus-1/session.conf goes further but not much.
 
-  # TODO Use xbacklight instead (pindakaas doesn't seem to support it OOTB)
   home.packages = map
     (phase: (pkgs.writeShellApplication {
       name = "${phase.command}";
+      runtimeInputs = [ pkgs.brightnessctl ];
       text = (lib.optionalString cfg.enable ''
-        echo ${builtins.toString (builtins.getAttr phase.command cfg)} | sudo tee /sys/class/backlight/${cfg.backlight}/brightness
+        brightnessctl set ${builtins.getAttr phase.command cfg}
         '') + ''
         echo ${phase.polarity} > ${polarityFile}
         if command -v home-manager
diff --git a/options.nix b/options.nix
index 4b2a554..11a0552 100644
--- a/options.nix
+++ b/options.nix
@@ -7,7 +7,7 @@
       xorg = lib.mkEnableOption "Enable X11 support";
       numlock = lib.mkEnableOption "Auto-enable numlock";
       x11_screens = lib.mkOption {
-        default = ["UNSET1"];
+        default = [ "UNSET1" ];
         description = "A list of xrandr screen names from left to right.";
         type = lib.types.listOf lib.types.str;
       };
@@ -19,10 +19,9 @@
       };
       phasesBrightness = {
         enable = lib.mkEnableOption "Set a specific brightness for the screen when running phases commands";
-        backlight = lib.mkOption { type = lib.types.str; description = "Name of the backlight device"; };
-        jour = lib.mkOption { type = lib.types.int; description = "brightness value for phase: jour"; };
-        crepuscule = lib.mkOption { type = lib.types.int; description = "brightness value for phase: crepuscule"; };
-        nuit = lib.mkOption { type = lib.types.int; description = "brightness value for phase: nuit"; };
+        jour = lib.mkOption { type = lib.types.str; default = "100%"; description = "brightnessctl value for phase: jour"; };
+        crepuscule = lib.mkOption { type = lib.types.str; default = "50%"; description = "brightnessctl value for phase: crepuscule"; };
+        nuit = lib.mkOption { type = lib.types.str; default = "1%"; description = "brightnessctl value for phase: nuit"; };
       };
     };
     dev = {
diff --git a/pindakaas/options.nix b/pindakaas/options.nix
index 2f7df32..56b5eba 100644
--- a/pindakaas/options.nix
+++ b/pindakaas/options.nix
@@ -7,10 +7,9 @@
     maxVideoHeight = 720;
     phasesBrightness = {
       enable = true;
-      backlight = "edp-backlight";
-      jour = 3500;
-      crepuscule = 3000;
-      nuit = 700;
+      jour = "3500";
+      crepuscule = "3000";
+      nuit = "700";
     };
   };
 }
diff --git a/unprocessed/config/automatrop/roles/system/files/getty.service b/unprocessed/config/automatrop/roles/system/files/getty.service
deleted file mode 100644
index 1d6b77a..0000000
--- a/unprocessed/config/automatrop/roles/system/files/getty.service
+++ /dev/null
@@ -1,2 +0,0 @@
-[Service]
-ExecStartPre=/bin/sh -c 'setleds +num < /dev/%I'
diff --git a/unprocessed/config/automatrop/roles/system/files/xorg/intel_backlight.conf b/unprocessed/config/automatrop/roles/system/files/xorg/intel_backlight.conf
deleted file mode 100644
index 36f6eb5..0000000
--- a/unprocessed/config/automatrop/roles/system/files/xorg/intel_backlight.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-Section "Device"
-    Identifier  "Intel Graphics"
-    Driver      "intel"
-    Option      "Backlight"  "intel_backlight"
-EndSection
diff --git a/unprocessed/config/automatrop/roles/system/tasks/main.yml b/unprocessed/config/automatrop/roles/system/tasks/main.yml
index 002d579..4a012d1 100644
--- a/unprocessed/config/automatrop/roles/system/tasks/main.yml
+++ b/unprocessed/config/automatrop/roles/system/tasks/main.yml
@@ -1,28 +1,5 @@
 # Xorg configuration
 
-- name: Check if there is Intel backlight
-  ansible.builtin.stat:
-    path: /sys/class/backlight/intel_backlight
-  register: intel_backlight
-  when: display_server == 'x11'
-
-- name: Install Intel video drivers (Arch based)
-  community.general.pacman:
-    name: xf86-video-intel
-    # state: "{{ intel_backlight.stat.exists }}"
-    state: present
-  become: true
-  when: display_server == 'x11' and intel_backlight.stat.exists and arch_based
-  # TODO With software role? Would permit other distributions
-
-- name: Configure Xorg Intel backlight
-  ansible.builtin.copy:
-    src: xorg/intel_backlight.conf
-    dest: "{{ item }}/20-intel_backlight.conf"
-  become: true
-  when: display_server == 'x11' and intel_backlight.stat.exists
-  loop: "{{ xorg_common_config_dirs }}"
-
 - name: Configure Xorg joystick behaviour
   ansible.builtin.copy:
     src: xorg/joystick.conf
@@ -48,23 +25,3 @@
   vars:
     using_panfrost: "{{ 'panfrost' in (modules.content | b64decode) }}"
   notify: panfrost config changed
-
-# Numlock on boot
-
-- name: Set numlock on boot
-  ansible.builtin.copy:
-    src: getty.service
-    dest: /etc/systemd/system/getty@.service.d/override.conf
-  become: true
-  notify:
-    - systemd changed
-  when: auto_numlock
-
-- name: Unset numlock on boot
-  ansible.builtin.file:
-    path: /etc/systemd/system/getty@.service.d/override.conf
-    state: absent
-  become: true
-  notify:
-    - systemd changed
-  when: not auto_numlock

From 4a1d065554fd4bd9743708967293abedf6ba4cf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?=
 <geoffrey@frogeye.fr>
Date: Sat, 16 Dec 2023 23:43:01 +0100
Subject: [PATCH 17/24] Misc notes

---
 hm/common.nix  | 2 +-
 hm/desktop.nix | 3 ++-
 install_os.sh  | 8 +-------
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/hm/common.nix b/hm/common.nix
index e8922ed..7d31ae7 100644
--- a/hm/common.nix
+++ b/hm/common.nix
@@ -506,7 +506,7 @@ in
       (builtins.toString ./scripts)
     ];
     file = {
-      ".face" = {
+      ".face" = { # TODO Doesn't show on NixOS. See https://wiki.archlinux.org/title/LightDM#Changing_your_avatar ?
         source = pkgs.runCommand "face.png" { } "${pkgs.inkscape}/bin/inkscape ${./face.svg} -w 1024 -o $out";
       };
     };
diff --git a/hm/desktop.nix b/hm/desktop.nix
index 4a3eb3c..68e5d91 100644
--- a/hm/desktop.nix
+++ b/hm/desktop.nix
@@ -37,7 +37,7 @@ in
               # lockColors = with config.lib.stylix.colors.withHashtag; { a = base00; b = base01; d = base00; }; # Black or White, depending on current theme
               # lockColors = with config.lib.stylix.colors.withHashtag; { a = base0A; b = base0B; d = base00; }; # Green + Yellow
               lockColors = { a = "#82a401"; b = "#466c01"; d = "#648901"; }; # Old
-              lockSvg = pkgs.writeText "lock.svg" "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 50 50\" height=\"50\" width=\"50\"><path fill=\"${lockColors.a}\" d=\"M0 50h50V0H0z\"/><path d=\"M0 0l50 50H25L0 25zm50 0v25L25 0z\" fill=\"${lockColors.d}\"/></svg>";
+              lockSvg = pkgs.writeText "lock.svg" "<svg xmlns=\"http://www.w3.org/2000/svg\" viewBox=\"0 0 50 50\" height=\"50\" width=\"50\"><path fill=\"${lockColors.a}\" d=\"M0 50h50V0H0z\"/><path d=\"M0 0l50 50H25L0 25zm50 0v25L25 0z\" fill=\"${lockColors.b}\"/></svg>";
               lockPng = pkgs.runCommand "lock.png" { } "${pkgs.imagemagick}/bin/convert ${lockSvg} $out";
               locker = pkgs.writeShellScript "i3-locker"
                 ''
@@ -48,6 +48,7 @@ in
 
                   ${pkgs.lightdm}/bin/dm-tool lock
                   # TODO Does that work for all DMs?
+                  # TODO Might want to use i3lock on NixOS configs still?
                   if [ $? -ne 0 ]; then
                       if [ -d ${config.xdg.cacheHome}/lockpatterns ]
                       then
diff --git a/install_os.sh b/install_os.sh
index 577e688..0091fa9 100755
--- a/install_os.sh
+++ b/install_os.sh
@@ -96,13 +96,6 @@ echo "{ ... }: { imports = [ ./hardware-configuration.nix ${nixos_config} ]; }"
 # Install NixOS! Or create a new generation.
 sudo nixos-install --no-root-password --root "$mountpoint"
 
-# Install dotfiles. Actually not needed by nixos-install since it doesn't rewrite global paths to the mountpoint.
-# Without it no nixos-rebuild from the system itself once installed though.
-# Should probably be replaced with something like git-sync
-# sudo mkdir -p $mountpoint/home/geoffrey/.config/
-# sudo cp -a ../dotfiles $mountpoint/home/geoffrey/.config/
-# sudo chown geoffrey:geoffrey $mountpoint/home/geoffrey -R
-
 set +x
 
 # Signal the installation is done!
@@ -113,3 +106,4 @@ echo "- Boot into the system"
 echo "- Transfer necessary private keys (or use ssh -A for testing)"
 echo "- Run git-sync-init"
 echo "- Check that the system can build itself"
+echo "- Change root and user password"

From b94e030619d7cfb25dc6f7c940421d9779c08577 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?=
 <geoffrey@frogeye.fr>
Date: Sat, 16 Dec 2023 23:55:14 +0100
Subject: [PATCH 18/24] Fix default browser

---
 hm/desktop.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hm/desktop.nix b/hm/desktop.nix
index 68e5d91..0c70590 100644
--- a/hm/desktop.nix
+++ b/hm/desktop.nix
@@ -542,7 +542,7 @@ in
     xdg = {
       mimeApps = {
         enable = true;
-        associations.added = {
+        defaultApplications = {
           "text/html" = "org.qutebrowser.qutebrowser.desktop";
           "x-scheme-handler/http" = "org.qutebrowser.qutebrowser.desktop";
           "x-scheme-handler/https" = "org.qutebrowser.qutebrowser.desktop";

From 6b00a19d0c79cb61e841d0b9576f91446642ae72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?=
 <geoffrey@frogeye.fr>
Date: Sun, 17 Dec 2023 12:37:41 +0100
Subject: [PATCH 19/24] Use specialisation to switch themes on NixOS

---
 hm/style.nix    | 9 ++++++---
 options.nix     | 5 +++++
 os/geoffrey.nix | 8 +++++++-
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/hm/style.nix b/hm/style.nix
index 29a212d..e73c6d1 100644
--- a/hm/style.nix
+++ b/hm/style.nix
@@ -3,7 +3,8 @@ let
   # Currently last commit in https://github.com/danth/stylix/pull/194
   stylix = builtins.fetchTarball "https://github.com/willemml/stylix/archive/2ed2b0086b41d582aca26e083c19c0e47c8991e3.tar.gz";
   polarityFile = "${config.xdg.stateHome}/theme_polarity";
-  polarity = if builtins.pathExists polarityFile then lib.strings.fileContents polarityFile else "light";
+  polarityFromFile = if builtins.pathExists polarityFile then lib.strings.fileContents polarityFile else "light";
+  polarity = if config.frogeye.polarity == "dynamic" then polarityFromFile else config.frogeye.polarity;
   phases = [
     { command = "jour"; polarity = "light"; }
     { command = "crepuscule"; polarity = "dark"; }
@@ -53,13 +54,15 @@ in
       runtimeInputs = [ pkgs.brightnessctl ];
       text = (lib.optionalString cfg.enable ''
         brightnessctl set ${builtins.getAttr phase.command cfg}
-        '') + ''
+      '') + ''
         echo ${phase.polarity} > ${polarityFile}
         if command -v home-manager
         then
             home-manager switch
         else
-            sudo nixos-rebuild switch
+            # In two steps to get the visual changes slightly earlier
+            sudo /nix/var/nix/profiles/system/specialisation/${phase.polarity}/bin/switch-to-configuration test
+            sudo /nix/var/nix/profiles/system/specialisation/${phase.polarity}/bin/switch-to-configuration boot
         fi
       '';
     })
diff --git a/options.nix b/options.nix
index 11a0552..0321786 100644
--- a/options.nix
+++ b/options.nix
@@ -3,6 +3,11 @@
   options.frogeye = {
     extra = lib.mkEnableOption "Big software";
     gaming = lib.mkEnableOption "Games";
+    polarity = lib.mkOption {
+      default = "dynamic";
+      description = "Whether to use light theme or dark theme.";
+      type = lib.types.enum [ "dynamic" "light" "dark" ];
+    };
     desktop = {
       xorg = lib.mkEnableOption "Enable X11 support";
       numlock = lib.mkEnableOption "Auto-enable numlock";
diff --git a/os/geoffrey.nix b/os/geoffrey.nix
index cd27181..c76dde6 100644
--- a/os/geoffrey.nix
+++ b/os/geoffrey.nix
@@ -1,4 +1,4 @@
-{ pkgs, config, ... }:
+{ pkgs, lib, config, ... }:
 {
   imports = [
     <home-manager/nixos>
@@ -32,6 +32,12 @@
     useGlobalPkgs = true;
   };
 
+  specialisation = {
+    dark.configuration.frogeye.polarity = "dark";
+    light.configuration.frogeye.polarity = "light";
+  };
+
+
   # Because everything is encrypted and I'm the only user, this is fine.
   services.xserver.displayManager.autoLogin.user = "geoffrey";
 }

From cb22f38d1ddc263ba3347d0e1b40a7a84dbbbac4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?=
 <geoffrey@frogeye.fr>
Date: Sun, 17 Dec 2023 15:10:13 +0100
Subject: [PATCH 20/24] changes from curacao on Sun Dec 17 03:10:13 PM CET 2023

---
 hm/scripts/ter | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/hm/scripts/ter b/hm/scripts/ter
index 01fbc3b..9fe1f59 100755
--- a/hm/scripts/ter
+++ b/hm/scripts/ter
@@ -2,6 +2,8 @@
 #! nix-shell -i python3 --pure
 #! nix-shell -p python3
 
+# vim: set filetype=python :
+
 import sys
 from math import inf
 
@@ -14,11 +16,11 @@ if N < 2:
     sys.exit(1)
 
 
-def trajet_str(a, b):
+def trajet_str(a: int, b: int) -> str:
     return f"{gares[a]} → {gares[b]}"
 
 
-def chemin_str(stack):
+def chemin_str(stack: list[int]) -> str:
     return ", ".join(
         [trajet_str(stack[i], stack[i + 1]) for i in range(len(stack) - 1)]
     )
@@ -26,7 +28,7 @@ def chemin_str(stack):
 
 # Demande des prix des trajets
 
-prices = dict()
+prices: dict[int, dict[int, float]] = dict()
 
 for i in range(N):
     for j in range(N - 1, i, -1):
@@ -50,7 +52,7 @@ maxiPrice = -inf
 maxiStack = None
 
 
-def register_path(stack):
+def register_path(stack: list[int]) -> None:
     price = sum([prices[stack[i]][stack[i + 1]] for i in range(len(stack) - 1)])
 
     global miniPrice, maxiPrice, miniStack, maxiStack
@@ -72,5 +74,7 @@ while stack[0] == 0:
     else:
         stack.append(stack[-1] + 1)
 
+assert miniStack
+assert maxiStack
 print(f"Prix minimum: {chemin_str(miniStack)} = {miniPrice:.2f} €")
 print(f"Prix maximum: {chemin_str(maxiStack)} = {maxiPrice:.2f} €")

From 99e141d863d05dbca2634bb5d2adf93f0235a79a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?=
 <geoffrey@frogeye.fr>
Date: Sun, 17 Dec 2023 22:38:44 +0100
Subject: [PATCH 21/24] changes from curacao on Sun Dec 17 10:38:44 PM CET 2023

---
 hm/common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hm/common.nix b/hm/common.nix
index 7d31ae7..7e67e5c 100644
--- a/hm/common.nix
+++ b/hm/common.nix
@@ -345,7 +345,7 @@ in
     };
     # TODO Doesn't activate units by default. For now, we'll consider this as a safety feature.
     git-sync = {
-      enable = true;
+      enable = false;
       repositories = {
         dotfiles = {
           path = "${config.xdg.configHome}/dotfiles";

From b7cea97b71a11b0deabedcd5176f9eb49d886e31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?=
 <geoffrey@frogeye.fr>
Date: Sun, 17 Dec 2023 22:39:56 +0100
Subject: [PATCH 22/24] changes from curacao on Sun Dec 17 10:39:56 PM CET 2023

---
 hm/common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hm/common.nix b/hm/common.nix
index 7e67e5c..1ec3e47 100644
--- a/hm/common.nix
+++ b/hm/common.nix
@@ -343,7 +343,7 @@ in
       enableZshIntegration = true;
       pinentryFlavor = "gtk2"; # Falls back to curses when needed
     };
-    # TODO Doesn't activate units by default. For now, we'll consider this as a safety feature.
+    # TODO Syncs a bit too often, also constantly asks for password, which is annoying.
     git-sync = {
       enable = false;
       repositories = {

From 6ba936fb61e02372ddb70c179f2053ec8f830330 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?=
 <geoffrey@frogeye.fr>
Date: Sun, 17 Dec 2023 22:40:01 +0100
Subject: [PATCH 23/24] changes from curacao on Sun Dec 17 10:40:01 PM CET 2023

---
 hm/common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hm/common.nix b/hm/common.nix
index 1ec3e47..b8c7121 100644
--- a/hm/common.nix
+++ b/hm/common.nix
@@ -343,7 +343,7 @@ in
       enableZshIntegration = true;
       pinentryFlavor = "gtk2"; # Falls back to curses when needed
     };
-    # TODO Syncs a bit too often, also constantly asks for password, which is annoying.
+    # TODO Syncs a bit too often, also constantly asks for passphrase, which is annoying.
     git-sync = {
       enable = false;
       repositories = {

From abd9447172d93f2003e1c1cd3cda0b7c0ed9aa88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?=
 <geoffrey@frogeye.fr>
Date: Sun, 17 Dec 2023 22:53:54 +0100
Subject: [PATCH 24/24] Use PATH-using names for common variables

Otherwise it uses the unwrapped package, which doesn't have the plugins
and stuff. Also if upgrade, environment variables don't get updated, so
it would use old stuff.
---
 hm/common.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/hm/common.nix b/hm/common.nix
index b8c7121..da45364 100644
--- a/hm/common.nix
+++ b/hm/common.nix
@@ -475,8 +475,8 @@ in
     ];
     sessionVariables = {
       # Favourite commands
-      PAGER = "${pkgs.less}/bin/less";
-      EDITOR = "${pkgs.neovim}/bin/nvim";
+      PAGER = "less";
+      EDITOR = "nvim";
 
       # Extra config
       BOOT9_PATH = "${config.xdg.dataHome}/citra-emu/sysdata/boot9.bin";
@@ -492,7 +492,7 @@ in
       YARN_DISABLE_SELF_UPDATE_CHECK = "true"; # This also disable the creation of a ~/.yarnrc file
     } // lib.optionalAttrs config.frogeye.desktop.xorg {
       # Favourite commands
-      VISUAL = "${pkgs.neovim}/bin/nvim";
+      VISUAL = "nvim";
       BROWSER = "${config.programs.qutebrowser.package}/bin/qutebrowser";
 
       # Extra config