diff --git a/config/ccache.conf b/config/ccache.conf
deleted file mode 100644
index ec8132c..0000000
--- a/config/ccache.conf
+++ /dev/null
@@ -1 +0,0 @@
-ccache_dir = $HOME/.cache/ccache
diff --git a/config/flake8 b/config/flake8
deleted file mode 100644
index b66470c..0000000
--- a/config/flake8
+++ /dev/null
@@ -1,3 +0,0 @@
-[flake8]
-# Compatibility with Black
-max-line-length = 88
diff --git a/config/gdbinit b/config/gdbinit
deleted file mode 100644
index 9569b3d..0000000
--- a/config/gdbinit
+++ /dev/null
@@ -1,3 +0,0 @@
-define hook-quit
-    set confirm off
-end
diff --git a/config/git/.gitignore b/config/git/.gitignore
deleted file mode 100644
index f5fff02..0000000
--- a/config/git/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-gitk
diff --git a/config/git/config b/config/git/config
deleted file mode 100644
index b99c120..0000000
--- a/config/git/config
+++ /dev/null
@@ -1,19 +0,0 @@
-[user]
-	name = Geoffrey “Frogeye” Preud'homme
-	email = geoffrey@frogeye.fr
-	signingkey = 0x8312C8CAC1BAC289
-[core]
-	editor = nvim
-	excludesfile = ~/.config/git/gitignore
-[push]
-	default = matching
-[alias]
-	git = !exec git
-[filter "lfs"]
-	clean = git-lfs clean -- %f
-	smudge = git-lfs smudge -- %f
-	process = git-lfs filter-process
-	required = true
-[pull]
-	ff = only
-
diff --git a/config/git/gitignore b/config/git/gitignore
deleted file mode 100644
index 97ef313..0000000
--- a/config/git/gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-*.swp
-*.swo
-*.ycm_extra_conf.py
-tags
-.mypy_cache
diff --git a/config/gtk-3.0/.gitignore b/config/gtk-3.0/.gitignore
deleted file mode 100644
index 7e1f6a7..0000000
--- a/config/gtk-3.0/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-bookmarks
diff --git a/config/gtk-3.0/settings.ini b/config/gtk-3.0/settings.ini
deleted file mode 100644
index 8d29faa..0000000
--- a/config/gtk-3.0/settings.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-[Settings]
-gtk-theme-name=Greenbird
-gtk-icon-theme-name=Faenza-Green
-gtk-font-name=Sans 10
-gtk-cursor-theme-size=0
-gtk-toolbar-style=GTK_TOOLBAR_BOTH
-gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
-gtk-button-images=1
-gtk-menu-images=1
-gtk-enable-event-sounds=1
-gtk-enable-input-feedback-sounds=1
-gtk-xft-antialias=1
-gtk-xft-hinting=1
-gtk-xft-hintstyle=hintslight
-gtk-xft-rgba=rgb
-gtk-cursor-theme-name=Menda-Cursor
diff --git a/config/iftoprc b/config/iftoprc
deleted file mode 100644
index 7867980..0000000
--- a/config/iftoprc
+++ /dev/null
@@ -1,61 +0,0 @@
-# interface: if
-# Sets the network interface to if.
-
-dns-resolution: yes
-# Controls reverse lookup of IP addresses.
-
-port-resolution: no
-# Controls conversion of port numbers to service names.
-
-# filter-code: bpf
-# Sets the filter code to bpf.
-
-show-bars: yes
-# Controls display of bar graphs.
-
-promiscuous: no
-# Puts the interface into promiscuous mode.
-
-port-display: on
-# Controls display of port numbers.
-
-link-local: yes
-# Determines displaying of link-local IPv6 addresses.
-
-hide-source: no
-# Hides source host names.
-
-hide-destination: no
-# Hides destination host names.
-
-use-bytes: yes
-# Use bytes for bandwidth display, rather than bits.
-
-sort: 10s
-# Sets which column is used to sort the display.
-
-line-display: two-line
-# Controls the appearance of each item in the display.
-
-show-totals: yes
-# Shows cumulative total for each item.
-
-log-scale: yes
-# Use a logarithmic scale for bar graphs.
-
-# max-bandwidth: bw
-# Fixes  the  maximum  for the bar graph scale to bw, e.g. "10M".
-# Note that the value has to always be in bits, regardless if the
-# option to display in bytes has been chosen.
-
-# net-filter: net/mask
-# Defines  an  IP  network boundary for determining packet direc‐
-# tion.
-
-# net-filter6: net6/mask6
-# Defines an IPv6 network boundary for determining packet  direc‐
-# tion.
-
-# screen-filter: regexp
-# Sets a regular expression to filter screen output.
-
diff --git a/config/nix/hm/common.nix b/config/nix/hm/common.nix
index 06c7859..af0a19e 100644
--- a/config/nix/hm/common.nix
+++ b/config/nix/hm/common.nix
@@ -134,7 +134,7 @@ in
         diff = "diff --color=auto";
         dmesg = "dmesg --ctime";
         wget = "wget --hsts-file ${config.xdg.cacheHome}/wget-hsts";
