From bef634882ff5018b2933ee4555f5e56458354706 Mon Sep 17 00:00:00 2001
From: Julien Moutinho <julm@sourcephile.fr>
Date: Mon, 26 Jul 2021 16:58:06 +0200
Subject: [PATCH 01/16] linux: disable pstore since no backend works

See https://github.com/NixOS/nixpkgs/pull/124431#issuecomment-886766733
---
 hosts/oignon/hardware.nix | 17 ++++++++++-------
 hosts/patate/hardware.nix | 11 ++---------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/hosts/oignon/hardware.nix b/hosts/oignon/hardware.nix
index 6a23fda..e3fb249 100644
--- a/hosts/oignon/hardware.nix
+++ b/hosts/oignon/hardware.nix
@@ -57,19 +57,22 @@ boot.tmpOnTmpfs = true;
 boot.extraModulePackages = [
   #config.boot.kernelPackages.exfat-nofuse
 ];
+/*
+boot.loader.efi = {
+  canTouchEfiVariables = true;
+  efiSysMountPoint = "/boot/efi";
+};
+*/
+# No pstore backend available on this system.
+systemd.services.mount-pstore.enable = false;
 boot.loader.grub = {
   enable  = true;
   version = 2;
   device  = "/dev/disk/by-id/ata-Samsung_SSD_850_PRO_128GB_S1SMNSAFC36436X";
   configurationLimit = 3;
+
   #zfsSupport = true;
-  /*
-  efiSupport = true;
-  efi = {
-    canTouchEfiVariables = false;
-    efiSysMountPoint = "/boot/efi";
-  };
-  */
+  #efiSupport = true;
   #enableCryptodisk = true;
 };
 
diff --git a/hosts/patate/hardware.nix b/hosts/patate/hardware.nix
index 9da1dc6..f9c931a 100644
--- a/hosts/patate/hardware.nix
+++ b/hosts/patate/hardware.nix
@@ -32,20 +32,13 @@ boot.tmpOnTmpfs = true;
 boot.extraModulePackages = [
   #config.boot.kernelPackages.exfat-nofuse
 ];
