From bd11492f68578c3358865f538ae3aeb6ecf02a98 Mon Sep 17 00:00:00 2001 From: moni Date: Sun, 24 Nov 2024 02:06:08 +0800 Subject: [PATCH] flake: bump inputs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'darwin': 'github:lnl7/nix-darwin/61cee20168a3ebb71a9efd70a55adebaadfbe4d4?narHash=sha256-XwXUK%2BmeYnlhdQz2TVE4Wv%2Btsx1CkdGbDPt1tRzCNH4%3D' (2024-11-19) → 'github:lnl7/nix-darwin/698a62c628c2ec423aa770d8ec0e1d0bcf4fca1a?narHash=sha256-0xzQvoId/P008QkTSAdFVv465P9rL9nYkIOWXL5pdsY%3D' (2024-11-23) • Updated input 'determinate': 'https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/0.1.156%2Brev-15b053d78de610810a303afec9ce3e0160bd8c69/019345d8-fd8d-7c5f-b852-f9eace9b13f5/source.tar.gz?narHash=sha256-Ul9NJss1/eyGTE9c7bBJjN1%2B38A75ojGqDZHQEvsmVo%3D' (2024-11-19) → 'https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/0.1.159%2Brev-29b7b7dfb1c878267383aa91c357ef464bef0f0d/01935106-420e-7097-93f6-ef4f1b11ffde/source.tar.gz?narHash=sha256-tuqod7g%2B1%2BPvtUXUlLl4MwY9B%2Bgr4rAEOGvhmhtWLbE%3D' (2024-11-21) • Updated input 'determinate/determinate-nixd-aarch64-darwin': 'https://install.determinate.systems/determinate-nixd/tag/v0.2.3/macOS?narHash=sha256-oUDHY3Ty9aYOHOoSPRFZRut87iqJy8uKMgv3SDxMTXY%3D' → 'https://install.determinate.systems/determinate-nixd/tag/v0.2.4/macOS?narHash=sha256-6E9DFC4lTpjmErG2TvV7rIS1tiyGZZYg0Kd4pT5GOkU%3D' • Updated input 'determinate/determinate-nixd-aarch64-linux': 'https://install.determinate.systems/determinate-nixd/tag/v0.2.3/aarch64-linux?narHash=sha256-wtKTpTi6Nho1XutQjd96xgVnhoVD2CEMJQdygkUuwsk%3D' → 'https://install.determinate.systems/determinate-nixd/tag/v0.2.4/aarch64-linux?narHash=sha256-CnbFYAL7dAl8qBIvAFMVjW4KpQgmWlghnK3qfoLEP8Q%3D' • Updated input 'determinate/determinate-nixd-x86_64-linux': 'https://install.determinate.systems/determinate-nixd/tag/v0.2.3/x86_64-linux?narHash=sha256-gSGNIHpmAPJgjks/Yb9PzwubPAbPULk9LEiDpdFZtpA%3D' → 'https://install.determinate.systems/determinate-nixd/tag/v0.2.4/x86_64-linux?narHash=sha256-0w3gbvncDwukX4PHVWeOZeD6F6vsEuePoNOIlAvdEq0%3D' • Updated input 'emacs': 'github:nix-community/emacs-overlay/c9edf2eef08adc100644b6e5757ce2c7c34e7784?narHash=sha256-NSzaU3Z%2BqVehp70we3vTLu9cKhCq8WZBq%2BlM24L2%2BMY%3D' (2024-11-21) → 'github:nix-community/emacs-overlay/61af138b0b7ffc19b1221b5d6d28f164a8c0d919?narHash=sha256-BN5xYNaROH5yE5KR5ZJfYte/Dl4G2schjkalmQoQq8s%3D' (2024-11-23) • Updated input 'home': 'github:nix-community/home-manager/a46e702093a5c46e192243edbd977d5749e7f294?narHash=sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo%3D' (2024-11-19) → 'github:nix-community/home-manager/16fe78182e924c9a2b0cffa1f343efea80945ef2?narHash=sha256-FnTC1Eycct/oD1I0ZUuy9FmQFfBeuymbVD2ptlQWaGc%3D' (2024-11-23) • Updated input 'master': 'github:nixos/nixpkgs/328abff1f7a707dc8da8e802f724f025521793ea?narHash=sha256-gbvtOPW7K7v4EFo7Feo5s%2BSI7FMVrCOA5CgnuMhWO/Y%3D' (2024-11-21) → 'github:nixos/nixpkgs/af6f9b7aa816702edaddf08abd7e2ee6939b3e25?narHash=sha256-4eBsTTGybjI2xxM8SIkKOqGGIRYDyfo6oaDZYqO0pvI%3D' (2024-11-23) • Updated input 'nix': 'github:nixos/nix/ba074465ba249da4df0752d0dc53529d0ab1a60d?narHash=sha256-fqUgT7lg8n/rRSjvo7108BTuuMaam4QgjFDnZJZhQC4%3D' (2024-11-21) → 'github:nixos/nix/3e9cc78eb5e5c4f1e762e201856273809fd92e71?narHash=sha256-qaW9sVOfAc7UFT/G5g198yUgUmg5XshPNCF9rYpD//M%3D' (2024-11-22) • Updated input 'nix-minecraft': 'github:Infinidoge/nix-minecraft/8325d463c1c424f2e6edeef2010c0d902a37b3d3?narHash=sha256-lt8Gdx6TNheby/9lRNE1GMP3vkdpLaXmyHQk%2BZvYNAY%3D' (2024-11-21) → 'github:Infinidoge/nix-minecraft/094d813a79d1d12a891dc9c99d6842fcd009205d?narHash=sha256-xbuuY3oaQWlysM15XGrNHtf1l%2BRE2GS0MwlDJA3W870%3D' (2024-11-23) • Updated input 'nixpkgs-f2k': 'github:fortuneteller2k/nixpkgs-f2k/2025fa0032f4ca564f1532caf794c98ea534100d?narHash=sha256-JlzSplXxp9oeJ088HggcGtBVlkTmp2NwoF8sIlbyiJw%3D' (2024-11-21) → 'github:fortuneteller2k/nixpkgs-f2k/43008f0e4441fb7a7981183c198fbaa1a26bbd91?narHash=sha256-MaptP9PNI7Dl70iNNnXwYElYTJBfitn%2BJyo09k4mfdQ%3D' (2024-11-23) • Updated input 'nixpkgs-f2k/emacs': 'github:nix-community/emacs-overlay/4393d7fa938ad16ad5fab9054f73da87fecff8c4?narHash=sha256-WyUn424aPbTlI0DcUI3DJ4eD5HsZB3i//mmsakNfdpc%3D' (2024-11-21) → 'github:nix-community/emacs-overlay/dd38645351b6f14cda47c81456131c86b11386db?narHash=sha256-FOHMWtR46AeDbRnOSD6wN3XWhIRvqYIyPDEczCbKMWY%3D' (2024-11-23) • Updated input 'nixpkgs-wayland': 'github:nix-community/nixpkgs-wayland/e5856391c85581a74d3ee7bb53c8b3a9902a484e?narHash=sha256-0STXOFhEKCp/WzZ2jZ1qQF/8Ry%2BvKD3gsWrRoq5i6pY%3D' (2024-11-21) → 'github:nix-community/nixpkgs-wayland/74c2d35df49f9c8090654a7be11710e627dc9811?narHash=sha256-u5O4gq5SgWNuYR/8X9GECB3QO3JFAwwl%2Bo2sVEMIveA%3D' (2024-11-23) • Updated input 'nvim': 'github:nix-community/neovim-nightly-overlay/151fab1aa35e1cbc6f5caad1e175e3d621d67951?narHash=sha256-pszcETwWdItBmb/Z2CqIiTfEiVl3K5TPpgFSwyQrghY%3D' (2024-11-21) → 'github:nix-community/neovim-nightly-overlay/10e11c32a4f4f7c9d64f45413642ded11fc538b6?narHash=sha256-94yZ7eJiLvW%2BUknI5RZBCV6OMHtoSv1oWyOwKjTmS88%3D' (2024-11-22) • Updated input 'nvim/neovim-src': 'github:neovim/neovim/07db909eb5ae2a559771068be64439eba394cd61?narHash=sha256-XKPsbjqHmwbiyzZdqNtw0tKxWLGFCkVB1%2BAwbi8tjQU%3D' (2024-11-20) → 'github:neovim/neovim/ff75f345ab5fa57c6560db021e8eb099aff90472?narHash=sha256-7tA7IeOjx1wgDQnY7RxIhIuwcFeSZu4Yc3WtLh%2B22TE%3D' (2024-11-21) --- flake.lock | 94 ++++++++++++------------- flake.nix | 3 - hosts/riscake/configuration.nix | 2 +- modules/parts/nix-settings.nix | 18 ++++- modules/shared/home-manager/default.nix | 4 +- overlays/default.nix | 8 --- overlays/derivations/asitop.nix | 32 --------- overlays/derivations/dashing.nix | 25 ------- overlays/patches/nix-darwin-path.patch | 12 ++++ users/moni/home.nix | 7 +- 10 files changed, 78 insertions(+), 127 deletions(-) delete mode 100644 overlays/derivations/asitop.nix delete mode 100644 overlays/derivations/dashing.nix create mode 100644 overlays/patches/nix-darwin-path.patch diff --git a/flake.lock b/flake.lock index e550c80..3777045 100644 --- a/flake.lock +++ b/flake.lock @@ -48,11 +48,11 @@ ] }, "locked": { - "lastModified": 1732016537, - "narHash": "sha256-XwXUK+meYnlhdQz2TVE4Wv+tsx1CkdGbDPt1tRzCNH4=", + "lastModified": 1732324260, + "narHash": "sha256-0xzQvoId/P008QkTSAdFVv465P9rL9nYkIOWXL5pdsY=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "61cee20168a3ebb71a9efd70a55adebaadfbe4d4", + "rev": "698a62c628c2ec423aa770d8ec0e1d0bcf4fca1a", "type": "github" }, "original": { @@ -74,12 +74,12 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1732043483, - "narHash": "sha256-Ul9NJss1/eyGTE9c7bBJjN1+38A75ojGqDZHQEvsmVo=", - "rev": "15b053d78de610810a303afec9ce3e0160bd8c69", - "revCount": 156, + "lastModified": 1732231026, + "narHash": "sha256-tuqod7g+1+PvtUXUlLl4MwY9B+gr4rAEOGvhmhtWLbE=", + "rev": "29b7b7dfb1c878267383aa91c357ef464bef0f0d", + "revCount": 159, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/0.1.156%2Brev-15b053d78de610810a303afec9ce3e0160bd8c69/019345d8-fd8d-7c5f-b852-f9eace9b13f5/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/0.1.159%2Brev-29b7b7dfb1c878267383aa91c357ef464bef0f0d/01935106-420e-7097-93f6-ef4f1b11ffde/source.tar.gz" }, "original": { "type": "tarball", @@ -89,37 +89,37 @@ "determinate-nixd-aarch64-darwin": { "flake": false, "locked": { - "narHash": "sha256-oUDHY3Ty9aYOHOoSPRFZRut87iqJy8uKMgv3SDxMTXY=", + "narHash": "sha256-6E9DFC4lTpjmErG2TvV7rIS1tiyGZZYg0Kd4pT5GOkU=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.3/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.4/macOS" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.3/macOS" + "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.4/macOS" } }, "determinate-nixd-aarch64-linux": { "flake": false, "locked": { - "narHash": "sha256-wtKTpTi6Nho1XutQjd96xgVnhoVD2CEMJQdygkUuwsk=", + "narHash": "sha256-CnbFYAL7dAl8qBIvAFMVjW4KpQgmWlghnK3qfoLEP8Q=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.3/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.4/aarch64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.3/aarch64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.4/aarch64-linux" } }, "determinate-nixd-x86_64-linux": { "flake": false, "locked": { - "narHash": "sha256-gSGNIHpmAPJgjks/Yb9PzwubPAbPULk9LEiDpdFZtpA=", + "narHash": "sha256-0w3gbvncDwukX4PHVWeOZeD6F6vsEuePoNOIlAvdEq0=", "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.3/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.4/x86_64-linux" }, "original": { "type": "file", - "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.3/x86_64-linux" + "url": "https://install.determinate.systems/determinate-nixd/tag/v0.2.4/x86_64-linux" } }, "emacs": { @@ -130,11 +130,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1732209245, - "narHash": "sha256-NSzaU3Z+qVehp70we3vTLu9cKhCq8WZBq+lM24L2+MY=", + "lastModified": 1732381887, + "narHash": "sha256-BN5xYNaROH5yE5KR5ZJfYte/Dl4G2schjkalmQoQq8s=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "c9edf2eef08adc100644b6e5757ce2c7c34e7784", + "rev": "61af138b0b7ffc19b1221b5d6d28f164a8c0d919", "type": "github" }, "original": { @@ -149,11 +149,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1732154154, - "narHash": "sha256-WyUn424aPbTlI0DcUI3DJ4eD5HsZB3i//mmsakNfdpc=", + "lastModified": 1732326917, + "narHash": "sha256-FOHMWtR46AeDbRnOSD6wN3XWhIRvqYIyPDEczCbKMWY=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "4393d7fa938ad16ad5fab9054f73da87fecff8c4", + "rev": "dd38645351b6f14cda47c81456131c86b11386db", "type": "github" }, "original": { @@ -661,11 +661,11 @@ ] }, "locked": { - "lastModified": 1732025103, - "narHash": "sha256-qjEI64RKvDxRyEarY0jTzrZMa8ebezh2DEZmJJrpVdo=", + "lastModified": 1732383377, + "narHash": "sha256-FnTC1Eycct/oD1I0ZUuy9FmQFfBeuymbVD2ptlQWaGc=", "owner": "nix-community", "repo": "home-manager", - "rev": "a46e702093a5c46e192243edbd977d5749e7f294", + "rev": "16fe78182e924c9a2b0cffa1f343efea80945ef2", "type": "github" }, "original": { @@ -750,11 +750,11 @@ }, "master": { "locked": { - "lastModified": 1732219096, - "narHash": "sha256-gbvtOPW7K7v4EFo7Feo5s+SI7FMVrCOA5CgnuMhWO/Y=", + "lastModified": 1732385101, + "narHash": "sha256-4eBsTTGybjI2xxM8SIkKOqGGIRYDyfo6oaDZYqO0pvI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "328abff1f7a707dc8da8e802f724f025521793ea", + "rev": "af6f9b7aa816702edaddf08abd7e2ee6939b3e25", "type": "github" }, "original": { @@ -767,11 +767,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1732143030, - "narHash": "sha256-XKPsbjqHmwbiyzZdqNtw0tKxWLGFCkVB1+Awbi8tjQU=", + "lastModified": 1732229552, + "narHash": "sha256-7tA7IeOjx1wgDQnY7RxIhIuwcFeSZu4Yc3WtLh+22TE=", "owner": "neovim", "repo": "neovim", - "rev": "07db909eb5ae2a559771068be64439eba394cd61", + "rev": "ff75f345ab5fa57c6560db021e8eb099aff90472", "type": "github" }, "original": { @@ -909,11 +909,11 @@ ] }, "locked": { - "lastModified": 1732153840, - "narHash": "sha256-lt8Gdx6TNheby/9lRNE1GMP3vkdpLaXmyHQk+ZvYNAY=", + "lastModified": 1732326467, + "narHash": "sha256-xbuuY3oaQWlysM15XGrNHtf1l+RE2GS0MwlDJA3W870=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "8325d463c1c424f2e6edeef2010c0d902a37b3d3", + "rev": "094d813a79d1d12a891dc9c99d6842fcd009205d", "type": "github" }, "original": { @@ -958,11 +958,11 @@ "nixpkgs-regression": "nixpkgs-regression_2" }, "locked": { - "lastModified": 1732219693, - "narHash": "sha256-fqUgT7lg8n/rRSjvo7108BTuuMaam4QgjFDnZJZhQC4=", + "lastModified": 1732285571, + "narHash": "sha256-qaW9sVOfAc7UFT/G5g198yUgUmg5XshPNCF9rYpD//M=", "owner": "nixos", "repo": "nix", - "rev": "ba074465ba249da4df0752d0dc53529d0ab1a60d", + "rev": "3e9cc78eb5e5c4f1e762e201856273809fd92e71", "type": "github" }, "original": { @@ -1051,11 +1051,11 @@ "parts": "parts" }, "locked": { - "lastModified": 1732157868, - "narHash": "sha256-JlzSplXxp9oeJ088HggcGtBVlkTmp2NwoF8sIlbyiJw=", + "lastModified": 1732330442, + "narHash": "sha256-MaptP9PNI7Dl70iNNnXwYElYTJBfitn+Jyo09k4mfdQ=", "owner": "fortuneteller2k", "repo": "nixpkgs-f2k", - "rev": "2025fa0032f4ca564f1532caf794c98ea534100d", + "rev": "43008f0e4441fb7a7981183c198fbaa1a26bbd91", "type": "github" }, "original": { @@ -1213,11 +1213,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1732217673, - "narHash": "sha256-0STXOFhEKCp/WzZ2jZ1qQF/8Ry+vKD3gsWrRoq5i6pY=", + "lastModified": 1732358371, + "narHash": "sha256-u5O4gq5SgWNuYR/8X9GECB3QO3JFAwwl+o2sVEMIveA=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "e5856391c85581a74d3ee7bb53c8b3a9902a484e", + "rev": "74c2d35df49f9c8090654a7be11710e627dc9811", "type": "github" }, "original": { @@ -1344,11 +1344,11 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1732173780, - "narHash": "sha256-pszcETwWdItBmb/Z2CqIiTfEiVl3K5TPpgFSwyQrghY=", + "lastModified": 1732234033, + "narHash": "sha256-94yZ7eJiLvW+UknI5RZBCV6OMHtoSv1oWyOwKjTmS88=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "151fab1aa35e1cbc6f5caad1e175e3d621d67951", + "rev": "10e11c32a4f4f7c9d64f45413642ded11fc538b6", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 11962cb..d6dc0f2 100644 --- a/flake.nix +++ b/flake.nix @@ -31,13 +31,10 @@ nix-minecraft.url = "github:Infinidoge/nix-minecraft"; nixos-wsl.url = "github:nix-community/nixos-wsl"; nixpkgs-f2k.url = "github:fortuneteller2k/nixpkgs-f2k"; - nixfmt.url = "github:NixOS/nixfmt"; nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland"; nvim.url = "github:nix-community/neovim-nightly-overlay"; parts.url = "github:hercules-ci/flake-parts"; statix.url = "github:nerdypepper/statix"; - lix.url = "git+https://git.lix.systems/lix-project/lix.git"; - # nix-parallel.url = "github:DeterminateSystems/nix-src/multithreaded-eval"; # Non-flake inputs diff --git a/hosts/riscake/configuration.nix b/hosts/riscake/configuration.nix index bc32c82..477ed09 100644 --- a/hosts/riscake/configuration.nix +++ b/hosts/riscake/configuration.nix @@ -23,6 +23,6 @@ security.pam.enableSudoTouchIdAuth = true; fonts.packages = __attrValues { - inherit (pkgs) comic-neue iosevka-ft; + inherit (pkgs) comic-neue; }; } diff --git a/modules/parts/nix-settings.nix b/modules/parts/nix-settings.nix index 0fc08a2..dce7498 100644 --- a/modules/parts/nix-settings.nix +++ b/modules/parts/nix-settings.nix @@ -42,8 +42,8 @@ registry = { system.flake = inputs.self; - default.flake = inputs.nixpkgs; - home-manager.flake = inputs.home; + nixpkgs.flake = inputs.nixpkgs; + home.flake = inputs.home; }; settings = lib.mkMerge [ @@ -56,7 +56,7 @@ allow-unsafe-native-code-during-evaluation = true; accept-flake-config = true; http-connections = 0; - + flake-registry = __toFile "begone-evil.json" (__toJSON { flakes = [ ]; version = 2; @@ -88,6 +88,7 @@ "https://nix-community.cachix.org?priority=13" "https://nixpkgs-wayland.cachix.org" "https://cache.lix.systems" + "https://cache.flakehub.com" ]; trusted-public-keys = [ @@ -95,6 +96,14 @@ "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA=" "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" + "cache.flakehub.com-3:hJuILl5sVK4iKm86JzgdXW12Y2Hwd5G07qKtHTOcDCM=" + "cache.flakehub.com-4:Asi8qIv291s0aYLyH6IOnr5Kf6+OF14WVjkE6t3xMio=" + "cache.flakehub.com-5:zB96CRlL7tiPtzA9/WKyPkp3A2vqxqgdgyTVNGShPDU=" + "cache.flakehub.com-6:W4EGFwAGgBj3he7c5fNh9NkOXw0PUVaxygCVKeuvaqU=" + "cache.flakehub.com-7:mvxJ2DZVHn/kRxlIaxYNMuDG1OvMckZu32um1TadOR8=" + "cache.flakehub.com-8:moO+OVS0mnTjBTcOUh2kYLQEd59ExzyoW1QgQ8XAARQ=" + "cache.flakehub.com-9:wChaSeTI6TeCuV/Sg2513ZIM9i0qJaYsF+lZCXg0J6o=" + "cache.flakehub.com-10:2GqeNlIp6AKp4EF2MVbE1kBOp9iBSyo0UPR9KoR0o1Y=" ]; trusted-users = [ @@ -104,6 +113,9 @@ ]; use-xdg-base-directories = true; + ssl-cert-file = "/etc/nix/macos-keychain.crt"; + netrc-file = "/nix/var/determinate/netrc"; + post-build-hook = "/nix/var/determinate/post-build-hook.sh"; } (lib.mkIf (stdenv.isDarwin && stdenv.isAarch64) { extra-platforms = "x86_64-darwin"; }) diff --git a/modules/shared/home-manager/default.nix b/modules/shared/home-manager/default.nix index 4f60863..64b9b18 100644 --- a/modules/shared/home-manager/default.nix +++ b/modules/shared/home-manager/default.nix @@ -19,7 +19,6 @@ inherit (pkgs) bat ripgrep - jujutsu difftastic nixpkgs-fmt nixpkgs-review @@ -31,7 +30,7 @@ }; sessionVariables = { - EDITOR = "nvim"; + EDITOR = "nano"; MANPAGER = "nvim +Man! -c 'nnoremap i '"; }; }; @@ -51,6 +50,7 @@ direnv = { enable = true; + silent = true; nix-direnv.enable = true; }; diff --git a/overlays/default.nix b/overlays/default.nix index 1b1fa55..f9358c3 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -2,14 +2,6 @@ _: { flake.overlays.default = final: prev: { - asitop = prev.callPackage ./derivations/asitop.nix { }; - - python3 = prev.python3.override { - packageOverrides = pfinal: pprev: { - pydashing = pfinal.callPackage ./derivations/dashing.nix { }; - }; - }; - iosevka-ft = prev.iosevka.override { privateBuildPlan = __readFile ./patches/iosevka-ft-build-plan.toml; set = "Ft"; diff --git a/overlays/derivations/asitop.nix b/overlays/derivations/asitop.nix deleted file mode 100644 index dc0d9d4..0000000 --- a/overlays/derivations/asitop.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - lib, - python3, - fetchFromGitHub, -}: - -python3.pkgs.buildPythonApplication rec { - pname = "asitop"; - version = "74ebe2c"; - - src = fetchFromGitHub { - owner = "tlkh"; - repo = pname; - rev = "74ebe2cbc23d5b1eec874aebb1b9bacfe0e670cd"; - hash = "sha256-SQTIV+OvFSH3TNIFP8ts+nnZocaEg+3yOKDtzlv1q2A="; - }; - - doCheck = false; - - propagatedBuildInputs = with python3.pkgs; [ - psutil - pydashing - ]; - - meta = with lib; { - homepage = "https://github.com/tikh/asitop"; - description = "Perf monitoring CLI tool for Apple Silicon"; - license = licenses.mit; - platforms = [ "aarch64-darwin" ]; - maintainers = with maintainers; [ fortuneteller2k ]; - }; -} diff --git a/overlays/derivations/dashing.nix b/overlays/derivations/dashing.nix deleted file mode 100644 index d70886e..0000000 --- a/overlays/derivations/dashing.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - lib, - buildPythonPackage, - fetchPypi, - blessed, -}: - -buildPythonPackage rec { - pname = "dashing"; - version = "0.1.0"; - - src = fetchPypi { - inherit pname version; - hash = "sha256-JRRgjg8pp3Xb0bERFWEhnOg9U8+kuqL+QQH6uE/Vbxs="; - }; - - propagatedBuildInputs = [ blessed ]; - - meta = with lib; { - homepage = "https://github.com/FedericoCeratto/dashing"; - description = "Terminal dashboards for Python"; - license = licenses.lgpl3Only; - maintainers = with maintainers; [ fortuneteller2k ]; - }; -} diff --git a/overlays/patches/nix-darwin-path.patch b/overlays/patches/nix-darwin-path.patch new file mode 100644 index 0000000..0c9ef7f --- /dev/null +++ b/overlays/patches/nix-darwin-path.patch @@ -0,0 +1,12 @@ +diff --git a/share/config.fish b/share/config.fish +index d85fd1e185..c564e45b27 100644 +--- a/share/config.fish ++++ b/share/config.fish +@@ -158,6 +158,7 @@ + # + if status --is-login + if command -sq /usr/libexec/path_helper ++ and not set -q __NIX_DARWIN_SET_ENVIRONMENT_DONE + # Adapt construct_path from the macOS /usr/libexec/path_helper + # executable for fish; see + # https://opensource.apple.com/source/shell_cmds/shell_cmds-203/path_helper/path_helper.c.auto.html . diff --git a/users/moni/home.nix b/users/moni/home.nix index bb13111..cc71560 100644 --- a/users/moni/home.nix +++ b/users/moni/home.nix @@ -15,7 +15,6 @@ home = { packages = __attrValues { inherit (pkgs) - asitop fanbox-dl curl nix-output-monitor @@ -28,11 +27,6 @@ ; inherit (inputs'.nil.packages) nil; - inherit (inputs'.nvim.packages) neovim; - }; - - sessionVariables = { - MODULAR_HOME = "/Users/moni/.local/share/modular"; }; }; @@ -59,6 +53,7 @@ fish_add_path -amP /Applications/ArmGNUToolchain/13.2.Rel1/arm-none-eabi/bin fish_add_path -amP /usr/bin fish_add_path -amP /opt/homebrew/bin + fish_add_path -amP /Users/moni/.modular/bin fish_add_path -amP /usr/local/smlnj/bin fish_add_path -amP /opt/local/bin fish_add_path -amP /opt/homebrew/opt/llvm/bin