flake.lock

@@ -226,13 +226,13 @@
     "mac-brcm-fw": {
       "flake": false,
       "locked": {
-        "lastModified": 1706552810,
+        "lastModified": 1,
         "narHash": "sha256-+kW8ogc6DykjMVlrr+3vWKs9ZUdJ9EW72LbY7k/Qvh4=",
-        "path": "/home/jade/nix-configs/mac-brcm-fw",
+        "path": "./mac-brcm-fw",
         "type": "path"
       },
       "original": {
-        "path": "/home/jade/nix-configs/mac-brcm-fw",
+        "path": "./mac-brcm-fw",
         "type": "path"
       }
     },

flake.nix

@@ -10,7 +10,7 @@
     };
     nixos-hardware.url = "github:networkException/nixos-hardware/apple-t2-init";
     mac-brcm-fw = {
-      url = "path:/home/jade/nix-configs/mac-brcm-fw";
+      url = "path:./mac-brcm-fw";
       flake = false;
     };
     #mms.url = "github:mkaito/nixos-modded-minecraft-servers";

haskell/xmonad/xmonad.hs

@@ -44,7 +44,7 @@ myKeys conf@(XConfig {XMonad.modMask = modm}) =
       ((modm, xK_s), spawn "flameshot gui -c -p $HOME/Pictures/screenshots"),
       ((modm, xK_a), spawn "flameshot screen -c -p $HOME/Pictures/screenshots"),
       ((modm, xK_t), spawn "ocr-screenshot.sh"),
-      ((modm .|. shiftMask, xK_t), spawn "DEVICE=\"bcm5974\"; if [ $(xinput list-props \"$DEVICE\" | awk '/^\\tDevice Enabled \\([0-9]+\\):\\t[01]/ {print $NF}') = \"1\" ]; then xinput disable \"$DEVICE\"; else xinput enable \"$DEVICE\"; fi"),
+      ((modm .|. shiftMask, xK_t), spawn "DEVICE=\"MELF0410:00 1FD2:7007\"; if [ $(xinput list-props \"$DEVICE\" | awk '/^\\tDevice Enabled \\([0-9]+\\):\\t[01]/ {print $NF}') = \"1\" ]; then xinput disable \"$DEVICE\"; else xinput enable \"$DEVICE\"; fi"),
       -- Push window back into tiling
       ((modm .|. shiftMask, xK_space), withFocused $ windows . W.sink),
       -- Resize viewed windows to the correct size

hosts/potatobook-g/configuration.nix

@@ -49,11 +49,11 @@
       cloud.enable = true;
       social.enable = true;
       mail.enable = true;
-      gaming.enable = true;
-      evremap.enable = true;
     };
+    helix.enable = true;
+    zellij.enable = true;
     terminal.enable = true;