-      } // lib.attrsets.mergeAttrsList (map (p: {"${p}" = "HOME=${config.xdg.cacheHome}/junkhome ${p}";}) treatsHomeAsJunk);
+      } // lib.attrsets.mergeAttrsList (map (p: { "${p}" = "HOME=${config.xdg.cacheHome}/junkhome ${p}"; }) treatsHomeAsJunk);
       # 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;
@@ -250,6 +250,66 @@ in
         enableZshIntegration = true;
       };
       less.enable = true;
+      git = {
+        enable = true;
+        aliases = {
+          "git" = "!exec git"; # In case I write one too many git
+        };
+        ignores = [
+          "*.swp"
+          "*.swo"
+          "*.ycm_extra_conf.py"
+          "tags"
+          ".mypy_cache"
+        ];
+        lfs.enable = true;
+        signing = {
+          key = "0x8312C8CAC1BAC289"; # FIXME Only in extension
+          # TODO signByDefault?
+        };
+        userEmail = "geoffrey@frogeye.fr";
+        userName = "Geoffrey “Frogeye” Preud'homme";
+        extraConfig = {
+          core = {
+            editor = "nvim";
+          };
+          push = {
+            default = "matching";
+          };
+          pull = {
+            ff = "only";
+          };
+        };
+        # TODO Delta syntax highlighter... and other cool-looking options?
+      };
+      readline = {
+        enable = true;
+        variables = {
+          "bell-style" = "none";
+          "colored-completion-prefix" = true;
+          "colored-stats" = true;
+          "completion-ignore-case" = true;
+          "completion-query-items" = 200;
+          "editing-mode" = "vi";
+          "history-preserve-point" = true;
+          "history-size" = 10000;
+          "horizontal-scroll-mode" = false;
+          "mark-directories" = true;
+          "mark-modified-lines" = false;
+          "mark-symlinked-directories" = true;
+          "match-hidden-files" = true;
+          "menu-complete-display-prefix" = true;
+          "page-completions" = true;
+          "print-completions-horizontally" = false;
+          "revert-all-at-newline" = false;
+          "show-all-if-ambiguous" = true;
+          "show-all-if-unmodified" = true;
+          "show-mode-in-prompt" = true;
+          "skip-completed-text" = true;
+          "visible-stats" = false;
+        };
+        extraConfig = builtins.readFile ./inputrc;
+      };
     };
   services = {
     gpg-agent = {
@@ -262,6 +322,32 @@ in
       # FIXME For g extension, as base is not supposed to have private keys
     };
   };