+# No pstore backend available on this system.
+systemd.services.mount-pstore.enable = false;
 boot.loader.grub = {
   enable  = true;
   version = 2;
   device  = "/dev/disk/by-id/ata-CT250MX500SSD1_2004E2849DD1";
   configurationLimit = 3;
-  #zfsSupport = true;
-  /*
-  efiSupport = true;
-  efi = {
-    canTouchEfiVariables = false;
-    efiSysMountPoint = "/boot/efi";
-  };
-  */
-  #enableCryptodisk = true;
 };
 services.acpid = {
   enable = true;
-- 
2.44.1


From d73bc70321ebe110c3163e8ce3b502ed695a1966 Mon Sep 17 00:00:00 2001
From: Julien Moutinho <julm@sourcephile.fr>
Date: Mon, 26 Jul 2021 17:00:07 +0200
Subject: [PATCH 02/16] nix: cleanup by using autoOptimiseStore

---
 hosts/oignon.nix | 2 +-
 hosts/patate.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hosts/oignon.nix b/hosts/oignon.nix
index ba6e7a7..581963e 100644
--- a/hosts/oignon.nix
+++ b/hosts/oignon.nix
@@ -52,9 +52,9 @@ users.users.julm = {
 
 nix = {
   extraOptions = ''
-    auto-optimise-store = true
     secret-key-files = ${private}/${hostName}/nix/binary-cache/priv.pem
   '';
+  autoOptimiseStore = true;
   gc = {
     automatic = true;
     dates = "weekly";
diff --git a/hosts/patate.nix b/hosts/patate.nix
index d06d2e9..cd38e30 100644
--- a/hosts/patate.nix
+++ b/hosts/patate.nix
@@ -40,8 +40,8 @@ users.users.sevy = {
 
 nix = {
   extraOptions = ''
-    auto-optimise-store = true
   '';
+  autoOptimiseStore = true;
   gc = {
     automatic = true;
     dates = "weekly";
-- 
2.44.1


From 5b3c2e6b9783846be291e61ea8061e7ab6a0c95f Mon Sep 17 00:00:00 2001
From: Julien Moutinho <julm@sourcephile.fr>
Date: Tue, 27 Jul 2021 05:22:03 +0200
Subject: [PATCH 03/16] mastodon-archive: install on julm

---
 homes/julm.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/homes/julm.nix b/homes/julm.nix
index 969cda9..d401bbd 100644
--- a/homes/julm.nix
+++ b/homes/julm.nix
@@ -178,6 +178,7 @@ home.packages = [
   pkgs.lm_sensors
   pkgs.lsof
   pkgs.lsscsi
+  pkgs.mastodon-archive
   #pkgs.meli
   pkgs.miniupnpc
   pkgs.mosh
-- 
2.44.1


From e435773357a12c6ef17e6e132d570533680c5688 Mon Sep 17 00:00:00 2001
From: Julien Moutinho <julm@sourcephile.fr>
Date: Fri, 30 Jul 2021 18:33:41 +0200
Subject: [PATCH 04/16] julm: install tools

---
 homes/julm.nix          | 3 +++
 homes/softwares/mpv.nix | 1 +
 2 files changed, 4 insertions(+)

diff --git a/homes/julm.nix b/homes/julm.nix
index d401bbd..50683b1 100644
--- a/homes/julm.nix
+++ b/homes/julm.nix
@@ -169,6 +169,7 @@ home.packages = [
   pkgs.knot-dns
   pkgs.ldns
   pkgs.less
+  pkgs.lf
   pkgs.lftp
   pkgs.libfaketime
   pkgs.libidn
@@ -209,6 +210,7 @@ home.packages = [
   pkgs.rdfind
   pkgs.ripgrep
   pkgs.sanoid
+  pkgs.sdate
   pkgs.shellcheck
   pkgs.sipcalc
   pkgs.smartmontools
@@ -223,6 +225,7 @@ home.packages = [
   pkgs.thttpd
   pkgs.tig
   pkgs.tree
+  pkgs.unar
   pkgs.unzip
   pkgs.usbutils
   pkgs.utillinux
diff --git a/homes/softwares/mpv.nix b/homes/softwares/mpv.nix
index 6402553..b6c15fc 100644
--- a/homes/softwares/mpv.nix
+++ b/homes/softwares/mpv.nix
@@ -9,5 +9,6 @@ xdg.configFile."mpv/input.conf".text = ''
   # Volume normalization
   # See https://github.com/mpv-player/mpv/issues/3979
   Alt+a cycle-values af "dynaudnorm=f=75:g=25:n=0:p=0.58" "loudnorm" ""
+  Alt+f cycle video-unscaled
 '';
 }
-- 
2.44.1


From fc67639c1d4254cb63484cef1ec81244210e5f3f Mon Sep 17 00:00:00 2001
From: =?utf8?q?S=C3=A9verine=20Popek?= <severine.popek@autistici.org>
Date: Fri, 6 Aug 2021 15:30:03 +0200
Subject: [PATCH 05/16] patate: workaround firefox missing gtk3

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

diff --git a/homes/sevy.nix b/homes/sevy.nix
index a3482b8..f7c9daf 100644
--- a/homes/sevy.nix
+++ b/homes/sevy.nix
@@ -6,8 +6,10 @@ imports = [
 ];
 host.desktop =
   config.host.name == "patate";
+gtk.enable = config.host.desktop;
 programs.bash.enable = true;
-programs.firefox.enable = config.host.desktop;
+# error: attribute 'gtk3' missing
+#programs.firefox.enable = config.host.desktop;
 programs.git.enable = true;
 programs.git.package = pkgs.gitMinimal;
 programs.gpg.enable = true;
@@ -118,6 +120,7 @@ home.packages = [
   pkgs.djview
   pkgs.dmenu
   pkgs.evince
+  pkgs.firefox
   #pkgs.freecad
   pkgs.freeciv_gtk
   pkgs.geeqie
-- 
2.44.1


From 9f3eba8648273e4971f4891f1cc219891870a541 Mon Sep 17 00:00:00 2001
From: =?utf8?q?S=C3=A9verine=20Popek?= <severine.popek@autistici.org>
Date: Fri, 6 Aug 2021 16:00:22 +0200
Subject: [PATCH 06/16] patate: add wg-intra privateKey

---
 private/root/patate/wireguard/wg-intra/privateKey | Bin 0 -> 67 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100755 private/root/patate/wireguard/wg-intra/privateKey

diff --git a/private/root/patate/wireguard/wg-intra/privateKey b/private/root/patate/wireguard/wg-intra/privateKey
new file mode 100755
index 0000000000000000000000000000000000000000..8b1e3ee468a97c663bd7605b1643cd36945736f7
GIT binary patch
literal 67
zcmV-J0KESIM@dveQdv+`0PeSI5Y^O*h`J1^oAJ}`Wuw7ouwP#XCVh2+Z9eDgck%1A
ZYC~~s+KEP~ruafu#Bu&nYw@NzQ{zlMBG>=`

literal 0
HcmV?d00001

-- 
2.44.1


From 65cb3f84cc58777c3176f37536455ded728ccfc4 Mon Sep 17 00:00:00 2001
From: =?utf8?q?S=C3=A9verine=20Popek?= <severine.popek@autistici.org>
Date: Fri, 6 Aug 2021 16:15:19 +0200
Subject: [PATCH 07/16] patate: enable wg-intra

---
 hosts/patate.nix           |  1 +
 hosts/patate/wireguard.nix | 55 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+)
 create mode 100644 hosts/patate/wireguard.nix

diff --git a/hosts/patate.nix b/hosts/patate.nix
index cd38e30..e6c526f 100644
--- a/hosts/patate.nix
+++ b/hosts/patate.nix
@@ -6,6 +6,7 @@ imports = [
   ../profiles/security.nix
   patate/backup.nix
   patate/hardware.nix
+  patate/wireguard.nix
 ];
 
 home-manager.users.sevy = {
diff --git a/hosts/patate/wireguard.nix b/hosts/patate/wireguard.nix
new file mode 100644
index 0000000..d635c41
--- /dev/null
+++ b/hosts/patate/wireguard.nix
@@ -0,0 +1,55 @@
+{ pkgs, lib, config, hostName, private, ... }:
+let
+  domain = "sourcephile.fr";
+  iface = "wg-intra";
+  wg = config.networking.wireguard.interfaces.${iface};
+  peer = {
+    publicKey = "tE4fzqDrr7BgfOo9tWgGnpu3v0JRDEUZbJnm9e2F/GA=";
+    allowedIPs = [ "192.168.42.4/32" ];
+  };
+  peers = {
+    mermet = {
+      publicKey = "XbTEP2X71LBTjmdmySdiOpQJ+uIomcXvg1aiQGUtWBI=";
+      endpoint = "mermet.${domain}:43642";
+      endpointsUpdater.enable = true;
+      allowedIPs = [ "192.168.42.1/32" ];
+      persistentKeepalive = 25;
+      dynamicEndpointRefreshSeconds = 30 * 60;
+    };
+    losurdo = {
+      publicKey = "xsFFep3k8z0pXgUOz4aryOF8l/KPBSOd4WQA26BkXy0=";
+      #endpoint = "losurdo.${domain}:43642";
+      allowedIPs = [ "192.168.42.2/32" ];
+      persistentKeepalive = 25;
+    };
+  };
+  keyToUnitName = lib.replaceChars
+    [ "/" "-" " " "+" "=" ]
+    [ "-" "\\x2d" "\\x20" "\\x2b" "\\x3d" ];
+in
+{
+networking.firewall.extraCommands = ''
+  ip46tables -A nixos-fw -i ${iface} -p tcp -m tcp --dport 22 -j ACCEPT
+  ip46tables -A nixos-fw -i any -p udp -m udp --dport ${toString wg.listenPort} -j ACCEPT
+'';
+networking.wireguard.interfaces.${iface} = {
+  ips = peer.allowedIPs;
+  # Different from losurdo's listenPort to have them work behind the same NAT.
+  listenPort = 43644;
+  privateKeyFile = "${private}/${hostName}/wireguard/${iface}/privateKey";
+  peers = lib.attrValues peers;
+};
+networking.hosts = builtins.listToAttrs (lib.concatLists (lib.attrValues (lib.mapAttrs (peerName: peer:
+  map (ip: lib.nameValuePair (lib.removeSuffix "/32" ip) ["${peerName}.wg"]) peer.allowedIPs
+  ) peers)));
+/*
+systemd.services =
+  {
+    openssh = {
+      after = ["wireguard-${iface}.service"];
+      serviceConfig.Restart = "on-failure";
+    };
+  };
+services.openssh.listenAddresses = map (ip: {addr=lib.removeSuffix "/32" ip;}) peer.allowedIPs;
+*/
+}
-- 
2.44.1


From 103bbcf189c1c26899f9e16d694aca931a7c5ac2 Mon Sep 17 00:00:00 2001
From: Julien Moutinho <julm@sourcephile.fr>
Date: Thu, 12 Aug 2021 23:37:16 +0200
Subject: [PATCH 08/16] mutt: fix pgp_*

---
 homes/julm/mutt/autogeree.net/julm.maildir.conf  | 2 +-
 homes/julm/mutt/sourcephile.fr/julm.maildir.conf | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/homes/julm/mutt/autogeree.net/julm.maildir.conf b/homes/julm/mutt/autogeree.net/julm.maildir.conf
index f60d905..7e27bb1 100644
--- a/homes/julm/mutt/autogeree.net/julm.maildir.conf
+++ b/homes/julm/mutt/autogeree.net/julm.maildir.conf
@@ -1,5 +1,5 @@
-set hostname="autogeree.net"
 set realname="Julien Moutinho"
+set hostname="autogeree.net"
 set from="julm@$hostname"
 set pgp_default_key="@$from"
 set pgp_sign_as="@$from"
diff --git a/homes/julm/mutt/sourcephile.fr/julm.maildir.conf b/homes/julm/mutt/sourcephile.fr/julm.maildir.conf
index b011bf4..627cca6 100644
--- a/homes/julm/mutt/sourcephile.fr/julm.maildir.conf
+++ b/homes/julm/mutt/sourcephile.fr/julm.maildir.conf
@@ -1,8 +1,8 @@
+set realname="Julien Moutinho"
 set hostname="sourcephile.fr"
 set from="julm@$hostname"
-set realname="Julien Moutinho"
-set pgp_default_key= =$from
-set pgp_sign_as= =$from
+set pgp_default_key="@$from"
+set pgp_sign_as="@$from"
 unalternates *
 alternates ^(julm|julien\.moutinho)@sourcephile\.fr$ \
            ^(julm|julien\.moutinho)\+[^@]*@sourcephile\.fr$
-- 
2.44.1


From 6c1240865c75022a192e646e5692a84ec0498ca4 Mon Sep 17 00:00:00 2001
From: Julien Moutinho <julm@sourcephile.fr>
Date: Fri, 13 Aug 2021 01:23:52 +0200
Subject: [PATCH 09/16] gnupg: julm@sourcephile.fr: 0x2E3618DD0D087650 ->
 0xA58CD81C3863926F

---
 homes/julm.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/homes/julm.nix b/homes/julm.nix
index 50683b1..ff48cbf 100644
--- a/homes/julm.nix
+++ b/homes/julm.nix
@@ -55,15 +55,15 @@ programs.gpg.enable = true;
 home.file."${config.programs.gpg.homedir}/gpg.conf".text = ''
   # julm@autogeree.net
   trusted-key 0xD15AF7F467E8299B
-  # julm@sourcephile.fr
-  trusted-key 0x2E3618DD0D087650
+  # julm@sourcephile.fr (2021-08-12)
+  trusted-key 0xA58CD81C3863926F
 '';
 services.gpg-agent.enable = true;
 services.gpg-agent.sshKeys = [
   # julm@autogeree.net
   "D275EBA09C7E1FFBFB47F6EEF164E6D56FB24AB2"
-  # julm@sourcephile.fr
-  "123BF80054E9E9CE2BD7B899F07207665392B727"
+  # julm@sourcephile.fr (2021-08-12)
+  "3D94D14514F1EA2B6D62F1275D888897B082415D"
 ];
 programs.direnv.enable = true;
 programs.htop.enable = true;
-- 
2.44.1


From 8ff22985997002af1f8ba84416e0c73d7b0c3fef Mon Sep 17 00:00:00 2001
From: Julien Moutinho <julm@sourcephile.fr>
Date: Fri, 13 Aug 2021 01:37:10 +0200
Subject: [PATCH 10/16] doom-emacs: only on oignon for now

---
 homes/julm.nix              |  8 --------
 homes/julm/hosts/oignon.nix | 10 +++++++++-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/homes/julm.nix b/homes/julm.nix
index ff48cbf..e934c0a 100644
--- a/homes/julm.nix
+++ b/homes/julm.nix
@@ -12,14 +12,6 @@ host.server = lib.elem config.host.name [ "losurdo" "mermet" ];
 programs.bat.enable = true;
 programs.bash.enable = true;
 #programs.broot.enable = true;
-programs.doom-emacs = {
-  enable = true;
-  doomPrivateDir = julm/emacs;
-};
-services.emacs = {
-  enable = false;
-  package = config.programs.emacs.package;
-};
 programs.firefox = {
   enable = config.host.desktop;
   profiles =
diff --git a/homes/julm/hosts/oignon.nix b/homes/julm/hosts/oignon.nix
index 23c8709..9ea8968 100644
--- a/homes/julm/hosts/oignon.nix
+++ b/homes/julm/hosts/oignon.nix
@@ -1,9 +1,17 @@
 { pkgs, lib, config, ... }:
 {
 config = lib.mkIf (config.host.name == "oignon") {
-programs.gpg.homedir = "${config.home.homeDirectory}/documents/sec/.gnupg";
 programs.bash.shellAliases.riseup = "sudo ip netns exec riseup sudo -u $USER PULSE_SERVER=/run/user/$(id -u $USER)/pulse/native";
 programs.bash.shellAliases.firefox = "riseup firefox";
+programs.gpg.homedir = "${config.home.homeDirectory}/documents/sec/.gnupg";
+programs.doom-emacs = {
+  enable = true;
+  doomPrivateDir = ../emacs;
+};
+services.emacs = {
+  enable = false;
+  package = config.programs.emacs.package;
+};
 home.sessionVariables = {
   PASSWORD_STORE_DIR = "$HOME/documents/sec/.password-store";
 };
-- 
2.44.1


From 0ccc1496f0403d2a5af036b3958fe62abcd52eff Mon Sep 17 00:00:00 2001
From: Julien Moutinho <julm@sourcephile.fr>
Date: Fri, 13 Aug 2021 02:06:03 +0200
Subject: [PATCH 11/16] nix: pass hostName via specialArgs

---
 homes.nix                    |  1 +
 homes/julm.nix               | 13 ++++++-------
 homes/julm/hosts/losurdo.nix |  2 --
 homes/julm/hosts/mermet.nix  |  3 +++
 homes/julm/hosts/oignon.nix  |  2 --
 homes/options.nix            |  5 -----
 homes/sevy.nix               |  4 ++--
 hosts/oignon.nix             |  1 -
 hosts/patate.nix             |  1 -
 9 files changed, 12 insertions(+), 20 deletions(-)
 create mode 100644 homes/julm/hosts/mermet.nix

diff --git a/homes.nix b/homes.nix
index 453d094..8decd47 100644
--- a/homes.nix
+++ b/homes.nix
@@ -1,5 +1,6 @@
 # This file is only used when home-manager
 # is called manually, not when integrated into NixOS.
+# FIXME: how to pass hostName in modules' specialArgs?
 with builtins;
 { pkgs, lib, config, ... }:
 {
diff --git a/homes/julm.nix b/homes/julm.nix
index e934c0a..6629f68 100644
--- a/homes/julm.nix
+++ b/homes/julm.nix
@@ -1,14 +1,13 @@
-{ pkgs, lib, config, ... }:
+{ pkgs, lib, config, hostName, ... }:
 {
 imports = [
   ./softwares.nix
   ./options.nix
   julm/mutt.nix
-  julm/hosts/oignon.nix
-  julm/hosts/losurdo.nix
+  (import (julm/hosts + "/${hostName}.nix"))
 ];
-host.desktop = lib.elem config.host.name [ /*"losurdo"*/ "oignon" ];
-host.server = lib.elem config.host.name [ "losurdo" "mermet" ];
+host.desktop = lib.elem hostName [ /*"losurdo"*/ "oignon" ];
+host.server = lib.elem hostName [ "losurdo" "mermet" ];
 programs.bat.enable = true;
 programs.bash.enable = true;
 #programs.broot.enable = true;
@@ -59,7 +58,7 @@ services.gpg-agent.sshKeys = [
 ];
 programs.direnv.enable = true;
 programs.htop.enable = true;
-programs.irssi.enable = config.host.name == "mermet" || config.host.name == "losurdo";
+programs.irssi.enable = hostName == "mermet" || hostName == "losurdo";
 programs.irssi.extraConfig = builtins.readFile julm/irssi/config;
 home.file.".irssi/passwd".text = ''
   FreeNode   : ${pkgs.pass}/bin/pass freenode.net/irc/julm
@@ -88,7 +87,7 @@ programs.git = {
   signing.key = "0x7182433A39582282929B2A222E3618DD0D087650";
   signing.signByDefault = false;
   package =
-    if lib.elem config.host.name [ "losurdo" "oignon" ]
+    if lib.elem hostName [ "losurdo" "oignon" ]
     then pkgs.gitFull
     else pkgs.gitMinimal;
   extraConfig = {
diff --git a/homes/julm/hosts/losurdo.nix b/homes/julm/hosts/losurdo.nix
index e322b46..3ff71c5 100644
--- a/homes/julm/hosts/losurdo.nix
+++ b/homes/julm/hosts/losurdo.nix
@@ -1,6 +1,5 @@
 { pkgs, lib, config, ... }:
 {
-config = lib.mkIf (config.host.name == "losurdo") {
 programs.bash.shellAliases.stig = "sudo ip netns exec riseup sudo -u $USER stig";
 services.gpg-agent.pinentryFlavor = lib.mkForce "curses";
 xsession.enable = true;
@@ -12,5 +11,4 @@ home.packages = [
   pkgs.pavucontrol
 ];
 services.screen-locker.inactiveInterval = 10; # minutes
-};
 }
diff --git a/homes/julm/hosts/mermet.nix b/homes/julm/hosts/mermet.nix
new file mode 100644
index 0000000..b2fa14c
--- /dev/null
+++ b/homes/julm/hosts/mermet.nix
@@ -0,0 +1,3 @@
+{ pkgs, lib, config, ... }:
+{
+}
diff --git a/homes/julm/hosts/oignon.nix b/homes/julm/hosts/oignon.nix
index 9ea8968..6c0bf35 100644
--- a/homes/julm/hosts/oignon.nix
+++ b/homes/julm/hosts/oignon.nix
@@ -1,6 +1,5 @@
 { pkgs, lib, config, ... }:
 {
-config = lib.mkIf (config.host.name == "oignon") {
 programs.bash.shellAliases.riseup = "sudo ip netns exec riseup sudo -u $USER PULSE_SERVER=/run/user/$(id -u $USER)/pulse/native";
 programs.bash.shellAliases.firefox = "riseup firefox";
 programs.gpg.homedir = "${config.home.homeDirectory}/documents/sec/.gnupg";
@@ -30,5 +29,4 @@ home.packages = [
   #pkgs.libva-utils
   #pkgs.sweethome3d.application
 ];
-};
 }
diff --git a/homes/options.nix b/homes/options.nix
index a3bad6f..29c5227 100644
--- a/homes/options.nix
+++ b/homes/options.nix
@@ -2,11 +2,6 @@
 with builtins;
 {
 options.host = {
-  name = lib.mkOption {
-    type = lib.types.str;
-    default = head (match "([a-z0-9]*)\n?" (readFile "/etc/hostname"));
-    description = "hostname";
-  };
   hardware = lib.mkOption {
     type = with lib.types; listOf str;
     default = filter (x: isString x && x != "") (split "[ \n]+" (readFile
diff --git a/homes/sevy.nix b/homes/sevy.nix
index f7c9daf..016418b 100644
--- a/homes/sevy.nix
+++ b/homes/sevy.nix
@@ -1,11 +1,11 @@
-{ pkgs, lib, config, ... }:
+{ pkgs, lib, config, hostName, ... }:
 {
 imports = [
   ./softwares.nix
   ./options.nix
 ];
 host.desktop =
-  config.host.name == "patate";
+  hostName == "patate";
 gtk.enable = config.host.desktop;
 programs.bash.enable = true;
 # error: attribute 'gtk3' missing
diff --git a/hosts/oignon.nix b/hosts/oignon.nix
index 581963e..d731949 100644
--- a/hosts/oignon.nix
+++ b/hosts/oignon.nix
@@ -19,7 +19,6 @@ home-manager.users.julm = {
     ../homes/julm.nix
     inputs.nix-doom-emacs.hmModule
   ];
-  host.name = hostName;
   host.hardware = ["ThinkPad" "X201"];
 };
 systemd.services.home-manager-julm.postStart = ''
diff --git a/hosts/patate.nix b/hosts/patate.nix
index e6c526f..d0d28af 100644
--- a/hosts/patate.nix
+++ b/hosts/patate.nix
@@ -11,7 +11,6 @@ imports = [
 
 home-manager.users.sevy = {
   imports = [ ../homes/sevy.nix ];
-  host.name = hostName;
   host.hardware = ["ThinkPad" "X200"];
 };
 systemd.services.home-manager-julm.postStart = ''
-- 
2.44.1


From fdd4c93c887767202dceb78b1799a11bfa5d1318 Mon Sep 17 00:00:00 2001
From: Julien Moutinho <julm@sourcephile.fr>
Date: Fri, 13 Aug 2021 02:26:13 +0200
Subject: [PATCH 12/16] ranger: uninstall (lf is quicker)

---
 homes/julm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/homes/julm.nix b/homes/julm.nix
index 6629f68..d4df674 100644
--- a/homes/julm.nix
+++ b/homes/julm.nix
@@ -197,7 +197,7 @@ home.packages = [
   #pkgs.profanity
   pkgs.pv
   pkgs.qprint
-  pkgs.ranger
+  #pkgs.ranger
   pkgs.rdfind
   pkgs.ripgrep
   pkgs.sanoid
-- 
2.44.1


From fdeb8fc11dcae3a1a9af6ef0dd80a11d5a65a838 Mon Sep 17 00:00:00 2001
From: Julien Moutinho <julm@sourcephile.fr>
Date: Fri, 13 Aug 2021 04:58:29 +0200
Subject: [PATCH 13/16] nix: hostName passing to home-manager

---
 flake.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/flake.nix b/flake.nix
index 26f3580..f418c37 100644
--- a/flake.nix
+++ b/flake.nix
@@ -65,6 +65,11 @@ outputs = inputs: let
         {
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
+          home-manager.verbose = true;
+          home-manager.backupFileExtension = null;
+          home-manager.extraSpecialArgs = {
+            inherit hostName;
+          };
         }
       ];
     });
-- 
2.44.1


From 09c8b0bbde330fd8d7c272ca6218a076485e75f4 Mon Sep 17 00:00:00 2001
From: Julien Moutinho <julm@sourcephile.fr>
Date: Mon, 16 Aug 2021 09:36:13 +0200
Subject: [PATCH 14/16] oignon: enable some documentation

---
 homes/julm.nix   |  2 +-
 hosts/oignon.nix | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/homes/julm.nix b/homes/julm.nix
index d4df674..f80c0c7 100644
--- a/homes/julm.nix
+++ b/homes/julm.nix
@@ -79,7 +79,7 @@ programs.ssh.matchBlocks."lan.losurdo.sourcephile.fr" = {
 };
 programs.tmux.enable = true;
 programs.vim.enable = true;
-manual.manpages.enable = false;
+manual.manpages.enable = true;
 programs.git = {
   enable = true;
   userName = "Julien Moutinho";
diff --git a/hosts/oignon.nix b/hosts/oignon.nix
index d731949..ba5f137 100644
--- a/hosts/oignon.nix
+++ b/hosts/oignon.nix
@@ -67,7 +67,14 @@ nix = {
   binaryCaches = [ "https://nix-localcache.sourcephile.fr" ];
   binaryCachePublicKeys = [ "losurdo.sourcephile.fr-1:XGeaIE2AA2mZskSZ5bIDrfx53q+TDDWJOUEpZDX7los=" ];
 };
-documentation.enable = false;
+documentation = {
+  enable = true;
+  dev.enable = true;
+  doc.enable = true;
+  info.enable = false;
+  man.enable = true;
+  nixos.enable = false;
+};
 nix.sshServe = {
   enable = true;
   keys = [ (lib.readFile ../private/world/julm/losurdo/ssh.pub) ];
@@ -83,7 +90,6 @@ nixpkgs.config.allowUnfree = true;
 environment.etc."nixpkgs".source = pkgs.path;
 environment.etc."nixpkgs-overlays".source = inputs.self + "/nixpkgs";
 
-documentation.nixos.enable = true;
 time.timeZone = "Europe/Paris";
 i18n.defaultLocale = "fr_FR.UTF-8";
 console.font = "Lat2-Terminus16";
-- 
2.44.1


From 7edf7a828312d2798a703e465605e8e45e73b10d Mon Sep 17 00:00:00 2001
From: Julien Moutinho <julm@sourcephile.fr>
Date: Tue, 17 Aug 2021 18:52:11 +0200
Subject: [PATCH 15/16] julm: install nnn and reuse

---
 homes/julm.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/homes/julm.nix b/homes/julm.nix
index f80c0c7..b9821ac 100644
--- a/homes/julm.nix
+++ b/homes/julm.nix
@@ -156,6 +156,7 @@ home.packages = [
   pkgs.imagemagick
   pkgs.inetutils
   pkgs.ipfs
+  #pkgs.i7z
   pkgs.jq
   pkgs.knot-dns
   pkgs.ldns
@@ -180,6 +181,7 @@ home.packages = [
   pkgs.nix-prefetch-git
   pkgs.nixpkgs-review
   pkgs.nmon
+  pkgs.nnn
   pkgs.ntfs3g
   #pkgs.onionshare
   pkgs.openssl
@@ -197,6 +199,7 @@ home.packages = [
   #pkgs.profanity
   pkgs.pv
   pkgs.qprint
+  pkgs.reuse
   #pkgs.ranger
   pkgs.rdfind
   pkgs.ripgrep
-- 
2.44.1


From 3281845507a80f09bb11505d596088e7f0a06e03 Mon Sep 17 00:00:00 2001
From: Julien Moutinho <julm@sourcephile.fr>
Date: Sun, 22 Aug 2021 03:01:44 +0200
Subject: [PATCH 16/16] irssi: join #sr.ht

---
 homes/julm/irssi/config | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/homes/julm/irssi/config b/homes/julm/irssi/config
index 845e0f6..6d9a80f 100644
--- a/homes/julm/irssi/config
+++ b/homes/julm/irssi/config
@@ -125,7 +125,6 @@ channels = (
   { chatnet = "GeekNode"; name = "sourcephile"; autojoin = "yes"; },
   { chatnet = "Libera"; name = "conservancy"; autojoin = "yes"; },
   { chatnet = "Libera"; name = "haskell-beginners"; autojoin = "yes"; },
-  { chatnet = "Libera"; name = "haskell-blah"; autojoin = "yes"; },
   { chatnet = "Libera"; name = "haskell-docs"; autojoin = "no"; },
   { chatnet = "Libera"; name = "haskell-fr"; autojoin = "yes"; },
   { chatnet = "Libera"; name = "haskell-language-server"; autojoin = "no"; },
@@ -145,6 +144,7 @@ channels = (
   { chatnet = "Libera"; name = "PauLLA"; autojoin = "yes"; },
   { chatnet = "Libera"; name = "postfix"; autojoin = "yes"; },
   { chatnet = "Libera"; name = "sourcephile"; autojoin = "yes"; },
+  { chatnet = "Libera"; name = "sr.ht"; autojoin = "yes"; },
   { chatnet = "Libera"; name = "stupidities"; autojoin = "yes"; },
   { chatnet = "Libera"; name = "tetaneutral.net"; autojoin = "yes"; },
   { chatnet = "Libera"; name = "zfs"; autojoin = "yes"; },
@@ -314,6 +314,7 @@ ignores = (
       "#purescript",
       "#rezine",
       "#spectrum",
+      "#sr.ht",
       "#stupidities",
       "#tetaneutral.net",
       "#zfs",
@@ -330,7 +331,7 @@ windows = {
   6 = { items = ({type = "CHANNEL"; chat_type = "IRC"; name = "#gresille"; tag = "GeekNode"; }); };
   7 = { items = ({type = "CHANNEL"; chat_type = "IRC"; name = "#haskell"; tag = "OFTC"; }); };
   8 = { items = ({type = "CHANNEL"; chat_type = "IRC"; name = "#haskell-beginners"; tag = "Libera"; }); };
-  9 = { items = ({type = "CHANNEL"; chat_type = "IRC"; name = "#haskell-blah"; tag = "Libera"; }); };
+  9 = { items = ({type = "CHANNEL"; chat_type = "IRC"; name = "#sr.ht"; tag = "Libera"; }); };
   11 = { items = ({type = "CHANNEL"; chat_type = "IRC"; name = "#haskell-fr"; tag = "OFTC"; }); };
   12 = { items = ({type = "CHANNEL"; chat_type = "IRC"; name = "#haskell-offtopic"; tag = "Libera"; }); };
   13 = { items = ({type = "CHANNEL"; chat_type = "IRC"; name = "#haskell.nix"; tag = "Libera"; }); };
-- 
2.44.1