flake.lock

@@ -137,11 +137,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1704741201,
-        "narHash": "sha256-Y420NeqPWRSpxHpXsxhKILfTxT5exjtTgCgDwSpcEfU=",
+        "lastModified": 1704318910,
+        "narHash": "sha256-wOIJwAsnZhM0NlFRwYJRgO4Lldh8j9viyzwQXtrbNtM=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "f0a3425a7b173701922e7959d8bfb136ef53aa54",
+        "rev": "aef9a509db64a081186af2dc185654d78dc8e344",
         "type": "github"
       },
       "original": {
@@ -334,11 +334,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1704786394,
-        "narHash": "sha256-aJM0ln9fMGWw1+tjyl5JZWZ3ahxAA2gw2ZpZY/hkEMs=",
+        "lastModified": 1704632650,
+        "narHash": "sha256-83J/nd/NoLqo3vj0S0Ppqe8L+ijIFiGL6HNDfCCUD/Q=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "b34a6075e9e298c4124e35c3ccaf2210c1f3a43b",
+        "rev": "c478b3d56969006e015e55aaece4931f3600c1b2",
         "type": "github"
       },
       "original": {

hm/common.nix

@@ -336,8 +336,8 @@
     # TODO Session variables only get reloaded on login I think.
     sessionPath = [
       "${config.home.homeDirectory}/.local/bin"
-      "${config.home.homeDirectory}/.config/dotfiles/hm/scripts" # Not Nix path otherwise it gets converted into store,
-      # and then every time you want to modify a script you have to rebuild and re-login...
+      "${config.home.sessionVariables.GOPATH}"
+      (builtins.toString ./scripts)
     ];
     # TODO Way to automatically setup an home-manager install
   };

hm/dev/default.nix

@@ -1,8 +1,7 @@
 { pkgs, config, ... }: {
   imports = [
     ./c.nix
-    ./common.nix
-    ./go.nix
     ./python.nix
+    ./common.nix
   ];
 }

hm/dev/go.nix

@@ -1,19 +0,0 @@
-# Untested post-nix
-{ pkgs, lib, config, ... }:
-{
-  config = lib.mkIf config.frogeye.dev.go {
-    frogeye = {
-      direnv = {
-        GOPATH = "${config.xdg.cacheHome}/go";
-      };
-    };
-    home = {
-      packages = with pkgs; [
-        go
-      ];
-      sessionPath = [
-        "${config.home.sessionVariables.GOPATH}"
-      ];
-    };
-  };
-}

hm/homealone.nix

@@ -6,6 +6,7 @@
       direnv = {
         CARGOHOME = "${config.xdg.cacheHome}/cargo"; # There are config in there that we can version if one want
         DASHT_DOCSETS_DIR = "${config.xdg.cacheHome}/dash_docsets";
+        GOPATH = "${config.xdg.cacheHome}/go";
         GRADLE_USER_HOME = "${config.xdg.cacheHome}/gradle";
         MIX_ARCHIVES = "${config.xdg.cacheHome}/mix/archives";
         MONO_GAC_PREFIX = "${config.xdg.cacheHome}/mono";

hm/scripts/optimize

@@ -158,7 +158,8 @@ do
     echo Processing $music
 
     temp=$(mktemp --suffix .flac)
-    ffmpeg -y -i "$music" -compression_level 8 "$temp"
+    cp "$music" "$temp"
+    ffmpeg -8 -o "$temp"
     echo "→ Optimize done"
 
     replace "$temp" "$music"

hm/scripts/replayGain

@@ -1,9 +1,8 @@
 #!/usr/bin/env nix-shell
 #! nix-shell -i python3 --pure
-#! nix-shell -p python3 python3Packages.coloredlogs r128gain
+#! nix-shell -p python3 python3Packages.coloredlogs python3Packages.r128gain
 
 # TODO r128gain is not maintainted anymore
-# 24.05 rsgain replaces it, does the same job as I do with albums
 
 # Normalisation is done at the default of each program,
 # which is usually -89.0 dB

hm/scripts/updateCompressedMusic

@@ -1,6 +1,6 @@
 #!/usr/bin/env nix-shell
 #! nix-shell -i python3 --pure
-#! nix-shell -p python3 python3Packages.coloredlogs python3Packages.progressbar2 ffmpeg
+#! nix-shell -p python3 python3Packages.coloredlogs python3Packages.progresbar2 ffmpeg
 # pylint: disable=C0103
 
 import logging

options.nix

@@ -36,7 +36,6 @@
       c = lib.mkEnableOption "C/C++ dev stuff";
       docker = lib.mkEnableOption "Docker dev stuff";
       fpga = lib.mkEnableOption "FPGA dev stuff";
-      go = lib.mkEnableOption "Python dev stuff";
       perl = lib.mkEnableOption "Perl dev stuff";
       php = lib.mkEnableOption "PHP dev stuff";
       python = lib.mkEnableOption "Python dev stuff";