From 8ccad96006c65ee870fa3380cc4e0ed4918a4e4e Mon Sep 17 00:00:00 2001 From: Natsu Kagami Date: Tue, 24 Jan 2023 17:37:56 +0100 Subject: [PATCH] Update some stuff --- flake.lock | 107 +++++++++++++++++++++--------------------- flake.nix | 2 +- home/kakoune/kak.nix | 2 +- home/macbook-home.nix | 2 +- 4 files changed, 56 insertions(+), 57 deletions(-) diff --git a/flake.lock b/flake.lock index d93c3d8..c261e5b 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1668993159, - "narHash": "sha256-9BVTtPFrHRh0HbeEm2bmXsoIWRj1tKM6Nvfl7VMK/X8=", + "lastModified": 1674348649, + "narHash": "sha256-hBRlaUlsrmW1wAPevwQnkrT0XiLrmlAHWabWYmLeQlQ=", "owner": "ipetkov", "repo": "crane", - "rev": "c61d98aaea5667607a36bafe5a6fa87fe5bb2c7e", + "rev": "ccea7b33178daf6010aae3ea2b3fb5b0241b9146", "type": "github" }, "original": { @@ -30,11 +30,11 @@ ] }, "locked": { - "lastModified": 1671196037, - "narHash": "sha256-2+J98SeczFWonbqFLMEAQC7vZEe6I2gM17XYvEmG52I=", + "lastModified": 1673295039, + "narHash": "sha256-AsdYgE8/GPwcelGgrntlijMg4t3hLFJFCRF3tL5WVjA=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "adb8ac0453c8b2c40f5bffb578453dbaee838952", + "rev": "87b9d090ad39b25b2400029c64825fc2a8868943", "type": "github" }, "original": { @@ -51,11 +51,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1668797197, - "narHash": "sha256-0w6iD3GSSQbIeSFVDzAAQZB+hDq670ZTms3d9XI+BtM=", + "lastModified": 1674127017, + "narHash": "sha256-QO1xF7stu5ZMDLbHN30LFolMAwY6TVlzYvQoUs1RD68=", "owner": "Serokell", "repo": "deploy-rs", - "rev": "2a3c5f70eee04a465aa534d8bd4fcc9bb3c4a8ce", + "rev": "8c9ea9605eed20528bf60fae35a2b613b901fd77", "type": "github" }, "original": { @@ -67,11 +67,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "lastModified": 1668681692, + "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "rev": "009399224d5e398d03b22badca40a37ac85412a1", "type": "github" }, "original": { @@ -83,11 +83,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1648199409, - "narHash": "sha256-JwPKdC2PoVBkG6E+eWw3j6BMR6sL3COpYWfif7RVb8Y=", + "lastModified": 1668681692, + "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "64a525ee38886ab9028e6f61790de0832aa3ef03", + "rev": "009399224d5e398d03b22badca40a37ac85412a1", "type": "github" }, "original": { @@ -181,11 +181,11 @@ "kak-lsp": { "flake": false, "locked": { - "lastModified": 1668933814, - "narHash": "sha256-BTRiQvY7bpP3PPLA1/eEc59mkFOnS/Cjx8pkT16b1M4=", + "lastModified": 1673686595, + "narHash": "sha256-TCgIWZR5irqGaGRe3EgzAJvGpqMSAkUf1j6nwpri1H0=", "owner": "kak-lsp", "repo": "kak-lsp", - "rev": "c16ec8c39b0ec7c01958b5bd5601ff89039e65b7", + "rev": "9621c99d8ad358af806d4d88f43cd1e50bec87c7", "type": "github" }, "original": { @@ -197,11 +197,11 @@ "kakoune": { "flake": false, "locked": { - "lastModified": 1669028104, - "narHash": "sha256-BCy25y+mzyK8xz4KlLxBpWhdZU3RbeO/GeXTJFzr1p8=", + "lastModified": 1670235597, + "narHash": "sha256-4LO/SbhrtcUajHsDrG38ntq2GxY+JRwc4Bl1qgL/Fzo=", "owner": "natsukagami", "repo": "kakoune", - "rev": "4aa0ad06b84fefd96e962bf523813b81d97043a5", + "rev": "39c875856a8dcfc2dcb0d796df05474e0eb30a3f", "type": "github" }, "original": { @@ -258,11 +258,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1669128192, - "narHash": "sha256-iBkK3E/S4XfQDi+2hr8WWitiIUZ5EWsmfTcR4jbIPNA=", + "lastModified": 1674423090, + "narHash": "sha256-waNhZrEDx6Ou5bjaKa3AJal3C+UamM81R0tlVtSjVfY=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "9f96bd578ee5c1511535adccd295383d79fb791d", + "rev": "b0b28d88fd5f1a55bd4d1041f92284f20633fff9", "type": "github" }, "original": { @@ -274,27 +274,26 @@ "nixos-m1": { "flake": false, "locked": { - "lastModified": 1669469129, - "narHash": "sha256-7THGCQCGx5X2DBczqwvJvUnFNfEFl7rbGOn50KbInNE=", - "owner": "natsukagami", + "lastModified": 1674098029, + "narHash": "sha256-o7CNhxCl8LVd62bunIAuxPv7rh8Kivu8FAZfXSod3/4=", + "owner": "tpwrules", "repo": "nixos-m1", - "rev": "15c18f15b2a1b1a04cef40d188501978d27c5478", + "rev": "fe4fff71fd1dbd8733512d0a2b83a84e3cfdc2bd", "type": "github" }, "original": { - "owner": "natsukagami", - "ref": "custom-kernel-patches", + "owner": "tpwrules", "repo": "nixos-m1", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1648219316, - "narHash": "sha256-Ctij+dOi0ZZIfX5eMhgwugfvB+WZSrvVNAyAuANOsnQ=", + "lastModified": 1671417167, + "narHash": "sha256-JkHam6WQOwZN1t2C2sbp1TqMv3TVRjzrdoejqfefwrM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "30d3d79b7d3607d56546dd2a6b49e156ba0ec634", + "rev": "bb31220cca6d044baa6dc2715b07497a2a7c4bc7", "type": "github" }, "original": { @@ -322,11 +321,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1671458120, - "narHash": "sha256-2+k/OONN4OF21TeoNjKB5sXVZv6Zvm/uEyQIW9OYCg8=", + "lastModified": 1674361931, + "narHash": "sha256-lUIZItHbW+LmJAz9V9puLq2rHlewcUgg1RPehkQIkzc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e37ef84b478fa8da0ced96522adfd956fde9047a", + "rev": "ef479383e13698c8d5ccf8a608485dc8ce1d4f80", "type": "github" }, "original": { @@ -369,11 +368,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1670104339, - "narHash": "sha256-212aAMSy5uxzrUbHmvUm3oHh8c02wXJ7lyNjDa5NSAM=", + "lastModified": 1674407282, + "narHash": "sha256-2qwc8mrPINSFdWffPK+ji6nQ9aGnnZyHSItVcYDZDlk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2d10e73416ec1449ef74aeac7faf2cf8c556ff5a", + "rev": "ab1254087f4cdf4af74b552d7fc95175d9bdbb49", "type": "github" }, "original": { @@ -401,11 +400,11 @@ }, "nur": { "locked": { - "lastModified": 1669182177, - "narHash": "sha256-U3Bp+pZN58lEqlk1hoTyCGUckFpZfXW2b14p1NGymyY=", + "lastModified": 1674574136, + "narHash": "sha256-1VZkgpWft6Ifs35aIAry1vHUGLzxUe5M2eBvHhYVByA=", "owner": "nix-community", "repo": "NUR", - "rev": "6ccbe180fc646a7672cede9fa008fd30d744d0c8", + "rev": "b87197cac6c38db9e32d76c6f286fee98e2ba752", "type": "github" }, "original": { @@ -421,11 +420,11 @@ "utils": "utils_3" }, "locked": { - "lastModified": 1666639010, - "narHash": "sha256-SKe5jEBHjjinb5R/fnJElwammKfof6zICc30E/we43Q=", + "lastModified": 1669555118, + "narHash": "sha256-F0s0m62S5bHNVWNHLZD6SeHiLrsDx98VQbRjDyIu+qQ=", "owner": "nix-community", "repo": "rnix-lsp", - "rev": "7339d80b7bf415ea42d790e073fbd69d21d09db4", + "rev": "95d40673fe43642e2e1144341e86d0036abd95d9", "type": "github" }, "original": { @@ -466,11 +465,11 @@ ] }, "locked": { - "lastModified": 1667487142, - "narHash": "sha256-bVuzLs1ZVggJAbJmEDVO9G6p8BH3HRaolK70KXvnWnU=", + "lastModified": 1672712534, + "narHash": "sha256-8S0DdMPcbITnlOu0uA81mTo3hgX84wK8S9wS34HEFY4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "cf668f737ac986c0a89e83b6b2e3c5ddbd8cf33b", + "rev": "69fb7bf0a8c40e6c4c197fa1816773774c8ac59f", "type": "github" }, "original": { @@ -507,11 +506,11 @@ ] }, "locked": { - "lastModified": 1670149631, - "narHash": "sha256-rwmtlxx45PvOeZNP51wql/cWjY3rqzIR3Oj2Y+V7jM0=", + "lastModified": 1674546403, + "narHash": "sha256-vkyNv0xzXuEnu9v52TUtRugNmQWIti8c2RhYnbLG71w=", "owner": "Mic92", "repo": "sops-nix", - "rev": "da98a111623101c64474a14983d83dad8f09f93d", + "rev": "b6ab3c61e2ca5e07d1f4eb1b67304e2670ea230c", "type": "github" }, "original": { @@ -522,11 +521,11 @@ }, "utils": { "locked": { - "lastModified": 1648297722, - "narHash": "sha256-W+qlPsiZd8F3XkzXOzAoR+mpFqzm3ekQkJNa+PIh1BQ=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "0f8662f1319ad6abf89b3380dd2722369fc51ade", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b074add..21893d9 100644 --- a/flake.nix +++ b/flake.nix @@ -31,7 +31,7 @@ kakoune.flake = false; kak-lsp.url = github:kak-lsp/kak-lsp; kak-lsp.flake = false; - nixos-m1.url = github:natsukagami/nixos-m1/custom-kernel-patches; + nixos-m1.url = github:tpwrules/nixos-m1; nixos-m1.flake = false; # --- diff --git a/home/kakoune/kak.nix b/home/kakoune/kak.nix index 7612090..98c7680 100644 --- a/home/kakoune/kak.nix +++ b/home/kakoune/kak.nix @@ -34,7 +34,7 @@ let kak-lsp = pkgs.libs.crane.buildPackage { src = pkgs.sources.kak-lsp; buildInputs = (with pkgs; - lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration ]) + lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration CoreServices ]) ) ++ (with pkgs; [ libiconv ] ); }; diff --git a/home/macbook-home.nix b/home/macbook-home.nix index 1587fa6..e4d322b 100644 --- a/home/macbook-home.nix +++ b/home/macbook-home.nix @@ -32,8 +32,8 @@ # Rust "$HOME/.cargo/bin" # Haskell - "$HOME/.ghcup/bin" "$HOME/.cabal/bin" + "$HOME/.ghcup/bin" # Go "$HOME/go/bin" # Node.js