diff --git a/hm/common.nix b/hm/common.nix
index 1d9f92d..94ef5b3 100644
--- a/hm/common.nix
+++ b/hm/common.nix
@@ -349,7 +349,7 @@ in
     };
   services = {
     gpg-agent = {
-      enable = true;
+      enable = true; # TODO Consider not enabling it when not having any private key
       enableBashIntegration = true;
       enableZshIntegration = true;
       pinentryFlavor = "gtk2"; # Falls back to curses when needed
@@ -495,7 +495,7 @@ in
     sessionPath = [
       "${config.home.homeDirectory}/.local/bin"
       "${config.home.sessionVariables.GOPATH}"
-      "${config.frogeye.dotfiles.path}/scripts"
+      (builtins.toString ./scripts)
     ];
     file = {
       ".face" = {
diff --git a/scripts/.bsh/bashrc b/hm/scripts/.bsh/bashrc
similarity index 100%
rename from scripts/.bsh/bashrc
rename to hm/scripts/.bsh/bashrc
diff --git a/scripts/.bsh/bashrc_unsortable b/hm/scripts/.bsh/bashrc_unsortable
similarity index 100%
rename from scripts/.bsh/bashrc_unsortable
rename to hm/scripts/.bsh/bashrc_unsortable
diff --git a/scripts/.bsh/inputrc b/hm/scripts/.bsh/inputrc
similarity index 100%
rename from scripts/.bsh/inputrc
rename to hm/scripts/.bsh/inputrc
diff --git a/scripts/.bsh/vimrc b/hm/scripts/.bsh/vimrc
similarity index 100%
rename from scripts/.bsh/vimrc
rename to hm/scripts/.bsh/vimrc
diff --git a/scripts/.gitignore b/hm/scripts/.gitignore
similarity index 100%
rename from scripts/.gitignore
rename to hm/scripts/.gitignore
diff --git a/scripts/archive b/hm/scripts/archive
similarity index 100%
rename from scripts/archive
rename to hm/scripts/archive
diff --git a/scripts/bsh b/hm/scripts/bsh
similarity index 100%
rename from scripts/bsh
rename to hm/scripts/bsh
diff --git a/scripts/cached_pass b/hm/scripts/cached_pass
similarity index 100%
rename from scripts/cached_pass
rename to hm/scripts/cached_pass
diff --git a/scripts/camera_name_date b/hm/scripts/camera_name_date
similarity index 100%
rename from scripts/camera_name_date
rename to hm/scripts/camera_name_date
diff --git a/scripts/cleandev b/hm/scripts/cleandev
similarity index 100%
rename from scripts/cleandev
rename to hm/scripts/cleandev
diff --git a/scripts/compressPictureMovies b/hm/scripts/compressPictureMovies
similarity index 100%
rename from scripts/compressPictureMovies
rename to hm/scripts/compressPictureMovies
diff --git a/scripts/crepuscule b/hm/scripts/crepuscule
similarity index 100%
rename from scripts/crepuscule
rename to hm/scripts/crepuscule
diff --git a/scripts/docker-image-childs b/hm/scripts/docker-image-childs
similarity index 100%
rename from scripts/docker-image-childs
rename to hm/scripts/docker-image-childs
diff --git a/scripts/docker-rm b/hm/scripts/docker-rm
similarity index 100%
rename from scripts/docker-rm
rename to hm/scripts/docker-rm
diff --git a/scripts/dummy b/hm/scripts/dummy
similarity index 100%
rename from scripts/dummy
rename to hm/scripts/dummy
diff --git a/scripts/emergency-clean b/hm/scripts/emergency-clean
similarity index 100%
rename from scripts/emergency-clean
rename to hm/scripts/emergency-clean
diff --git a/scripts/gitCheckoutModes b/hm/scripts/gitCheckoutModes
similarity index 100%
rename from scripts/gitCheckoutModes
rename to hm/scripts/gitCheckoutModes
diff --git a/scripts/gitghost b/hm/scripts/gitghost
similarity index 100%
rename from scripts/gitghost
rename to hm/scripts/gitghost
diff --git a/scripts/jour b/hm/scripts/jour
similarity index 100%
rename from scripts/jour
rename to hm/scripts/jour
diff --git a/scripts/lestrte b/hm/scripts/lestrte
similarity index 100%
rename from scripts/lestrte
rename to hm/scripts/lestrte
diff --git a/scripts/letrtes b/hm/scripts/letrtes
similarity index 100%
rename from scripts/letrtes
rename to hm/scripts/letrtes
diff --git a/scripts/lip b/hm/scripts/lip
similarity index 100%
rename from scripts/lip
rename to hm/scripts/lip
diff --git a/scripts/lorem b/hm/scripts/lorem
similarity index 100%
rename from scripts/lorem
rename to hm/scripts/lorem
diff --git a/scripts/mediaDuration b/hm/scripts/mediaDuration
similarity index 100%
rename from scripts/mediaDuration
rename to hm/scripts/mediaDuration
diff --git a/scripts/music_remove_dashes b/hm/scripts/music_remove_dashes
similarity index 100%
rename from scripts/music_remove_dashes
rename to hm/scripts/music_remove_dashes
diff --git a/scripts/nuit b/hm/scripts/nuit
similarity index 100%
rename from scripts/nuit
rename to hm/scripts/nuit
diff --git a/scripts/o b/hm/scripts/o
similarity index 100%
rename from scripts/o
rename to hm/scripts/o
diff --git a/scripts/optimize b/hm/scripts/optimize
similarity index 100%
rename from scripts/optimize
rename to hm/scripts/optimize
diff --git a/scripts/overpdf b/hm/scripts/overpdf
similarity index 100%
rename from scripts/overpdf
rename to hm/scripts/overpdf
diff --git a/scripts/pdfpages b/hm/scripts/pdfpages
similarity index 100%
rename from scripts/pdfpages
rename to hm/scripts/pdfpages
diff --git a/scripts/pdfrename b/hm/scripts/pdfrename
similarity index 100%
rename from scripts/pdfrename
rename to hm/scripts/pdfrename
diff --git a/scripts/picture_name_date b/hm/scripts/picture_name_date
similarity index 100%
rename from scripts/picture_name_date
rename to hm/scripts/picture_name_date
diff --git a/scripts/pushToTalk b/hm/scripts/pushToTalk
similarity index 100%
rename from scripts/pushToTalk
rename to hm/scripts/pushToTalk
diff --git a/scripts/raw_move_precomp b/hm/scripts/raw_move_precomp
similarity index 100%
rename from scripts/raw_move_precomp
rename to hm/scripts/raw_move_precomp
diff --git a/scripts/rep b/hm/scripts/rep
similarity index 100%
rename from scripts/rep
rename to hm/scripts/rep
diff --git a/scripts/replayGain b/hm/scripts/replayGain
similarity index 100%
rename from scripts/replayGain
rename to hm/scripts/replayGain
diff --git a/scripts/rmf b/hm/scripts/rmf
similarity index 100%
rename from scripts/rmf
rename to hm/scripts/rmf
diff --git a/scripts/rssVideos b/hm/scripts/rssVideos
similarity index 100%
rename from scripts/rssVideos
rename to hm/scripts/rssVideos
diff --git a/scripts/smtpdummy b/hm/scripts/smtpdummy
similarity index 100%
rename from scripts/smtpdummy
rename to hm/scripts/smtpdummy
diff --git a/scripts/spongebob b/hm/scripts/spongebob
similarity index 100%
rename from scripts/spongebob
rename to hm/scripts/spongebob
diff --git a/scripts/syncthingRestore b/hm/scripts/syncthingRestore
similarity index 100%
rename from scripts/syncthingRestore
rename to hm/scripts/syncthingRestore
diff --git a/scripts/tagCreatorPhotos b/hm/scripts/tagCreatorPhotos
similarity index 100%
rename from scripts/tagCreatorPhotos
rename to hm/scripts/tagCreatorPhotos
diff --git a/scripts/ter b/hm/scripts/ter
similarity index 100%
rename from scripts/ter
rename to hm/scripts/ter
diff --git a/scripts/unziptree b/hm/scripts/unziptree
similarity index 100%
rename from scripts/unziptree
rename to hm/scripts/unziptree
diff --git a/scripts/updateCompressedMusic b/hm/scripts/updateCompressedMusic
similarity index 100%
rename from scripts/updateCompressedMusic
rename to hm/scripts/updateCompressedMusic
diff --git a/scripts/videoQuota b/hm/scripts/videoQuota
similarity index 100%
rename from scripts/videoQuota
rename to hm/scripts/videoQuota
diff --git a/scripts/wttr b/hm/scripts/wttr
similarity index 100%
rename from scripts/wttr
rename to hm/scripts/wttr
diff --git a/options.nix b/options.nix
index 0242b89..995cffa 100644
--- a/options.nix
+++ b/options.nix
@@ -18,15 +18,6 @@
       fpga = lib.mkEnableOption "FPGA dev stuff";
       python = lib.mkEnableOption "Python dev stuff";
     };
-    dotfiles = {
-      path = lib.mkOption {
-        type = lib.types.str;
-        description = "Absolute path to the present dotfiles directory";
-        # default = "${config.home.homeDirectory}/.config/dotfiles";
-        # FIXME Above doesn't work outside home-manager context
-        default = "/home/geoffrey/.config/dotfiles";
-      };
-    };
   };
 
   config = {