hm/brightness/default.nix

@@ -6,11 +6,10 @@ let
     { command = "crepuscule"; specialisation = "dark"; }
     { command = "nuit"; specialisation = "dark"; }
   ];
-  mod = config.xsession.windowManager.i3.config.modifier;
 in
 {
   config = {
-    home.packages = (map
+    home.packages = map
       (phase: (pkgs.writeShellScriptBin phase.command ''
         switch="/nix/var/nix/profiles/system${lib.strings.optionalString (phase.specialisation != null) "/specialisation/${phase.specialisation}"}/bin/switch-to-configuration"
         if [ -x "$switch" ]
@@ -20,14 +19,10 @@ in
         fi
         ${builtins.getAttr phase.command config.frogeye.desktop.phasesCommands}
       ''))
-      phases) ++ (with pkgs; [
-        brightnessctl
-      ]);
+      phases;
     xsession.windowManager.i3.config.keybindings = {
-      XF86MonBrightnessUp = "exec ${pkgs.brightnessctl}/bin/brightnessctl set +5%";
-      XF86MonBrightnessDown = "exec ${pkgs.brightnessctl}/bin/brightnessctl set 5%-";
-      "${mod}+F6" = "exec ${pkgs.brightnessctl}/bin/brightnessctl set 1%-";
-      "${mod}+F7" = "exec ${pkgs.brightnessctl}/bin/brightnessctl set +1%";
+      "XF86MonBrightnessUp" = "exec ${pkgs.brightnessctl}/bin/brightnessctl set +5%";
+      "XF86MonBrightnessDown" = "exec ${pkgs.brightnessctl}/bin/brightnessctl set 5%-";
     };
   };
 }

hm/desktop/audio/default.nix

@@ -29,7 +29,7 @@ in
         "XF86AudioRaiseVolume" = "${pactl} set-sink-mute @DEFAULT_SINK@ false; ${pactl} set-sink-volume @DEFAULT_SINK@ +5%";
         "XF86AudioLowerVolume" = "${pactl} set-sink-mute @DEFAULT_SINK@ false; ${pactl} set-sink-volume @DEFAULT_SINK@ -5%";
         "XF86AudioMute" = "${pactl} set-sink-mute @DEFAULT_SINK@ true";
-        "${mod}+F8" = "${pactl} suspend-sink @DEFAULT_SINK@ 1; ${pactl} suspend-sink @DEFAULT_SINK@ 0"; # Re-synchronize bluetooth headset
+        "${mod}+F7" = "${pactl} suspend-sink @DEFAULT_SINK@ 1; ${pactl} suspend-sink @DEFAULT_SINK@ 0"; # Re-synchronize bluetooth headset
         "${mod}+F11" = "exec ${pkgs.pavucontrol}/bin/pavucontrol";
         "${mod}+F12" = "exec ${pkgs.pavucontrol}/bin/pavucontrol";
         # TODO Find pacmixer?

hm/extra.nix

@@ -41,11 +41,11 @@
     ] ++ lib.optionals config.frogeye.desktop.xorg [
 
       # multimedia editors
+      gimp
+      inkscape
       darktable
       puddletag
       audacity
-      xournalpp
-      krita
 
       # downloading
       transmission-qt

hm/shell/atuin.nix

@@ -1,19 +0,0 @@
-{ pkgs, lib, config, ... }:
-{
-  config = {
-    programs.atuin = {
-      enable = true;
-      enableBashIntegration = true;
-      enableZshIntegration = true;
-      settings = {
-        auto_sync = true;
-        sync_frequency = "5m";
-        sync_address = "https://atuin.frogeye.fr";
-        ctrl_n_shortcuts = true; # Cranberry uses Alt for i3
-      };
-      flags = [
-        "--disable-up-arrow"
-      ];
-    };
-  };
-}

hm/shell/default.nix

@@ -14,6 +14,7 @@ in
         historySize = 100000;
         historyFile = "${config.xdg.stateHome}/shell_history";
         historyFileSize = 100000;
+        # TODO Check out Atuin
         historyControl = [ "erasedups" "ignoredups" "ignorespace" ];
       };
       zsh = {
@@ -34,7 +35,4 @@ in
       };
     };
   };
-  imports = [
-    ./atuin.nix
-  ]; 
 }