-    git.signingKey = "08F0 E7C9 6941 84C2 D514 7F31 5621 290C A02C 7BD8";
+    zsh.enable = true;
   };
 
   fileSystems = {
@@ -101,6 +101,7 @@
 
   environment.systemPackages = with pkgs; [
     android-tools
+    evremap
   ];
 
   environment.pathsToLink = [

justfile

@@ -8,6 +8,3 @@ build:
 
 update:
 	nix flake update --commit-lock-file
-
-build-mac:
-	sudo nixos-rebuild switch --flake . --impure --override-input mac-brcm-fw path:/home/jade/mac-brcm-fw --fast

modules/desktop/firefox.nix

@@ -186,19 +186,6 @@
               icon = "${pkgs.nixos-icons}/share/icons/hicolor/scalable/apps/nix-snowflake.svg";
               definedAliases = ["nxwk"];
             };
-            "Noogle" = {
-              urls = [
-                {
-                  template = "https://noogle.dev/q?term={searchTerms}";
-                  params = [
-                    {
-                      name = "q";
-                      value = "{searchTerms}";
-                    }
-                  ];
-                }
-              ];
-            };
             "lib.rs" = {
               urls = [
                 {

modules/git.nix

@@ -1,66 +1,57 @@
-{
+{...}: {
-  config,
+  home-manager.users.jade = {pkgs, ...}: {
-  lib,
+    programs.git = {
-  ...
+      enable = true;
-}: let
+      userName = "Schrottkatze";
-  cfg = config.jade.git;
+      userEmail = "git@schrottkatze.de";
-in {
+      aliases = {
-  options.jade.git.signingKey = lib.mkOption {type = lib.types.str;};
+        a = "add";
-  config = {
+        c = "commit";
-    home-manager.users.jade = {pkgs, ...}: {
+        ca = "commit --all";
-      programs.git = {
+        p = "push";
-        enable = true;
+        pl = "pull";
-        userName = "Schrottkatze";
+        s = "status";
-        userEmail = "git@schrottkatze.de";
-        aliases = {
-          a = "add";
-          c = "commit";
-          ca = "commit --all";
-          p = "push";
-          pl = "pull";
-          s = "status";
-        };
-        signing = {
-          key = cfg.signingKey;
-          signByDefault = true;
-        };
       };
-      programs.gitui = {
+      signing = {
-        enable = true;
+        key = "74F2 FE5F 55E9 0F54 7F98 3B84 8854 79FF F880 17D2";
-        keyConfig = ''
+        signByDefault = true;
-            (
-              open_help: Some(( code: F(1), modifiers: ( bits: 0,),)),
-
-              move_left: Some(( code: Char('h'), modifiers: ( bits: 0,),)),
-              move_right: Some(( code: Char('l'), modifiers: ( bits: 0,),)),
-              move_up: Some(( code: Char('k'), modifiers: ( bits: 0,),)),
-              move_down: Some(( code: Char('j'), modifiers: ( bits: 0,),)),
-
-              popup_up: Some(( code: Char('p'), modifiers: ( bits: 2,),)),
-              popup_down: Some(( code: Char('n'), modifiers: ( bits: 2,),)),
-              page_up: Some(( code: Char('b'), modifiers: ( bits: 2,),)),
-              page_down: Some(( code: Char('f'), modifiers: ( bits: 2,),)),
-              home: Some(( code: Char('g'), modifiers: ( bits: 0,),)),
-              end: Some(( code: Char('G'), modifiers: ( bits: 1,),)),
-              shift_up: Some(( code: Char('K'), modifiers: ( bits: 1,),)),
-              shift_down: Some(( code: Char('J'), modifiers: ( bits: 1,),)),
-
-              edit_file: Some(( code: Char('I'), modifiers: ( bits: 1,),)),
-
-              status_reset_item: Some(( code: Char('U'), modifiers: ( bits: 1,),)),
-
-              diff_reset_lines: Some(( code: Char('u'), modifiers: ( bits: 0,),)),
-              diff_stage_lines: Some(( code: Char('s'), modifiers: ( bits: 0,),)),
-
-              stashing_save: Some(( code: Char('w'), modifiers: ( bits: 0,),)),
-              stashing_toggle_index: Some(( code: Char('m'), modifiers: ( bits: 0,),)),
-
-              stash_open: Some(( code: Char('l'), modifiers: ( bits: 0,),)),
-
-              abort_merge: Some(( code: Char('M'), modifiers: ( bits: 1,),)),
-          )
-        '';
       };
     };
+    programs.gitui = {
+      enable = true;
+      keyConfig = ''
+          (
+            open_help: Some(( code: F(1), modifiers: ( bits: 0,),)),
+
+            move_left: Some(( code: Char('h'), modifiers: ( bits: 0,),)),
+            move_right: Some(( code: Char('l'), modifiers: ( bits: 0,),)),
+            move_up: Some(( code: Char('k'), modifiers: ( bits: 0,),)),
+            move_down: Some(( code: Char('j'), modifiers: ( bits: 0,),)),
+
+            popup_up: Some(( code: Char('p'), modifiers: ( bits: 2,),)),
+            popup_down: Some(( code: Char('n'), modifiers: ( bits: 2,),)),
+            page_up: Some(( code: Char('b'), modifiers: ( bits: 2,),)),
+            page_down: Some(( code: Char('f'), modifiers: ( bits: 2,),)),
+            home: Some(( code: Char('g'), modifiers: ( bits: 0,),)),
+            end: Some(( code: Char('G'), modifiers: ( bits: 1,),)),
+            shift_up: Some(( code: Char('K'), modifiers: ( bits: 1,),)),
+            shift_down: Some(( code: Char('J'), modifiers: ( bits: 1,),)),
+
+            edit_file: Some(( code: Char('I'), modifiers: ( bits: 1,),)),
+
+            status_reset_item: Some(( code: Char('U'), modifiers: ( bits: 1,),)),
+
+            diff_reset_lines: Some(( code: Char('u'), modifiers: ( bits: 0,),)),
+            diff_stage_lines: Some(( code: Char('s'), modifiers: ( bits: 0,),)),
+
+            stashing_save: Some(( code: Char('w'), modifiers: ( bits: 0,),)),
+            stashing_toggle_index: Some(( code: Char('m'), modifiers: ( bits: 0,),)),
+
+            stash_open: Some(( code: Char('l'), modifiers: ( bits: 0,),)),
+
+            abort_merge: Some(( code: Char('M'), modifiers: ( bits: 1,),)),
+        )
+      '';
+    };
   };
 }

other/config.nu

@@ -817,4 +817,3 @@ alias gca = git commit --all;
 alias gp = git push;
 alias gl = git pull;
 alias gs = git status;
-alias clip = xclip -selection c;