+  xdg = {
+    configFile = {
+      # TODO Should be xdg.configFile
+      "ccache.conf" = {
+        text = "ccache_dir = ${config.xdg.cacheHome}/ccache";
+      };
+      "gdbinit" = {
+        text = ''
+          define hook-quit
+              set confirm off
+          end
+        '';
+      };
+      "iftoprc" = {
+        text = ''
+          port-resolution: no
+          promiscuous: no
+          port-display: on
+          link-local: yes
+          use-bytes: yes
+          show-totals: yes
+          log-scale: yes
+        '';
+      };
+    };
+  };
   home = {
     stateVersion = "23.05";
     language = {
@@ -276,7 +362,6 @@ in
       gnused
       gnutar
       openssl
-      git
       wget
       curl
       python3Packages.pip
diff --git a/config/inputrc b/config/nix/hm/inputrc
similarity index 52%
rename from config/inputrc
rename to config/nix/hm/inputrc
index b6fe014..8f5b381 100644
--- a/config/inputrc
+++ b/config/nix/hm/inputrc
@@ -1,27 +1,3 @@
-$include /etc/inputrc
-set bell-style none
-set colored-completion-prefix on
-set colored-stats on
-set completion-ignore-case on
-set completion-query-items 200
-set editing-mode vi
-set history-preserve-point on
-set history-size 10000
-set horizontal-scroll-mode off
-set mark-directories on
-set mark-modified-lines off
-set mark-symlinked-directories on
-set match-hidden-files on
-set menu-complete-display-prefix on
-set page-completions on
-set print-completions-horizontally off
-set revert-all-at-newline off
-set show-all-if-ambiguous on
-set show-all-if-unmodified on
-set show-mode-in-prompt on
-set skip-completed-text on
-set visible-stats off
-
 $if mode=vi
     # these are for vi-command mode
     set keymap vi-command
diff --git a/config/nix/hm/vim.nix b/config/nix/hm/vim.nix
index b2fa87e..89ce9e3 100644
--- a/config/nix/hm/vim.nix
+++ b/config/nix/hm/vim.nix
@@ -172,7 +172,10 @@ in
             enable = true;
             settings.plugins = {
               black.enabled = true;
-              flake8.enabled = true;
+              flake8 = {
+                enabled = true;
+                maxLineLength = 88; # Compatibility with Black
+              };
               isort.enabled = true;
               mccabe.enabled = true;
               pycodestyle.enabled = true;
diff --git a/config/j4status/config b/config/nix/unprocessed/config/j4status/config
similarity index 100%
rename from config/j4status/config
rename to config/nix/unprocessed/config/j4status/config
diff --git a/config/khal/config b/config/nix/unprocessed/config/khal/config
similarity index 100%
rename from config/khal/config
rename to config/nix/unprocessed/config/khal/config
diff --git a/config/khard/khard.conf b/config/nix/unprocessed/config/khard/khard.conf
similarity index 100%
rename from config/khard/khard.conf
rename to config/nix/unprocessed/config/khard/khard.conf
diff --git a/config/polybar/bars.ini b/config/nix/unprocessed/config/polybar/bars.ini
similarity index 100%
rename from config/polybar/bars.ini
rename to config/nix/unprocessed/config/polybar/bars.ini
diff --git a/config/polybar/bbswitch b/config/nix/unprocessed/config/polybar/bbswitch
similarity index 100%
rename from config/polybar/bbswitch
rename to config/nix/unprocessed/config/polybar/bbswitch
diff --git a/config/polybar/config b/config/nix/unprocessed/config/polybar/config
similarity index 100%
rename from config/polybar/config
rename to config/nix/unprocessed/config/polybar/config
diff --git a/config/polybar/config.ini b/config/nix/unprocessed/config/polybar/config.ini
similarity index 100%
rename from config/polybar/config.ini
rename to config/nix/unprocessed/config/polybar/config.ini
diff --git a/config/polybar/keystore b/config/nix/unprocessed/config/polybar/keystore
similarity index 100%
rename from config/polybar/keystore
rename to config/nix/unprocessed/config/polybar/keystore
diff --git a/config/polybar/launch.sh b/config/nix/unprocessed/config/polybar/launch.sh
similarity index 100%
rename from config/polybar/launch.sh
rename to config/nix/unprocessed/config/polybar/launch.sh
diff --git a/config/polybar/linuxmismatch b/config/nix/unprocessed/config/polybar/linuxmismatch
similarity index 100%
rename from config/polybar/linuxmismatch
rename to config/nix/unprocessed/config/polybar/linuxmismatch
diff --git a/config/polybar/modules.ini b/config/nix/unprocessed/config/polybar/modules.ini
similarity index 100%
rename from config/polybar/modules.ini
rename to config/nix/unprocessed/config/polybar/modules.ini
diff --git a/config/polybar/todo b/config/nix/unprocessed/config/polybar/todo
similarity index 100%
rename from config/polybar/todo
rename to config/nix/unprocessed/config/polybar/todo
diff --git a/config/todoman/todoman.conf b/config/nix/unprocessed/config/todoman/todoman.conf
similarity index 100%
rename from config/todoman/todoman.conf
rename to config/nix/unprocessed/config/todoman/todoman.conf
diff --git a/config/vdirsyncer/.dfrecur b/config/nix/unprocessed/config/vdirsyncer/.dfrecur
similarity index 100%
rename from config/vdirsyncer/.dfrecur
rename to config/nix/unprocessed/config/vdirsyncer/.dfrecur
diff --git a/config/vdirsyncer/config b/config/nix/unprocessed/config/vdirsyncer/config
similarity index 100%
rename from config/vdirsyncer/config
rename to config/nix/unprocessed/config/vdirsyncer/config