From bea69cd69be8a440e65cd2d53809d7d712876bf0 Mon Sep 17 00:00:00 2001 From: Jade Date: Tue, 30 Jan 2024 19:35:04 +0100 Subject: [PATCH 1/7] add mac build option --- justfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/justfile b/justfile index 57d9afb..0e2ed0b 100644 --- a/justfile +++ b/justfile @@ -8,3 +8,6 @@ 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 From b0c26aa4307619887fd6d1912cd9213674fc8dc3 Mon Sep 17 00:00:00 2001 From: Jade Date: Tue, 30 Jan 2024 19:46:36 +0100 Subject: [PATCH 2/7] make commit setup more compatible with multiple keys --- modules/git.nix | 113 ++++++++++++++++++++++++++---------------------- 1 file changed, 61 insertions(+), 52 deletions(-) diff --git a/modules/git.nix b/modules/git.nix index 870ac7a..b7033dd 100644 --- a/modules/git.nix +++ b/modules/git.nix @@ -1,57 +1,66 @@ -{...}: { - home-manager.users.jade = {pkgs, ...}: { - programs.git = { - enable = true; - userName = "Schrottkatze"; - userEmail = "git@schrottkatze.de"; - aliases = { - a = "add"; - c = "commit"; - ca = "commit --all"; - p = "push"; - pl = "pull"; - s = "status"; +{ + config, + lib, + ... +}: let + cfg = config.jade.git; +in { + options.jade.git.signingKey = lib.mkOption {type = lib.types.str;}; + config = { + home-manager.users.jade = {pkgs, ...}: { + programs.git = { + enable = true; + userName = "Schrottkatze"; + userEmail = "git@schrottkatze.de"; + aliases = { + a = "add"; + c = "commit"; + ca = "commit --all"; + p = "push"; + pl = "pull"; + s = "status"; + }; + signing = { + key = cfg.signingKey; + signByDefault = true; + }; }; - signing = { - key = "74F2 FE5F 55E9 0F54 7F98 3B84 8854 79FF F880 17D2"; - signByDefault = true; + 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,),)), + ) + ''; }; }; - 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,),)), - ) - ''; - }; }; } From 8cab1912c80915f2f9610f0f836b2f49a7c694db Mon Sep 17 00:00:00 2001 From: Jade Date: Tue, 30 Jan 2024 19:46:55 +0100 Subject: [PATCH 3/7] make touchscreen toggle now toggle the trackpad --- haskell/xmonad/xmonad.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haskell/xmonad/xmonad.hs b/haskell/xmonad/xmonad.hs index 3e4f439..4fed0fe 100644 --- a/haskell/xmonad/xmonad.hs +++ b/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=\"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"), + ((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"), -- Push window back into tiling ((modm .|. shiftMask, xK_space), withFocused $ windows . W.sink), -- Resize viewed windows to the correct size From 93052beaff21a8f877425c6042a181873c1fd8e5 Mon Sep 17 00:00:00 2001 From: Jade Date: Tue, 30 Jan 2024 19:47:11 +0100 Subject: [PATCH 4/7] update macbook config --- hosts/potatobook-g/configuration.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/hosts/potatobook-g/configuration.nix b/hosts/potatobook-g/configuration.nix index bf48281..8e7b326 100644 --- a/hosts/potatobook-g/configuration.nix +++ b/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; - zsh.enable = true; + git.signingKey = "08F0 E7C9 6941 84C2 D514 7F31 5621 290C A02C 7BD8"; }; fileSystems = { @@ -101,7 +101,6 @@ environment.systemPackages = with pkgs; [ android-tools - evremap ]; environment.pathsToLink = [ From f4cfd21eb896ed84c647bcf8c87ca31a72165ccd Mon Sep 17 00:00:00 2001 From: Jade Date: Tue, 30 Jan 2024 19:47:28 +0100 Subject: [PATCH 5/7] make brcm driver config absolute --- flake.lock | 6 +++--- flake.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 889c60d..a25a286 100644 --- a/flake.lock +++ b/flake.lock @@ -226,13 +226,13 @@ "mac-brcm-fw": { "flake": false, "locked": { - "lastModified": 1, + "lastModified": 1706552810, "narHash": "sha256-+kW8ogc6DykjMVlrr+3vWKs9ZUdJ9EW72LbY7k/Qvh4=", - "path": "./mac-brcm-fw", + "path": "/home/jade/nix-configs/mac-brcm-fw", "type": "path" }, "original": { - "path": "./mac-brcm-fw", + "path": "/home/jade/nix-configs/mac-brcm-fw", "type": "path" } }, diff --git a/flake.nix b/flake.nix index db7820e..17b61dd 100644 --- a/flake.nix +++ b/flake.nix @@ -10,7 +10,7 @@ }; nixos-hardware.url = "github:networkException/nixos-hardware/apple-t2-init"; mac-brcm-fw = { - url = "path:./mac-brcm-fw"; + url = "path:/home/jade/nix-configs/mac-brcm-fw"; flake = false; }; #mms.url = "github:mkaito/nixos-modded-minecraft-servers"; From aaedddb6c2d6f54d3a5a093f3f687dc6712b1b62 Mon Sep 17 00:00:00 2001 From: Jade Date: Tue, 30 Jan 2024 19:51:23 +0100 Subject: [PATCH 6/7] add noogle as search --- modules/desktop/firefox.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/modules/desktop/firefox.nix b/modules/desktop/firefox.nix index ab993df..87665e3 100644 --- a/modules/desktop/firefox.nix +++ b/modules/desktop/firefox.nix @@ -186,6 +186,19 @@ 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 = [ { From ad591635e0103eee9c2437e136050ea7c520f394 Mon Sep 17 00:00:00 2001 From: Jade Date: Tue, 30 Jan 2024 19:56:27 +0100 Subject: [PATCH 7/7] add alias for `xclip -selection c` --- other/config.nu | 1 + 1 file changed, 1 insertion(+) diff --git a/other/config.nu b/other/config.nu index 7493ad2..cda795c 100644 --- a/other/config.nu +++ b/other/config.nu @@ -817,3 +817,4 @@ alias gca = git commit --all; alias gp = git push; alias gl = git pull; alias gs = git status; +alias clip = xclip -selection c;