From 06f054fc3c14fd32b9bbd7124ae62a50fb2a0484 Mon Sep 17 00:00:00 2001 From: Tyler Mayoff Date: Thu, 12 Dec 2024 09:39:39 -0500 Subject: [PATCH] Updated things --- dot_config/flake/flake.lock | 64 +++++++-------------------- dot_config/flake/flake.nix | 2 +- dot_config/flake/home/common.nix | 4 +- dot_config/flake/home/fish.nix | 1 + dot_config/flake/home/hinge/hinge.nix | 18 +++++++- dot_config/flake/home/kitty.nix | 19 +++++++- 6 files changed, 54 insertions(+), 54 deletions(-) diff --git a/dot_config/flake/flake.lock b/dot_config/flake/flake.lock index d613a21..87959c8 100644 --- a/dot_config/flake/flake.lock +++ b/dot_config/flake/flake.lock @@ -19,24 +19,6 @@ "inputs": { "systems": "systems" }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, "locked": { "lastModified": 1726560853, "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", @@ -51,7 +33,7 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_2": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -69,16 +51,16 @@ "helix": { "inputs": { "crane": "crane", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nixpkgs": "nixpkgs", "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1733238479, - "narHash": "sha256-o5BT2ziQJzoXrqBz/iOIOGoxDTXYd5KiNF/7ncN81ao=", + "lastModified": 1733858674, + "narHash": "sha256-u5IFTMAd/z9xJLizanF+HPpYOppS+eLgsLgDr2oalL8=", "owner": "helix-editor", "repo": "helix", - "rev": "fa68bac391e576e659e306ce3fb2758d3ec68538", + "rev": "89a7cde2f05fbf2eae212d9301301a8377432be5", "type": "github" }, "original": { @@ -94,11 +76,11 @@ ] }, "locked": { - "lastModified": 1733175814, - "narHash": "sha256-zFOtOaqjzZfPMsm1mwu98syv3y+jziAq5DfWygaMtLg=", + "lastModified": 1733873195, + "narHash": "sha256-dTosiZ3sZ/NKoLKQ++v8nZdEHya0eTNEsaizNp+MUPM=", "owner": "nix-community", "repo": "home-manager", - "rev": "bf23fe41082aa0289c209169302afd3397092f22", + "rev": "f26aa4b76fb7606127032d33ac73d7d507d82758", "type": "github" }, "original": { @@ -109,7 +91,7 @@ }, "nixgl": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "nixpkgs": "nixpkgs_2" }, "locked": { @@ -144,11 +126,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1733212471, - "narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", + "lastModified": 1733759999, + "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", + "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", "type": "github" }, "original": { @@ -175,11 +157,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1733412085, - "narHash": "sha256-FillH0qdWDt/nlO6ED7h4cmN+G9uXwGjwmCnHs0QVYM=", + "lastModified": 1733808091, + "narHash": "sha256-KWwINTQelKOoQgrXftxoqxmKFZb9pLVfnRvK270nkVk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4dc2fc4e62dbf62b84132fe526356fbac7b03541", + "rev": "a0f3e10d94359665dba45b71b4227b0aeb851f8e", "type": "github" }, "original": { @@ -191,7 +173,6 @@ }, "root": { "inputs": { - "flake-utils": "flake-utils", "helix": "helix", "home-manager": "home-manager", "nixgl": "nixgl", @@ -234,21 +215,6 @@ "repo": "default", "type": "github" } - }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } } }, "root": "root", diff --git a/dot_config/flake/flake.nix b/dot_config/flake/flake.nix index a9f5f3e..6b2de32 100644 --- a/dot_config/flake/flake.nix +++ b/dot_config/flake/flake.nix @@ -9,7 +9,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; nixgl.url = "github:nix-community/nixGL"; - helix.url = "github:helix-editor/helix"; + # helix.url = "github:helix-editor/helix"; }; outputs = { diff --git a/dot_config/flake/home/common.nix b/dot_config/flake/home/common.nix index acaf427..c516063 100644 --- a/dot_config/flake/home/common.nix +++ b/dot_config/flake/home/common.nix @@ -28,7 +28,7 @@ outputs.overlays.modifications outputs.overlays.unstable-packages - inputs.helix.overlays.default + # inputs.helix.overlays.default ]; }; @@ -77,7 +77,7 @@ programs.helix = { enable = true; - package = inputs.helix.packages.${pkgs.system}.default; + # package = inputs.helix.packages.${pkgs.system}.default; }; programs.bat = { diff --git a/dot_config/flake/home/fish.nix b/dot_config/flake/home/fish.nix index cd68386..951b029 100644 --- a/dot_config/flake/home/fish.nix +++ b/dot_config/flake/home/fish.nix @@ -8,6 +8,7 @@ fish_add_path $HOME/.local/bin fish_add_path /opt/homebrew/bin + fish_add_path /opt/homebrew/opt/llvm/bin if test -e $HOME/.config/fish/variables-$(hostname)fish source $HOME/.config/fish/variables-$(hostname).fish diff --git a/dot_config/flake/home/hinge/hinge.nix b/dot_config/flake/home/hinge/hinge.nix index e61c563..16b5c8c 100644 --- a/dot_config/flake/home/hinge/hinge.nix +++ b/dot_config/flake/home/hinge/hinge.nix @@ -8,7 +8,7 @@ # sha256 = "1w80vjcnaysjlzxsp3v4pxq4yswbjvxs8ann2bk0m7rkjljnzz6m"; # }; # mac-app-util = import mac-app-util-src {}; -in { +in rec { imports = [ ../common.nix ../kitty.nix @@ -20,5 +20,21 @@ in { home.packages = with pkgs; [ bazel_7 + cmake + # clang-tools + cmake-language-server + jdt-language-server + ffmpeg + sccache + just + yarn + cocoapods + # android-tools + jdk17 ]; + + home.sessionVariables = { + ANDROID_HOME="/Users/tyler.mayoff/Library/Android/sdk"; + PATH="$PATH:/Users/tyler.mayoff/Library/Android/sdk/platform-tools"; + }; } diff --git a/dot_config/flake/home/kitty.nix b/dot_config/flake/home/kitty.nix index 6730cec..a26480c 100644 --- a/dot_config/flake/home/kitty.nix +++ b/dot_config/flake/home/kitty.nix @@ -1,4 +1,8 @@ -{pkgs, config, ...}: { +{ + pkgs, + config, + ... +}: { programs.kitty = { enable = true; package = config.lib.nixGL.wrap pkgs.kitty; @@ -11,6 +15,19 @@ disable_ligatures = "cursor"; }; + extraConfig = '' + map super+1 goto_tab 1 + map super+2 goto_tab 2 + map super+3 goto_tab 3 + map super+4 goto_tab 4 + map super+5 goto_tab 5 + map super+6 goto_tab 6 + map super+7 goto_tab 7 + map super+8 goto_tab 8 + map super+9 goto_tab 9 + map super+0 goto_tab 10 + ''; + themeFile = "Catppuccin-Macchiato"; }; }