Recnofigure tiny-dfr a little

flake.nix

@@ -218,7 +218,7 @@
             modules = [
               nixos-apple-silicon.nixosModules.apple-silicon-support
               ./nixos/machines/foxhut/hardware.nix
-              (import ./nixos/machines/foxhut/boot.nix { inherit pkgs asahi-firmware; })
+              (import ./nixos/machines/foxhut/boot.nix { inherit pkgs pkgs-unstable asahi-firmware; })
               base
               networking
               graphical

home/common.nix

@@ -35,7 +35,8 @@ in rec {
     gleam erlang
     ghc
     ( python311.withPackages (ps: with ps; [
-      numpy matplotlib sympy scipy pandas jupyter
+      numpy matplotlib sympy scipy pandas jupyter soundfile
+      pygame
       # pwntools
       z3 tqdm
       pyusb usbtmc

nixos/base.nix

@@ -65,6 +65,8 @@
     binutils
     coreutils
 
+    lsof file traceroute
+
     home-manager
     git # for home-manager
   ];

nixos/graphical.nix

@@ -60,5 +60,8 @@ in
     thunderbird
     glxinfo
     start-plasma-shortcut
+    remmina
+    libreoffice
+    kicad-small
   ];
 }

nixos/kblayouts/fox-symbols.xkb

@@ -1,6 +1,6 @@
 default
 xkb_symbols "fox" {
-  key <TLDE> {[ U1F408,      U1F431,       U1F408,       U1F431       ]};
+  key <TLDE> {[ comma,       semicolon,    VoidSymbol,   VoidSymbol   ]};
   key <AE01> {[ 1,           ampersand,    VoidSymbol,   VoidSymbol   ]};
   key <AE02> {[ 2,           quotedbl,     at,           VoidSymbol   ]};
   key <AE03> {[ 3,           numbersign,   VoidSymbol,   VoidSymbol   ]};

nixos/machines/foxhut/boot.nix

@@ -2,7 +2,7 @@
 # your system. Help is available in the configuration.nix(5) man page, on
 # https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
 
-{ pkgs, asahi-firmware, ... }:
+{ pkgs, pkgs-unstable, asahi-firmware, ... }:
 { config, ... }:
 
 {
@@ -27,5 +27,11 @@
     device = "/swap";
     size = 16 * 1024; # 16GB
   }];
+
+  environment.systemPackages = (with pkgs-unstable; [
+    renoise
+  ]) ++ (with pkgs; [
+    prismlauncher
+  ]);
 }
 

nixos/tiny-dfr.nix

@@ -1,7 +1,15 @@
 {
   pkgs,
-  tiny-dfr ? pkgs.tiny-dfr
 }:
+  let tiny-dfr = pkgs.tiny-dfr.overrideAttrs (old: {
+    src = pkgs.fetchFromGitHub {
+      owner = "xeniagda";
+      repo = "tiny-dfr";
+      rev = "master";
+      hash = "sha256-I2R28wQz4Vd8VonbDcM6TZOn5lnWSXqwX4w/sieaQL8=";
+    };
+  });
+in
   assert tiny-dfr.version == "0.3.1";
 {
   services.udev.packages = [ tiny-dfr ];
@@ -17,6 +25,7 @@
       ExecStart = "${tiny-dfr}/bin/tiny-dfr";
       Restart = "always";
     };
+    restartIfChanged = true;
   };
   environment.etc."tiny-dfr/next-workspace.svg".source = ./tiny-dfr-icons/next-workspace.svg;
   environment.etc."tiny-dfr/prev-workspace.svg".source = ./tiny-dfr-icons/prev-workspace.svg;
@@ -37,8 +46,8 @@
     MediaLayerDefault = true;
 
     MediaLayerKeys = [
-      { Icon = "prev-workspace";  Action = "Finance"; } # bind me in the window manager!
+      { Icon = "prev-workspace";  Action = "Finance";        } # bind me in the window manager!
-      { Icon = "next-workspace";  Action = "Sport"; }   # bind me in the window manager!
+      { Icon = "next-workspace";  Action = "Sport";          }   # bind me in the window manager!
       { Icon = "brightness_low";  Action = "BrightnessDown"; }
       { Icon = "brightness_high"; Action = "BrightnessUp";   }
       { Icon = "backlight_low";   Action = "IllumDown";      }
@@ -51,18 +60,25 @@
       { Icon = "volume_up";       Action = "VolumeUp";       }
     ];
     PrimaryLayerKeys = [
-      { Text = "F1";  Action = "F1";       }
+      { Text = "F1";  Action = "F1";  }
-      { Text = "F2";  Action = "F2";       }
+      { Text = "F2";  Action = "F2";  }
-      { Text = "F3";  Action = "F3";       }
+      { Text = "F3";  Action = "F3";  }
-      { Text = "F4";  Action = "F4";       }
+      { Text = "F4";  Action = "F4";  }
-      { Text = "F5";  Action = "F5";       }
+      { Text = "F5";  Action = "F5";  }
-      { Text = "F6";  Action = "F6";       }
+      { Text = "F6";  Action = "F6";  }
-      { Text = "F7";  Action = "F7";       }
+      { Text = "F7";  Action = "F7";  }
-      { Text = "F8";  Action = "F8";       }
+      { Text = "F8";  Action = "F8";  }
-      { Text = "3";  Action = "Num3";       }
+      { Text = "3";  Action = "Num3"; }
-      { Text = "F10"; Action = "F10";      }
+      { Text = "F10"; Action = "F10"; }
-      { Text = "F11"; Action = "F11";      }
+      { Text = "F11"; Action = "F11"; }
-      { Text = "F12"; Action = "F12";      }
+      { Text = "F12"; Action = "F12"; }
     ];
+    ButtonStyle = {
+      InactiveColor = [0.05 0.0 0.1];
+      ActiveColor = [0.7 0.5 0.8];
+      OnTime = 0.03;
+      OffTime = 0.1;
+      Bounce = 5;
+    };
   };
 }