ctucx.git: nixfiles

cleanup

diff --git a/darwin-rebuild b/darwin-rebuild
@@ -1,2 +1,2 @@
 #!/usr/bin/env sh
-darwin-rebuild -I $(nix-build /Users/leah/nixfiles/nix/sources-dir.nix --no-out-link) "$@"
+darwin-rebuild -I "darwin-config=/Users/leah/nixfiles/darwin-configuration.nix" -I $(nix-build /Users/leah/nixfiles/nix/sources-dir.nix --no-out-link) "$@"

diff --git a/helpers/make-nixpkgs.nix b/helpers/make-nixpkgs.nix
@@ -18,7 +18,10 @@ let
       echo ${config.system.nixos.versionSuffix} | sed -e s/pre// > $out/nixpkgs/svn-revision
       date +%s > $out/last_updated
     '';
+
 in {
+
   environment.etc."src".source = nixSources;
   environment.variables.NIX_PATH = lib.mkOverride 25 "/etc/src:nixos-config=/etc/nixos/configuration.nix";
+
 }

diff --git a/machines/blechbuechse/keyboard.nix b/machines/blechbuechse/keyboard.nix
@@ -34,23 +34,10 @@ let
   pow      = base: exp: lib.foldl' (a: x: x * a) 1 (lib.genList (_: base) exp);
   hexToDec = v:
     let
-      hexToInt = {
-        "0" = 0; "1" = 1;  "2" = 2;
-        "3" = 3; "4" = 4;  "5" = 5;
-        "6" = 6; "7" = 7;  "8" = 8;
-        "9" = 9; "a" = 10; "b" = 11;
-        "c" = 12;"d" = 13; "e" = 14;
-        "f" = 15;
-      };
-      chars = lib.stringToCharacters v;
+      hexToInt = { "0" = 0; "1" = 1;  "2" = 2; "3" = 3; "4" = 4;  "5" = 5; "6" = 6; "7" = 7;  "8" = 8; "9" = 9; "a" = 10; "b" = 11; "c" = 12;"d" = 13; "e" = 14; "f" = 15; };
+      chars    = lib.stringToCharacters v;
       charsLen = lib.length chars;
-    in
-      lib.foldl
-        (a: v: a + v)
-        0
-        (lib.imap0
-          (k: v: hexToInt."${v}" * (pow 16 (charsLen - k - 1)))
-          chars);
+    in lib.foldl (a: v: a + v) 0 (lib.imap0 (k: v: hexToInt."${v}" * (pow 16 (charsLen - k - 1))) chars);
 
   commandList  = lib.forEach keyMappings (entry: ''hidutil property --matching '{"ProductID":0x${entry.ProductID}}' --set '{"UserKeyMapping":${builtins.toJSON entry.UserKeyMapping}}' > /dev/null'');
   launchAgents = lib.forEach keyMappings (entry: {

diff --git a/machines/blechbuechse/skhd.nix b/machines/blechbuechse/skhd.nix
@@ -85,7 +85,9 @@ in {
       lalt - 7 : yabai -m space --focus 7
       lalt - 8 : yabai -m space --focus 8
       lalt - 9 : yabai -m space --focus 9
-      # switch workspaces when SIP enabled (since yabai can't do it w/o scripting-additions). dont forget to enable the needed keybinds in system settings!
+
+      # switch between workspaces
+      # when SIP enabled (since yabai can't do it w/o scripting-additions). dont forget to enable the needed keybinds in system settings!
       #lalt - 1 : ${pkgs.skhd}/bin/skhd -k "ctrl - 1"
       #lalt - 2 : ${pkgs.skhd}/bin/skhd -k "ctrl - 2"
       #lalt - 3 : ${pkgs.skhd}/bin/skhd -k "ctrl - 3"

@@ -95,6 +97,7 @@ in {
       #lalt - 7 : ${pkgs.skhd}/bin/skhd -k "ctrl - 7"
       #lalt - 8 : ${pkgs.skhd}/bin/skhd -k "ctrl - 8"
       #lalt - 9 : ${pkgs.skhd}/bin/skhd -k "ctrl - 9"
+
       # go back to previous workspace (kind of like back_and_forth in i3)
       lalt - 0 : yabai -m space --focus recent