From f5f6d4ed6526f2e4bb3b3684b455b1d1dd3850c8 Mon Sep 17 00:00:00 2001 From: yuanwang Date: Wed, 4 Oct 2023 11:51:30 -0600 Subject: [PATCH 01/48] add picat --- hosts/wk01174.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/hosts/wk01174.nix b/hosts/wk01174.nix index 6da89b00..9b436a3b 100644 --- a/hosts/wk01174.nix +++ b/hosts/wk01174.nix @@ -55,6 +55,7 @@ "jdtls" "redis" "frugal" + "picat" # https://formulae.brew.sh/formula/docker-compose # mkdir -p ~/.docker/cli-plugins # ln -sfn $HOMEBREW_PREFIX/opt/docker-compose/bin/docker-compose ~/.docker/cli-plugins/docker-compose From 2967636dd891a7e929c4b51efd6916823ba85a50 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 5 Oct 2023 00:42:44 +0000 Subject: [PATCH 02/48] chore(deps): bump DeterminateSystems/nix-installer-action from 4 to 5 Bumps [DeterminateSystems/nix-installer-action](https://github.com/determinatesystems/nix-installer-action) from 4 to 5. - [Release notes](https://github.com/determinatesystems/nix-installer-action/releases) - [Commits](https://github.com/determinatesystems/nix-installer-action/compare/v4...v5) --- updated-dependencies: - dependency-name: DeterminateSystems/nix-installer-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e517bbf8..f41d2e45 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Install Nix - uses: DeterminateSystems/nix-installer-action@v4 + uses: DeterminateSystems/nix-installer-action@v5 - uses: cachix/cachix-action@v12 with: name: yuanwang-wf From ef3bf4933896ad7cd9de7d7461b2eebaa7483cf9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 6 Oct 2023 00:07:23 +0000 Subject: [PATCH 03/48] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'astro-nvim': 'github:AstroNvim/AstroNvim/567c01bc6a446da8150f9904d11ee9530e47e82f' (2023-09-25) → 'github:AstroNvim/AstroNvim/6e9083dcafd1a9d702676a687f631072573e5618' (2023-10-05) • Updated input 'devenv': 'github:cachix/devenv/42a26aa1b2265cf505df056e040e2b1ef8073b76' (2023-09-25) → 'github:cachix/devenv/05e26941f34486bff6ebeb4b9c169b6f637f1758' (2023-10-03) • Updated input 'emacs': 'github:nix-community/emacs-overlay/ef992bca01ef97e8bbd1136693d24665390f39ce' (2023-09-28) → 'github:nix-community/emacs-overlay/804c3f5ecc955fd7fa2e70be2f2937b5a2c05f26' (2023-10-05) • Updated input 'emacs/nixpkgs': 'github:NixOS/nixpkgs/6500b4580c2a1f3d0f980d32d285739d8e156d92' (2023-09-25) → 'github:NixOS/nixpkgs/fdd898f8f79e8d2f99ed2ab6b3751811ef683242' (2023-10-01) • Updated input 'emacs/nixpkgs-stable': 'github:NixOS/nixpkgs/5cfafa12d57374f48bcc36fda3274ada276cf69e' (2023-09-27) → 'github:NixOS/nixpkgs/8a4c17493e5c39769f79117937c79e1c88de6729' (2023-10-03) • Updated input 'flake-parts': 'github:hercules-ci/flake-parts/7f53fdb7bdc5bb237da7fefef12d099e4fd611ca' (2023-09-01) → 'github:hercules-ci/flake-parts/c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4' (2023-10-03) • Updated input 'home-manager': 'github:nix-community/home-manager/9d4cdf8cc4da54beb5d2e927af7a259bb4a00645' (2023-09-28) → 'github:nix-community/home-manager/68f7d8c0fb0bfc67d1916dd7f06288424360d43a' (2023-10-04) • Updated input 'hosts': 'github:StevenBlack/hosts/234b370284f9d79e0103862932ab781777fe983d' (2023-09-25) → 'github:StevenBlack/hosts/eba6ecf91055450ffdf6b204da16c06afa596ae1' (2023-10-05) • Updated input 'hosts/nixpkgs': 'github:NixOS/nixpkgs/f3dab3509afca932f3f4fd0908957709bb1c1f57' (2023-09-27) → 'github:NixOS/nixpkgs/7131f3c223a2d799568e4b278380cd9dac2b8579' (2023-10-04) • Updated input 'nix-darwin': 'github:LnL7/nix-darwin/e236a1e598a9a59265897948ac9874c364b9555f' (2023-09-26) → 'github:LnL7/nix-darwin/8b6ea26d5d2e8359d06278364f41fbc4b903b28a' (2023-10-03) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/8a86b98f0ba1c405358f1b71ff8b5e1d317f5db2' (2023-09-27) → 'github:NixOS/nixpkgs/fdd898f8f79e8d2f99ed2ab6b3751811ef683242' (2023-10-01) • Updated input 'nixpkgs-stable': 'github:nixos/nixpkgs/5cfafa12d57374f48bcc36fda3274ada276cf69e' (2023-09-27) → 'github:nixos/nixpkgs/8a4c17493e5c39769f79117937c79e1c88de6729' (2023-10-03) • Updated input 'nur': 'github:nix-community/NUR/50363ec39651feb3cb64821107ea9d8e8e186bc6' (2023-09-28) → 'github:nix-community/NUR/bd7b9e4113d3a4c726309b32f01c62bc192eb311' (2023-10-05) • Updated input 'pre-commit': 'github:cachix/pre-commit-hooks.nix/cb770e93516a1609652fa8e945a0f310e98f10c0' (2023-09-24) → 'github:cachix/pre-commit-hooks.nix/66c352d33e0907239e4a69416334f64af2c685cc' (2023-10-05) --- flake.lock | 84 +++++++++++++++++++++++++++--------------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/flake.lock b/flake.lock index 72785328..e9e55a0d 100644 --- a/flake.lock +++ b/flake.lock @@ -27,11 +27,11 @@ "astro-nvim": { "flake": false, "locked": { - "lastModified": 1695664894, - "narHash": "sha256-AgHjRYPmiD06h2mIkQXyOjqSVS9/GI+HVCHugsIvCvw=", + "lastModified": 1696545727, + "narHash": "sha256-r2N4363EC6M6NUjebaOro8uIAruVKNFMHU9e9XKEfU4=", "owner": "AstroNvim", "repo": "AstroNvim", - "rev": "567c01bc6a446da8150f9904d11ee9530e47e82f", + "rev": "6e9083dcafd1a9d702676a687f631072573e5618", "type": "github" }, "original": { @@ -64,11 +64,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1695635472, - "narHash": "sha256-+0lqQZmbzdglPh8JoMAZzP1XXanhBg9BcbjVXnwEC5E=", + "lastModified": 1696344641, + "narHash": "sha256-cfGsdtDvzYaFA7oGWSgcd1yST6LFwvjMcHvtVj56VcU=", "owner": "cachix", "repo": "devenv", - "rev": "42a26aa1b2265cf505df056e040e2b1ef8073b76", + "rev": "05e26941f34486bff6ebeb4b9c169b6f637f1758", "type": "github" }, "original": { @@ -84,11 +84,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1695921859, - "narHash": "sha256-9QUM3d1TxCwCMhunV7VvtV4+BOe9vynlwks8TByhFfA=", + "lastModified": 1696529826, + "narHash": "sha256-H8qj+C6vbn629zxLkj5sOCDhTbqsyrcrDd78tjvgqMY=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "ef992bca01ef97e8bbd1136693d24665390f39ce", + "rev": "804c3f5ecc955fd7fa2e70be2f2937b5a2c05f26", "type": "github" }, "original": { @@ -136,11 +136,11 @@ ] }, "locked": { - "lastModified": 1693611461, - "narHash": "sha256-aPODl8vAgGQ0ZYFIRisxYG5MOGSkIczvu2Cd8Gb9+1Y=", + "lastModified": 1696343447, + "narHash": "sha256-B2xAZKLkkeRFG5XcHHSXXcP7To9Xzr59KXeZiRf4vdQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "7f53fdb7bdc5bb237da7fefef12d099e4fd611ca", + "rev": "c9afaba3dfa4085dbd2ccb38dfade5141e33d9d4", "type": "github" }, "original": { @@ -307,11 +307,11 @@ ] }, "locked": { - "lastModified": 1695940289, - "narHash": "sha256-z9DItQvCasu7sexaz1GZ+uOymDRpuEehFwRKToCooJ8=", + "lastModified": 1696446489, + "narHash": "sha256-xSjMKdNR+q/3hdSPyg/LUMsZT/WIoUi8dcm5zT4SMUQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "9d4cdf8cc4da54beb5d2e927af7a259bb4a00645", + "rev": "68f7d8c0fb0bfc67d1916dd7f06288424360d43a", "type": "github" }, "original": { @@ -326,11 +326,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1695672086, - "narHash": "sha256-/c7anuxxQEabcZIRv5Xnwb7pXSBeKGoMOFDDeEyxLw0=", + "lastModified": 1696543310, + "narHash": "sha256-umdWqfza3u/4ONBbaWxPfnCloi3EN3FdNkdZNt7L3oc=", "owner": "StevenBlack", "repo": "hosts", - "rev": "234b370284f9d79e0103862932ab781777fe983d", + "rev": "eba6ecf91055450ffdf6b204da16c06afa596ae1", "type": "github" }, "original": { @@ -405,11 +405,11 @@ ] }, "locked": { - "lastModified": 1695686713, - "narHash": "sha256-rJATx5B/nwlBpt7CJUf85LV27qWPbul5UVV8fu6ABPg=", + "lastModified": 1696360011, + "narHash": "sha256-HpPv27qMuPou4acXcZ8Klm7Zt0Elv9dgDvSJaomWb9Y=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "e236a1e598a9a59265897948ac9874c364b9555f", + "rev": "8b6ea26d5d2e8359d06278364f41fbc4b903b28a", "type": "github" }, "original": { @@ -484,11 +484,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1695825837, - "narHash": "sha256-4Ne11kNRnQsmSJCRSSNkFRSnHC4Y5gPDBIQGjjPfJiU=", + "lastModified": 1696374741, + "narHash": "sha256-gt8B3G0ryizT9HSB4cCO8QoxdbsHnrQH+/BdKxOwqF0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5cfafa12d57374f48bcc36fda3274ada276cf69e", + "rev": "8a4c17493e5c39769f79117937c79e1c88de6729", "type": "github" }, "original": { @@ -500,11 +500,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1695825837, - "narHash": "sha256-4Ne11kNRnQsmSJCRSSNkFRSnHC4Y5gPDBIQGjjPfJiU=", + "lastModified": 1696374741, + "narHash": "sha256-gt8B3G0ryizT9HSB4cCO8QoxdbsHnrQH+/BdKxOwqF0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5cfafa12d57374f48bcc36fda3274ada276cf69e", + "rev": "8a4c17493e5c39769f79117937c79e1c88de6729", "type": "github" }, "original": { @@ -532,11 +532,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1695644571, - "narHash": "sha256-asS9dCCdlt1lPq0DLwkVBbVoEKuEuz+Zi3DG7pR/RxA=", + "lastModified": 1696193975, + "narHash": "sha256-mnQjUcYgp9Guu3RNVAB2Srr1TqKcPpRXmJf4LJk6KRY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6500b4580c2a1f3d0f980d32d285739d8e156d92", + "rev": "fdd898f8f79e8d2f99ed2ab6b3751811ef683242", "type": "github" }, "original": { @@ -548,11 +548,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1695806987, - "narHash": "sha256-fX5kGs66NZIxCMcpAGIpxuftajHL8Hil1vjHmjjl118=", + "lastModified": 1696419054, + "narHash": "sha256-EdR+dIKCfqL3voZUDYwcvgRDOektQB9KbhBVcE0/3Mo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f3dab3509afca932f3f4fd0908957709bb1c1f57", + "rev": "7131f3c223a2d799568e4b278380cd9dac2b8579", "type": "github" }, "original": { @@ -562,11 +562,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1695830400, - "narHash": "sha256-gToZXQVr0G/1WriO83olnqrLSHF2Jb8BPcmCt497ro0=", + "lastModified": 1696193975, + "narHash": "sha256-mnQjUcYgp9Guu3RNVAB2Srr1TqKcPpRXmJf4LJk6KRY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8a86b98f0ba1c405358f1b71ff8b5e1d317f5db2", + "rev": "fdd898f8f79e8d2f99ed2ab6b3751811ef683242", "type": "github" }, "original": { @@ -577,11 +577,11 @@ }, "nur": { "locked": { - "lastModified": 1695940762, - "narHash": "sha256-wSKokm+NvBwmpffSM+WH0xld18sH5YSBzr5wxDmcl0I=", + "lastModified": 1696542377, + "narHash": "sha256-swb06Kj12+F9Rr/fXbT2ZGfEoVHcKZCIW+GVjQSI3Xc=", "owner": "nix-community", "repo": "NUR", - "rev": "50363ec39651feb3cb64821107ea9d8e8e186bc6", + "rev": "bd7b9e4113d3a4c726309b32f01c62bc192eb311", "type": "github" }, "original": { @@ -601,11 +601,11 @@ "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1695576016, - "narHash": "sha256-71KxwRhTfVuh7kNrg3/edNjYVg9DCyKZl2QIKbhRggg=", + "lastModified": 1696516544, + "narHash": "sha256-8rKE8Je6twTNFRTGF63P9mE3lZIq917RAicdc4XJO80=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "cb770e93516a1609652fa8e945a0f310e98f10c0", + "rev": "66c352d33e0907239e4a69416334f64af2c685cc", "type": "github" }, "original": { From 830bc569b8ddae59c3de72e31d1718c62e0cde78 Mon Sep 17 00:00:00 2001 From: yuanwang Date: Fri, 6 Oct 2023 08:36:37 -0600 Subject: [PATCH 04/48] add racket --- modules/packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/packages.nix b/modules/packages.nix index 38f8ac01..bd881907 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -69,6 +69,7 @@ with pkgs; [ just # toybox pkg-config + racket # open-interpreter # reiryoku-firmware # reiryoku-flash From 5aa9cfed1f033c1aaa1e44656431540756ecae73 Mon Sep 17 00:00:00 2001 From: yuanwang Date: Mon, 9 Oct 2023 08:13:32 -0600 Subject: [PATCH 05/48] add zig snippet --- modules/editor/doom/config/snippets/zig-mode/main | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 modules/editor/doom/config/snippets/zig-mode/main diff --git a/modules/editor/doom/config/snippets/zig-mode/main b/modules/editor/doom/config/snippets/zig-mode/main new file mode 100644 index 00000000..c344a1e5 --- /dev/null +++ b/modules/editor/doom/config/snippets/zig-mode/main @@ -0,0 +1,8 @@ +# -*- mode: snippet -*- +# name: main +# -- + +const std = @import("std"); +pub fn main() void { + +} \ No newline at end of file From 194b2e83e07aadcde312332fdb89775bf70159c3 Mon Sep 17 00:00:00 2001 From: yuanwang Date: Tue, 10 Oct 2023 12:31:37 -0600 Subject: [PATCH 06/48] add scheme --- hosts/wk01174.nix | 2 ++ modules/default.nix | 1 + modules/dev/scheme.nix | 13 +++++++++++++ modules/dev/zig.nix | 3 +-- 4 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 modules/dev/scheme.nix diff --git a/hosts/wk01174.nix b/hosts/wk01174.nix index 9b436a3b..8e842dfc 100644 --- a/hosts/wk01174.nix +++ b/hosts/wk01174.nix @@ -83,6 +83,8 @@ haskell.enable = true; haxe.enable = true; python.enable = true; + zig.enable = true; + scheme.enable = true; }; terminal = { diff --git a/modules/default.nix b/modules/default.nix index 62b5146f..a9f88639 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -14,6 +14,7 @@ ./dev/node.nix ./dev/python.nix ./dev/zig.nix + ./dev/scheme.nix ./helix.nix ./editor/doom ./editor/neovim diff --git a/modules/dev/scheme.nix b/modules/dev/scheme.nix new file mode 100644 index 00000000..e78987c3 --- /dev/null +++ b/modules/dev/scheme.nix @@ -0,0 +1,13 @@ +{ config, lib, pkgs, ... }: +with lib; +let cfg = config.modules.dev.scheme; +in { + + options.modules.dev.scheme = { enable = mkEnableOption "scheme"; }; + + config = mkIf cfg.enable { + home-manager.users.${config.my.username} = { + home.packages = [ pkgs.mitscheme ]; + }; + }; +} diff --git a/modules/dev/zig.nix b/modules/dev/zig.nix index ef254237..dd59e361 100644 --- a/modules/dev/zig.nix +++ b/modules/dev/zig.nix @@ -1,12 +1,11 @@ { config, lib, pkgs, ... }: with lib; -let cfg = config.modules.dev.haskell; +let cfg = config.modules.dev.zig; in { options.modules.dev.zig = { enable = mkEnableOption "zig"; }; config = mkIf cfg.enable { - home-manager.users.${config.my.username} = { home.packages = [ pkgs.zig pkgs.zls ]; }; From f681498985f852aa697968aec9ef59b40592c6aa Mon Sep 17 00:00:00 2001 From: yuanwang Date: Tue, 10 Oct 2023 13:00:03 -0600 Subject: [PATCH 07/48] wip --- hosts/wk01174.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hosts/wk01174.nix b/hosts/wk01174.nix index 8e842dfc..d7542d19 100644 --- a/hosts/wk01174.nix +++ b/hosts/wk01174.nix @@ -56,6 +56,7 @@ "redis" "frugal" "picat" + "mit-scheme" # https://formulae.brew.sh/formula/docker-compose # mkdir -p ~/.docker/cli-plugins # ln -sfn $HOMEBREW_PREFIX/opt/docker-compose/bin/docker-compose ~/.docker/cli-plugins/docker-compose @@ -84,7 +85,7 @@ haxe.enable = true; python.enable = true; zig.enable = true; - scheme.enable = true; + # scheme.enable = true; }; terminal = { From b80a58dd2ea39a6a09f9e1e7f55932b0bc1a0cd4 Mon Sep 17 00:00:00 2001 From: yuanwang Date: Tue, 10 Oct 2023 18:41:10 -0600 Subject: [PATCH 08/48] try --- hosts/wk01174.nix | 4 ++-- modules/dev/scheme.nix | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/hosts/wk01174.nix b/hosts/wk01174.nix index d7542d19..9b0e0f05 100644 --- a/hosts/wk01174.nix +++ b/hosts/wk01174.nix @@ -56,7 +56,7 @@ "redis" "frugal" "picat" - "mit-scheme" + # "mit-scheme" # https://formulae.brew.sh/formula/docker-compose # mkdir -p ~/.docker/cli-plugins # ln -sfn $HOMEBREW_PREFIX/opt/docker-compose/bin/docker-compose ~/.docker/cli-plugins/docker-compose @@ -85,7 +85,7 @@ haxe.enable = true; python.enable = true; zig.enable = true; - # scheme.enable = true; + scheme.enable = true; }; terminal = { diff --git a/modules/dev/scheme.nix b/modules/dev/scheme.nix index e78987c3..47fb3184 100644 --- a/modules/dev/scheme.nix +++ b/modules/dev/scheme.nix @@ -4,10 +4,11 @@ let cfg = config.modules.dev.scheme; in { options.modules.dev.scheme = { enable = mkEnableOption "scheme"; }; - + # https://wingolog.org/archives/2013/01/07/an-opinionated-guide-to-scheme-implementations config = mkIf cfg.enable { home-manager.users.${config.my.username} = { - home.packages = [ pkgs.mitscheme ]; + # http://wiki.call-cc.org/man/5/Using%20the%20interpreter + home.packages = [ pkgs.chicken ]; }; }; } From c12ee60443cec240992c97740ef4b7a346cc9efb Mon Sep 17 00:00:00 2001 From: yuanwang Date: Wed, 11 Oct 2023 13:01:10 -0600 Subject: [PATCH 09/48] add more langs for doom --- modules/editor/doom/config/init.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/editor/doom/config/init.el b/modules/editor/doom/config/init.el index df1a0441..29f8a56b 100644 --- a/modules/editor/doom/config/init.el +++ b/modules/editor/doom/config/init.el @@ -180,14 +180,15 @@ (python +lsp +tree-sitter ) ; beautiful is better than ugly ;;qt ; the 'cutest' gui framework ever - ;;racket ; a DSL for DSLs + racket ; a DSL for DSLs ;;raku ; the artist formerly known as perl6 ;;rest ; Emacs as a REST client ;;rst ; ReST in peace + rust ;;(ruby +rails) ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"} ;; ; Fe2O3.unwrap().unwrap().unwrap().unwrap() ;;scala ; java, but good - ;;(scheme +guile) ; a fully conniving family of lisps + (scheme) ; a fully conniving family of lisps sh ; she sells {ba,z,fi}sh shells on the C xor ;;sml ;;solidity ; do you need a blockchain? No. From d823c057140350d0ef0d9b83bd0d1d6bdec7df19 Mon Sep 17 00:00:00 2001 From: yuanwang Date: Thu, 12 Oct 2023 06:58:10 -0600 Subject: [PATCH 10/48] try out ollama --- modules/packages.nix | 2 +- packages/default.nix | 1 - packages/open-interpreter.nix | 52 ----------------------------------- 3 files changed, 1 insertion(+), 54 deletions(-) delete mode 100644 packages/open-interpreter.nix diff --git a/modules/packages.nix b/modules/packages.nix index bd881907..bdd4fcfd 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -67,9 +67,9 @@ with pkgs; [ dig just - # toybox pkg-config racket + ollama # open-interpreter # reiryoku-firmware # reiryoku-flash diff --git a/packages/default.nix b/packages/default.nix index d70093c8..51060bf3 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -9,7 +9,6 @@ _final: prev: { font-hack-nerd-font = prev.callPackage ./font-hack-nerd-font.nix { }; ical-buddy = prev.callPackage ./ical-buddy.nix { }; sketchybar-cpu-helper = prev.callPackage ./sketchybar-cpu-helper { }; - open-interpreter = prev.callPackage ./open-interpreter.nix { }; haskellPackages = prev.haskellPackages.override { overrides = haskellPackagesNew: _haskellPackagesOld: rec { ws-access-token = diff --git a/packages/open-interpreter.nix b/packages/open-interpreter.nix deleted file mode 100644 index 281f77bf..00000000 --- a/packages/open-interpreter.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ lib -, python3 -, fetchFromGitHub -}: -let - version = "0.1.3"; -in -python3.pkgs.buildPythonApplication { - pname = "open-interpreter"; - format = "pyproject"; - inherit version; - - src = fetchFromGitHub { - owner = "KillianLucas"; - repo = "open-interpreter"; - rev = "v${version}"; - hash = "sha256-xmmyDIshEYql41k/7gF+ay7s3mI+iGCjr5gDfLkqLU0="; - }; - - nativeBuildInputs = [ - python3.pkgs.poetry-core - ]; - - propagatedBuildInputs = with python3.pkgs; [ - appdirs - astor - gitpython - huggingface-hub - inquirer - litellm - openai - # pyreadline3 # this is a windows deps - python-dotenv - rich - six - tiktoken - tokentrim - wget - ]; - - # the import check phase fails trying to do a network request to openai - # because of litellm - # pythonImportsCheck = [ "interpreter" ]; - - meta = with lib; { - description = "OpenAI's Code Interpreter in your terminal, running locally"; - homepage = "https://github.com/KillianLucas/open-interpreter"; - license = licenses.mit; - changelog = "https://github.com/KillianLucas/open-interpreter/releases/tag/v${version}"; - maintainers = with maintainers; [ happysalada ]; - }; -} From 6bb7e9d7034309c3af34f8cb34ffaef638d0f2e7 Mon Sep 17 00:00:00 2001 From: yuanwang Date: Thu, 12 Oct 2023 12:32:42 -0600 Subject: [PATCH 11/48] comment out mesa overlay. since it is not working --- flake.nix | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/flake.nix b/flake.nix index aea1b5ba..5af9be21 100644 --- a/flake.nix +++ b/flake.nix @@ -60,34 +60,34 @@ inputs.haskell-flake.flakeModule ]; perSystem = { config, system, pkgs, ... }: { - _module.args.pkgs = import inputs.nixpkgs { - inherit system; - overlays = [ - (_final: _prev: { - # https://gitlab.freedesktop.org/mesa/mesa/-/issues/8634 - mesa = if _prev.stdenv.isDarwin then inputs.nixpkgs-stable.legacyPackages.${_prev.system}.mesa else - inputs.nixpkgs.legacyPackages.${_prev.system}.mesa; - }) - ]; - config = { - allowUnsupportedSystem = true; - }; - }; - haskellProjects.default = { - projectRoot = ./packages; - settings = { }; - # overrides = self: super: { }; - autoWire = [ "packages" "apps" "checks" ]; # Wire all but the devShell - devShell = { - hlsCheck.enable = false; - }; + # _module.args.pkgs = import inputs.nixpkgs { + # inherit system; + # overlays = [ + # (_final: _prev: { + # # https://gitlab.freedesktop.org/mesa/mesa/-/issues/8634 + # mesa = if _prev.stdenv.isDarwin then inputs.nixpkgs-stable.legacyPackages.${_prev.system}.mesa else + # inputs.nixpkgs.legacyPackages.${_prev.system}.mesa; + # }) + # ]; + # config = { + # allowUnsupportedSystem = true; + # }; + }; + haskellProjects.default = { + projectRoot = ./packages; + settings = { }; + # overrides = self: super: { }; + autoWire = [ "packages" "apps" "checks" ]; # Wire all but the devShell + devShell = { + hlsCheck.enable = false; }; - - treefmt.imports = [ ./treefmt.nix ]; - # https://github.com/cachix/pre-commit-hooks.nix/blame/30d1c34bdbfe3dd0b8fbdde3962180c56cf16f12/flake-module.nix - pre-commit.settings.hooks.treefmt.enable = true; - }; + treefmt.imports = [ ./treefmt.nix ]; + # https://github.com/cachix/pre-commit-hooks.nix/blame/30d1c34bdbfe3dd0b8fbdde3962180c56cf16f12/flake-module.nix + pre-commit.settings.hooks.treefmt.enable = true; + }; + +}; } From 3aa37bd3ed8845bbc865a9818b9af78899b25eb2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 13 Oct 2023 00:21:46 +0000 Subject: [PATCH 12/48] chore(deps): bump DeterminateSystems/nix-installer-action from 5 to 6 Bumps [DeterminateSystems/nix-installer-action](https://github.com/determinatesystems/nix-installer-action) from 5 to 6. - [Release notes](https://github.com/determinatesystems/nix-installer-action/releases) - [Commits](https://github.com/determinatesystems/nix-installer-action/compare/v5...v6) --- updated-dependencies: - dependency-name: DeterminateSystems/nix-installer-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f41d2e45..f53ed7a9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Install Nix - uses: DeterminateSystems/nix-installer-action@v5 + uses: DeterminateSystems/nix-installer-action@v6 - uses: cachix/cachix-action@v12 with: name: yuanwang-wf From 7316da35f572672dae0df109d8b7c95f3629e0b0 Mon Sep 17 00:00:00 2001 From: yuanwang Date: Fri, 13 Oct 2023 07:05:08 -0600 Subject: [PATCH 13/48] wip --- flake.nix | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/flake.nix b/flake.nix index 5af9be21..5699f504 100644 --- a/flake.nix +++ b/flake.nix @@ -59,7 +59,7 @@ inputs.treefmt-nix.flakeModule inputs.haskell-flake.flakeModule ]; - perSystem = { config, system, pkgs, ... }: { + perSystem = { ... }: { # _module.args.pkgs = import inputs.nixpkgs { # inherit system; # overlays = [ @@ -72,22 +72,22 @@ # config = { # allowUnsupportedSystem = true; # }; - }; - haskellProjects.default = { - projectRoot = ./packages; - settings = { }; - # overrides = self: super: { }; - autoWire = [ "packages" "apps" "checks" ]; # Wire all but the devShell - devShell = { - hlsCheck.enable = false; + # }; + haskellProjects.default = { + projectRoot = ./packages; + settings = { }; + # overrides = self: super: { }; + autoWire = [ "packages" "apps" "checks" ]; # Wire all but the devShell + devShell = { + hlsCheck.enable = false; + }; }; - }; - treefmt.imports = [ ./treefmt.nix ]; - # https://github.com/cachix/pre-commit-hooks.nix/blame/30d1c34bdbfe3dd0b8fbdde3962180c56cf16f12/flake-module.nix - pre-commit.settings.hooks.treefmt.enable = true; + treefmt.imports = [ ./treefmt.nix ]; + # https://github.com/cachix/pre-commit-hooks.nix/blame/30d1c34bdbfe3dd0b8fbdde3962180c56cf16f12/flake-module.nix + pre-commit.settings.hooks.treefmt.enable = true; - }; + }; -}; + }; } From ef6e2881f600fda77157b7baa6919571ced7a2a6 Mon Sep 17 00:00:00 2001 From: yuanwang Date: Fri, 13 Oct 2023 07:11:08 -0600 Subject: [PATCH 14/48] comment out activate for now --- hosts/default.nix | 64 +++++++++++++++++++++++------------------------ 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/hosts/default.nix b/hosts/default.nix index 5f25d900..5e6f2d2c 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -59,43 +59,43 @@ in }; }; }; - perSystem = { system, pkgs, lib, ... }: { + perSystem = { system, ... }: { packages.asche = self.nixosConfigurations.asche.config.system.build.toplevel; packages.yuanw = self.darwinConfigurations.yuanw.system; packages.ci = self.darwinConfigurations.ci.system; packages.wk01174 = self.darwinConfigurations.WK01174.system; - packages.activate = pkgs.writeShellApplication - { - name = "activate"; - text = - # TODO: Replace with deploy-rs or (new) nixinate - if system == "aarch64-darwin" || system == "x86_64-darwin" then - let - # This is used just to pull out the `darwin-rebuild` script. - # See also: https://github.com/LnL7/nix-darwin/issues/613 - emptyConfiguration = nixosSystem { nixpkgs.hostPlatform = system; }; - in - '' - HOSTNAME=$(hostname -s) - set -x - ${emptyConfiguration.system}/sw/bin/darwin-rebuild \ - switch \ - --flake .#"''${HOSTNAME}" \ - "$@" - doom sync - '' - else - '' - HOSTNAME=$(hostname -s) - set -x - ${lib.getExe pkgs.nixos-rebuild} \ - switch \ - --flake .#"''${HOSTNAME}" \ - --use-remote-sudo \ - "$@" - ''; + # packages.activate = pkgs.writeShellApplication + # { + # name = "activate"; + # text = + # # TODO: Replace with deploy-rs or (new) nixinate + # if system == "aarch64-darwin" || system == "x86_64-darwin" then + # let + # # This is used just to pull out the `darwin-rebuild` script. + # # See also: https://github.com/LnL7/nix-darwin/issues/613 + # emptyConfiguration = darwinSystem { nixpkgs.hostPlatform = system; }; + # in + # '' + # HOSTNAME=$(hostname -s) + # set -x + # ${emptyConfiguration.system}/sw/bin/darwin-rebuild \ + # switch \ + # --flake .#"''${HOSTNAME}" \ + # "$@" + # doom sync + # '' + # else + # '' + # HOSTNAME=$(hostname -s) + # set -x + # ${lib.getExe pkgs.nixos-rebuild} \ + # switch \ + # --flake .#"''${HOSTNAME}" \ + # --use-remote-sudo \ + # "$@" + # ''; - }; + # }; # adguard = self.nixosConfigurations.adguard.system; # aws = self.nixosConfigurations.aws.system; From e90ae7f37608d149171c0ae28e362b90f0647886 Mon Sep 17 00:00:00 2001 From: yuanwang Date: Fri, 13 Oct 2023 08:45:13 -0600 Subject: [PATCH 15/48] update garnix targets --- garnix.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/garnix.yaml b/garnix.yaml index 507c882f..99081c92 100644 --- a/garnix.yaml +++ b/garnix.yaml @@ -2,6 +2,8 @@ builds: exclude: - 'packages.x86_64-linux.yuanw' - 'packages.x86_64-linux.ci' + - 'packages.aarch64-darwin.ci' + - 'packages.aarch64-yuanw' - 'packages.x86_64-linux.wk01174' include: - '*.x86_64-linux.*' From 8589f4d07a6175d6d0513accb72505831ef50429 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 13 Oct 2023 00:07:28 +0000 Subject: [PATCH 16/48] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'agenix': 'github:ryantm/agenix/1f677b3e161d3bdbfd08a939e8f25de2568e0ef4' (2023-09-22) → 'github:ryantm/agenix/daf42cb35b2dc614d1551e37f96406e4c4a2d3e4' (2023-10-08) • Updated input 'astro-nvim': 'github:AstroNvim/AstroNvim/6e9083dcafd1a9d702676a687f631072573e5618' (2023-10-05) → 'github:AstroNvim/AstroNvim/fb497c6739f5d368fcba2357b02303a8c82e3ec5' (2023-10-11) • Updated input 'devenv': 'github:cachix/devenv/05e26941f34486bff6ebeb4b9c169b6f637f1758' (2023-10-03) → 'github:cachix/devenv/55294461a62d90c8626feca22f52b0d3d0e18e39' (2023-10-11) • Updated input 'emacs': 'github:nix-community/emacs-overlay/804c3f5ecc955fd7fa2e70be2f2937b5a2c05f26' (2023-10-05) → 'github:nix-community/emacs-overlay/bd5c5e9a9b460a275df97c7226f573cd88cb27ef' (2023-10-12) • Updated input 'emacs/nixpkgs': 'github:NixOS/nixpkgs/fdd898f8f79e8d2f99ed2ab6b3751811ef683242' (2023-10-01) → 'github:NixOS/nixpkgs/f99e5f03cc0aa231ab5950a15ed02afec45ed51a' (2023-10-09) • Updated input 'emacs/nixpkgs-stable': 'github:NixOS/nixpkgs/8a4c17493e5c39769f79117937c79e1c88de6729' (2023-10-03) → 'github:NixOS/nixpkgs/bd1cde45c77891214131cbbea5b1203e485a9d51' (2023-10-11) • Updated input 'home-manager': 'github:nix-community/home-manager/68f7d8c0fb0bfc67d1916dd7f06288424360d43a' (2023-10-04) → 'github:nix-community/home-manager/6bba64781e4b7c1f91a733583defbd3e46b49408' (2023-10-10) • Updated input 'hosts': 'github:StevenBlack/hosts/eba6ecf91055450ffdf6b204da16c06afa596ae1' (2023-10-05) → 'github:StevenBlack/hosts/6e55708c6473c26f79704047c2f758c8784f976d' (2023-10-12) • Updated input 'hosts/nixpkgs': 'github:NixOS/nixpkgs/7131f3c223a2d799568e4b278380cd9dac2b8579' (2023-10-04) → 'github:NixOS/nixpkgs/01441e14af5e29c9d27ace398e6dd0b293e25a54' (2023-10-11) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/fdd898f8f79e8d2f99ed2ab6b3751811ef683242' (2023-10-01) → 'github:NixOS/nixpkgs/f99e5f03cc0aa231ab5950a15ed02afec45ed51a' (2023-10-09) • Updated input 'nixpkgs-stable': 'github:nixos/nixpkgs/8a4c17493e5c39769f79117937c79e1c88de6729' (2023-10-03) → 'github:nixos/nixpkgs/bd1cde45c77891214131cbbea5b1203e485a9d51' (2023-10-11) • Updated input 'nur': 'github:nix-community/NUR/bd7b9e4113d3a4c726309b32f01c62bc192eb311' (2023-10-05) → 'github:nix-community/NUR/9652d4b7c5c05d982e69d1c9df8d05010d431ba0' (2023-10-12) • Updated input 'pre-commit': 'github:cachix/pre-commit-hooks.nix/66c352d33e0907239e4a69416334f64af2c685cc' (2023-10-05) → 'github:cachix/pre-commit-hooks.nix/42e1b6095ef80a51f79595d9951eb38e91c4e6ca' (2023-10-09) • Updated input 'treefmt-nix': 'github:numtide/treefmt-nix/720bd006d855b08e60664e4683ccddb7a9ff614a' (2023-09-27) → 'github:numtide/treefmt-nix/0b2ffeb3ae1a7449a48a952f3e731cfa41eaf780' (2023-10-11) --- flake.lock | 82 +++++++++++++++++++++++++++--------------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/flake.lock b/flake.lock index e9e55a0d..e82fae65 100644 --- a/flake.lock +++ b/flake.lock @@ -11,11 +11,11 @@ ] }, "locked": { - "lastModified": 1695384796, + "lastModified": 1696775529, "narHash": "sha256-TYlE4B0ktPtlJJF9IFxTWrEeq+XKG8Ny0gc2FGEAdj0=", "owner": "ryantm", "repo": "agenix", - "rev": "1f677b3e161d3bdbfd08a939e8f25de2568e0ef4", + "rev": "daf42cb35b2dc614d1551e37f96406e4c4a2d3e4", "type": "github" }, "original": { @@ -27,11 +27,11 @@ "astro-nvim": { "flake": false, "locked": { - "lastModified": 1696545727, - "narHash": "sha256-r2N4363EC6M6NUjebaOro8uIAruVKNFMHU9e9XKEfU4=", + "lastModified": 1697064365, + "narHash": "sha256-LHGH6kAxiBQwy1uA8oSa8cuI+OBQF0b+cTtmLPNbgvs=", "owner": "AstroNvim", "repo": "AstroNvim", - "rev": "6e9083dcafd1a9d702676a687f631072573e5618", + "rev": "fb497c6739f5d368fcba2357b02303a8c82e3ec5", "type": "github" }, "original": { @@ -64,11 +64,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1696344641, - "narHash": "sha256-cfGsdtDvzYaFA7oGWSgcd1yST6LFwvjMcHvtVj56VcU=", + "lastModified": 1697058441, + "narHash": "sha256-gjtW+nkM9suMsjyid63HPmt6WZQEvuVqA5cOAf4lLM0=", "owner": "cachix", "repo": "devenv", - "rev": "05e26941f34486bff6ebeb4b9c169b6f637f1758", + "rev": "55294461a62d90c8626feca22f52b0d3d0e18e39", "type": "github" }, "original": { @@ -84,11 +84,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1696529826, - "narHash": "sha256-H8qj+C6vbn629zxLkj5sOCDhTbqsyrcrDd78tjvgqMY=", + "lastModified": 1697137147, + "narHash": "sha256-s1KYOB3t5TVxQJDlrM699O9Hx7iY/St2UG3SuKnVa4g=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "804c3f5ecc955fd7fa2e70be2f2937b5a2c05f26", + "rev": "bd5c5e9a9b460a275df97c7226f573cd88cb27ef", "type": "github" }, "original": { @@ -307,11 +307,11 @@ ] }, "locked": { - "lastModified": 1696446489, - "narHash": "sha256-xSjMKdNR+q/3hdSPyg/LUMsZT/WIoUi8dcm5zT4SMUQ=", + "lastModified": 1696940889, + "narHash": "sha256-p2Wic74A1tZpFcld1wSEbFQQbrZ/tPDuLieCnspamQo=", "owner": "nix-community", "repo": "home-manager", - "rev": "68f7d8c0fb0bfc67d1916dd7f06288424360d43a", + "rev": "6bba64781e4b7c1f91a733583defbd3e46b49408", "type": "github" }, "original": { @@ -326,11 +326,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1696543310, - "narHash": "sha256-umdWqfza3u/4ONBbaWxPfnCloi3EN3FdNkdZNt7L3oc=", + "lastModified": 1697117905, + "narHash": "sha256-2UVPBKs9hyMgeyrieK9XaPU9mlk25lUNBagPFngWCY0=", "owner": "StevenBlack", "repo": "hosts", - "rev": "eba6ecf91055450ffdf6b204da16c06afa596ae1", + "rev": "6e55708c6473c26f79704047c2f758c8784f976d", "type": "github" }, "original": { @@ -484,11 +484,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1696374741, - "narHash": "sha256-gt8B3G0ryizT9HSB4cCO8QoxdbsHnrQH+/BdKxOwqF0=", + "lastModified": 1696983906, + "narHash": "sha256-L7GyeErguS7Pg4h8nK0wGlcUTbfUMDu+HMf1UcyP72k=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8a4c17493e5c39769f79117937c79e1c88de6729", + "rev": "bd1cde45c77891214131cbbea5b1203e485a9d51", "type": "github" }, "original": { @@ -500,11 +500,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1696374741, - "narHash": "sha256-gt8B3G0ryizT9HSB4cCO8QoxdbsHnrQH+/BdKxOwqF0=", + "lastModified": 1696983906, + "narHash": "sha256-L7GyeErguS7Pg4h8nK0wGlcUTbfUMDu+HMf1UcyP72k=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8a4c17493e5c39769f79117937c79e1c88de6729", + "rev": "bd1cde45c77891214131cbbea5b1203e485a9d51", "type": "github" }, "original": { @@ -532,11 +532,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1696193975, - "narHash": "sha256-mnQjUcYgp9Guu3RNVAB2Srr1TqKcPpRXmJf4LJk6KRY=", + "lastModified": 1696879762, + "narHash": "sha256-Ud6bH4DMcYHUDKavNMxAhcIpDGgHMyL/yaDEAVSImQY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fdd898f8f79e8d2f99ed2ab6b3751811ef683242", + "rev": "f99e5f03cc0aa231ab5950a15ed02afec45ed51a", "type": "github" }, "original": { @@ -548,11 +548,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1696419054, - "narHash": "sha256-EdR+dIKCfqL3voZUDYwcvgRDOektQB9KbhBVcE0/3Mo=", + "lastModified": 1697009197, + "narHash": "sha256-viVRhBTFT8fPJTb1N3brQIpFZnttmwo3JVKNuWRVc3s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7131f3c223a2d799568e4b278380cd9dac2b8579", + "rev": "01441e14af5e29c9d27ace398e6dd0b293e25a54", "type": "github" }, "original": { @@ -562,11 +562,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1696193975, - "narHash": "sha256-mnQjUcYgp9Guu3RNVAB2Srr1TqKcPpRXmJf4LJk6KRY=", + "lastModified": 1696879762, + "narHash": "sha256-Ud6bH4DMcYHUDKavNMxAhcIpDGgHMyL/yaDEAVSImQY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fdd898f8f79e8d2f99ed2ab6b3751811ef683242", + "rev": "f99e5f03cc0aa231ab5950a15ed02afec45ed51a", "type": "github" }, "original": { @@ -577,11 +577,11 @@ }, "nur": { "locked": { - "lastModified": 1696542377, - "narHash": "sha256-swb06Kj12+F9Rr/fXbT2ZGfEoVHcKZCIW+GVjQSI3Xc=", + "lastModified": 1697152430, + "narHash": "sha256-EvKN6W24vITx9a8Bf6bj/SRai8JcSDmJuWm9yviNSoA=", "owner": "nix-community", "repo": "NUR", - "rev": "bd7b9e4113d3a4c726309b32f01c62bc192eb311", + "rev": "9652d4b7c5c05d982e69d1c9df8d05010d431ba0", "type": "github" }, "original": { @@ -601,11 +601,11 @@ "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1696516544, - "narHash": "sha256-8rKE8Je6twTNFRTGF63P9mE3lZIq917RAicdc4XJO80=", + "lastModified": 1696846637, + "narHash": "sha256-0hv4kbXxci2+pxhuXlVgftj/Jq79VSmtAyvfabCCtYk=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "66c352d33e0907239e4a69416334f64af2c685cc", + "rev": "42e1b6095ef80a51f79595d9951eb38e91c4e6ca", "type": "github" }, "original": { @@ -729,11 +729,11 @@ ] }, "locked": { - "lastModified": 1695822946, - "narHash": "sha256-IQU3fYo0H+oGlqX5YrgZU3VRhbt2Oqe6KmslQKUO4II=", + "lastModified": 1697018566, + "narHash": "sha256-tOhoeq621JQOULO9X2U+Io03PK/TQrYFYB4sJFaDCuQ=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "720bd006d855b08e60664e4683ccddb7a9ff614a", + "rev": "0b2ffeb3ae1a7449a48a952f3e731cfa41eaf780", "type": "github" }, "original": { From a47627dfd921984a2a46bedaddfc972e2462ed39 Mon Sep 17 00:00:00 2001 From: yuanwang Date: Fri, 13 Oct 2023 08:45:13 -0600 Subject: [PATCH 17/48] update garnix targets --- garnix.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/garnix.yaml b/garnix.yaml index 507c882f..99081c92 100644 --- a/garnix.yaml +++ b/garnix.yaml @@ -2,6 +2,8 @@ builds: exclude: - 'packages.x86_64-linux.yuanw' - 'packages.x86_64-linux.ci' + - 'packages.aarch64-darwin.ci' + - 'packages.aarch64-yuanw' - 'packages.x86_64-linux.wk01174' include: - '*.x86_64-linux.*' From a3c9d7758307f705775e8a25bc9712f5762e687f Mon Sep 17 00:00:00 2001 From: yuanwang Date: Fri, 13 Oct 2023 09:19:42 -0600 Subject: [PATCH 18/48] terraform is unfree now --- flake.nix | 29 +++++++++++++++-------------- modules/home.nix | 17 ++++++++++------- 2 files changed, 25 insertions(+), 21 deletions(-) diff --git a/flake.nix b/flake.nix index 5699f504..befd7959 100644 --- a/flake.nix +++ b/flake.nix @@ -59,20 +59,21 @@ inputs.treefmt-nix.flakeModule inputs.haskell-flake.flakeModule ]; - perSystem = { ... }: { - # _module.args.pkgs = import inputs.nixpkgs { - # inherit system; - # overlays = [ - # (_final: _prev: { - # # https://gitlab.freedesktop.org/mesa/mesa/-/issues/8634 - # mesa = if _prev.stdenv.isDarwin then inputs.nixpkgs-stable.legacyPackages.${_prev.system}.mesa else - # inputs.nixpkgs.legacyPackages.${_prev.system}.mesa; - # }) - # ]; - # config = { - # allowUnsupportedSystem = true; - # }; - # }; + perSystem = { system, ... }: { + _module.args.pkgs = import inputs.nixpkgs { + inherit system; + # overlays = [ + # (_final: _prev: { + # # https://gitlab.freedesktop.org/mesa/mesa/-/issues/8634 + # mesa = if _prev.stdenv.isDarwin then inputs.nixpkgs-stable.legacyPackages.${_prev.system}.mesa else + # inputs.nixpkgs.legacyPackages.${_prev.system}.mesa; + # }) + # ]; + config = { + allowUnfree = true; + # allowUnsupportedSystem = true; + }; + }; haskellProjects.default = { projectRoot = ./packages; settings = { }; diff --git a/modules/home.nix b/modules/home.nix index 0c4fb981..3fc5367f 100644 --- a/modules/home.nix +++ b/modules/home.nix @@ -28,13 +28,16 @@ enable = true; themes = { - dracula = builtins.readFile (pkgs.fetchFromGitHub - { - owner = "dracula"; - repo = "sublime"; # Bat uses sublime syntax for its themes - rev = "26c57ec282abcaa76e57e055f38432bd827ac34e"; - sha256 = "019hfl4zbn4vm4154hh3bwk6hm7bdxbr1hdww83nabxwjn99ndhv"; - } + "/Dracula.tmTheme"); + dracula = { + src = pkgs.fetchFromGitHub + { + owner = "dracula"; + repo = "sublime"; # Bat uses sublime syntax for its themes + rev = "26c57ec282abcaa76e57e055f38432bd827ac34e"; + sha256 = "019hfl4zbn4vm4154hh3bwk6hm7bdxbr1hdww83nabxwjn99ndhv"; + }; + file = "/Dracula.tmTheme"; + }; }; extraPackages = with pkgs.bat-extras; [ batdiff batman batgrep batwatch ]; }; From 24409254e9c19b89d01a65e08478212aaf2f120b Mon Sep 17 00:00:00 2001 From: yuanwang Date: Fri, 13 Oct 2023 11:37:06 -0600 Subject: [PATCH 19/48] fix target --- garnix.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/garnix.yaml b/garnix.yaml index 99081c92..0362bb24 100644 --- a/garnix.yaml +++ b/garnix.yaml @@ -3,7 +3,7 @@ builds: - 'packages.x86_64-linux.yuanw' - 'packages.x86_64-linux.ci' - 'packages.aarch64-darwin.ci' - - 'packages.aarch64-yuanw' + - 'packages.aarch64-darwin.yuanw' - 'packages.x86_64-linux.wk01174' include: - '*.x86_64-linux.*' From af32a9459f6b059b9b0b379e5ad313dc33b942b5 Mon Sep 17 00:00:00 2001 From: yuanwang Date: Fri, 13 Oct 2023 11:57:01 -0600 Subject: [PATCH 20/48] disable all nix-darwin for now due to sandbox issue --- garnix.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/garnix.yaml b/garnix.yaml index 0362bb24..0e098f07 100644 --- a/garnix.yaml +++ b/garnix.yaml @@ -4,6 +4,7 @@ builds: - 'packages.x86_64-linux.ci' - 'packages.aarch64-darwin.ci' - 'packages.aarch64-darwin.yuanw' + - 'packages.aarch64-darwin.wk01174' - 'packages.x86_64-linux.wk01174' include: - '*.x86_64-linux.*' From c8053588564bc96b38b6933442fd23f1c27706d3 Mon Sep 17 00:00:00 2001 From: Yuan Wang <163165+yuanw@users.noreply.github.com> Date: Fri, 13 Oct 2023 13:11:18 -0600 Subject: [PATCH 21/48] try a arch darwin --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f53ed7a9..da811192 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ jobs: name: yuanwang-wf authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' #https://github.com/github/roadmap/issues/528 - - run: nix flake check + - run: nix build .#wk01174 nixos: runs-on: ubuntu-latest steps: From 51a3d6334180139d5fcf1dfff41782f153292ad4 Mon Sep 17 00:00:00 2001 From: Yuan Wang <163165+yuanw@users.noreply.github.com> Date: Fri, 13 Oct 2023 13:20:55 -0600 Subject: [PATCH 22/48] Update run on --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index da811192..d588ca61 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,7 +4,7 @@ on: push: jobs: mac: - runs-on: macos-latest + runs-on: macos-latest-xlarge steps: - uses: actions/checkout@v4 - name: Install Nix From 65fbc566b24c91f92500fbe1299278f714ed46b3 Mon Sep 17 00:00:00 2001 From: yuanwang Date: Fri, 13 Oct 2023 13:49:35 -0600 Subject: [PATCH 23/48] wip --- modules/dev/python.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/dev/python.nix b/modules/dev/python.nix index 25111a21..94615ff7 100644 --- a/modules/dev/python.nix +++ b/modules/dev/python.nix @@ -25,6 +25,7 @@ in { # pylsp-mypy virtualenv virtualenvwrapper + huggingface-hub ])) ]; }; From 058b4d49c43660145857ad92d36a59c60c122284 Mon Sep 17 00:00:00 2001 From: yuanwang Date: Fri, 13 Oct 2023 15:22:28 -0600 Subject: [PATCH 24/48] override ollama --- packages/default.nix | 1 + packages/ollama.nix | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 packages/ollama.nix diff --git a/packages/default.nix b/packages/default.nix index 51060bf3..91f84a4a 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -9,6 +9,7 @@ _final: prev: { font-hack-nerd-font = prev.callPackage ./font-hack-nerd-font.nix { }; ical-buddy = prev.callPackage ./ical-buddy.nix { }; sketchybar-cpu-helper = prev.callPackage ./sketchybar-cpu-helper { }; + ollama = prev.callPackage ./ollama.nix { }; haskellPackages = prev.haskellPackages.override { overrides = haskellPackagesNew: _haskellPackagesOld: rec { ws-access-token = diff --git a/packages/ollama.nix b/packages/ollama.nix new file mode 100644 index 00000000..57a42e54 --- /dev/null +++ b/packages/ollama.nix @@ -0,0 +1,35 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, stdenv +, darwin +}: + +buildGoModule rec { + pname = "ollama"; + version = "0.1.2"; + + src = fetchFromGitHub { + owner = "jmorganca"; + repo = "ollama"; + rev = "v${version}"; + hash = lib.fakeSha256; + }; + + buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ + Accelerate + MetalPerformanceShaders + MetalKit + ]); + + vendorHash = "sha256-IgEf/WOc1eNGCif1fViIFxbgZAd6mHBqfxcaqH/WvGg="; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + description = "Get up and running with large language models locally"; + homepage = "https://github.com/jmorganca/ollama"; + license = licenses.mit; + maintainers = with maintainers; [ dit7ya ]; + }; +} From 11378a051f03d0a65fcc5b14e894e2ea8f4ad4d9 Mon Sep 17 00:00:00 2001 From: yuanwang Date: Fri, 13 Oct 2023 15:24:52 -0600 Subject: [PATCH 25/48] whip --- packages/ollama.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ollama.nix b/packages/ollama.nix index 57a42e54..236ace10 100644 --- a/packages/ollama.nix +++ b/packages/ollama.nix @@ -13,7 +13,7 @@ buildGoModule rec { owner = "jmorganca"; repo = "ollama"; rev = "v${version}"; - hash = lib.fakeSha256; + sha256 = lib.fakeSha256; }; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ From e8c90696bdfafab108def104eb0fec43b1d45a76 Mon Sep 17 00:00:00 2001 From: yuanwang Date: Fri, 13 Oct 2023 15:25:34 -0600 Subject: [PATCH 26/48] update sha256 --- packages/ollama.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ollama.nix b/packages/ollama.nix index 236ace10..e8c7de95 100644 --- a/packages/ollama.nix +++ b/packages/ollama.nix @@ -13,7 +13,7 @@ buildGoModule rec { owner = "jmorganca"; repo = "ollama"; rev = "v${version}"; - sha256 = lib.fakeSha256; + sha256 = "sha256-mRKgj+WkdaAaFxAdiR/ya5sGXDJe2AeL/ViSpd/6im4="; }; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ From af9fe9388f1eca0d72a00b45d10ab59727bc896b Mon Sep 17 00:00:00 2001 From: yuanwang Date: Fri, 13 Oct 2023 16:09:37 -0600 Subject: [PATCH 27/48] update hash --- packages/ollama.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ollama.nix b/packages/ollama.nix index e8c7de95..f893c6a7 100644 --- a/packages/ollama.nix +++ b/packages/ollama.nix @@ -22,7 +22,7 @@ buildGoModule rec { MetalKit ]); - vendorHash = "sha256-IgEf/WOc1eNGCif1fViIFxbgZAd6mHBqfxcaqH/WvGg="; + vendorHash = "sha256-WqV4UN/W3mwIeGFJhp7zcWqWzUL0ClHagUOZYg07faU="; ldflags = [ "-s" "-w" ]; From 6734aba797f2604c72432829803c6481da818336 Mon Sep 17 00:00:00 2001 From: yuanwang Date: Sat, 14 Oct 2023 13:39:46 -0600 Subject: [PATCH 28/48] try out ollama --- flake.nix | 16 +++++++++------- packages/default.nix | 1 - packages/ollama.nix | 35 ----------------------------------- 3 files changed, 9 insertions(+), 43 deletions(-) delete mode 100644 packages/ollama.nix diff --git a/flake.nix b/flake.nix index befd7959..73e3a544 100644 --- a/flake.nix +++ b/flake.nix @@ -3,6 +3,7 @@ inputs = { nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.05"; + ollama-nixpkgs.url = "github:elohmeier/nixpkgs/ollama"; nixpkgs.url = "nixpkgs/nixos-unstable"; nix-darwin = { url = "github:LnL7/nix-darwin/master"; @@ -62,13 +63,14 @@ perSystem = { system, ... }: { _module.args.pkgs = import inputs.nixpkgs { inherit system; - # overlays = [ - # (_final: _prev: { - # # https://gitlab.freedesktop.org/mesa/mesa/-/issues/8634 - # mesa = if _prev.stdenv.isDarwin then inputs.nixpkgs-stable.legacyPackages.${_prev.system}.mesa else - # inputs.nixpkgs.legacyPackages.${_prev.system}.mesa; - # }) - # ]; + overlays = [ + (_final: _prev: { + ollama = inputs.ollama-nixpkgs.legacyPackages.${_prev.system}.ollama; + # # https://gitlab.freedesktop.org/mesa/mesa/-/issues/8634 + # mesa = if _prev.stdenv.isDarwin then inputs.nixpkgs-stable.legacyPackages.${_prev.system}.mesa else + # inputs.nixpkgs.legacyPackages.${_prev.system}.mesa; + }) + ]; config = { allowUnfree = true; # allowUnsupportedSystem = true; diff --git a/packages/default.nix b/packages/default.nix index 91f84a4a..51060bf3 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -9,7 +9,6 @@ _final: prev: { font-hack-nerd-font = prev.callPackage ./font-hack-nerd-font.nix { }; ical-buddy = prev.callPackage ./ical-buddy.nix { }; sketchybar-cpu-helper = prev.callPackage ./sketchybar-cpu-helper { }; - ollama = prev.callPackage ./ollama.nix { }; haskellPackages = prev.haskellPackages.override { overrides = haskellPackagesNew: _haskellPackagesOld: rec { ws-access-token = diff --git a/packages/ollama.nix b/packages/ollama.nix deleted file mode 100644 index f893c6a7..00000000 --- a/packages/ollama.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ lib -, buildGoModule -, fetchFromGitHub -, stdenv -, darwin -}: - -buildGoModule rec { - pname = "ollama"; - version = "0.1.2"; - - src = fetchFromGitHub { - owner = "jmorganca"; - repo = "ollama"; - rev = "v${version}"; - sha256 = "sha256-mRKgj+WkdaAaFxAdiR/ya5sGXDJe2AeL/ViSpd/6im4="; - }; - - buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk_11_0.frameworks; [ - Accelerate - MetalPerformanceShaders - MetalKit - ]); - - vendorHash = "sha256-WqV4UN/W3mwIeGFJhp7zcWqWzUL0ClHagUOZYg07faU="; - - ldflags = [ "-s" "-w" ]; - - meta = with lib; { - description = "Get up and running with large language models locally"; - homepage = "https://github.com/jmorganca/ollama"; - license = licenses.mit; - maintainers = with maintainers; [ dit7ya ]; - }; -} From 82bf24f37d42d6be323deccdbbdffece56302b31 Mon Sep 17 00:00:00 2001 From: yuanwang Date: Sat, 14 Oct 2023 13:46:00 -0600 Subject: [PATCH 29/48] update --- flake.lock | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/flake.lock b/flake.lock index e82fae65..fbdb4aa5 100644 --- a/flake.lock +++ b/flake.lock @@ -590,6 +590,22 @@ "type": "github" } }, + "ollama-nixpkgs": { + "locked": { + "lastModified": 1697261562, + "narHash": "sha256-J3sST/RtkkWjZnYudoEOoVlYeqoACLAubcq0I0GOTRA=", + "owner": "elohmeier", + "repo": "nixpkgs", + "rev": "5a65a6f6d528f472d6fe9787e681364b5a6f7ba4", + "type": "github" + }, + "original": { + "owner": "elohmeier", + "ref": "ollama", + "repo": "nixpkgs", + "type": "github" + } + }, "pre-commit": { "inputs": { "flake-compat": "flake-compat_2", @@ -658,6 +674,7 @@ "nixpkgs": "nixpkgs_4", "nixpkgs-stable": "nixpkgs-stable_3", "nur": "nur", + "ollama-nixpkgs": "ollama-nixpkgs", "pre-commit": "pre-commit", "treefmt-nix": "treefmt-nix" } From 70fa81ba3477654c6cf6889b3447e81d8e86377f Mon Sep 17 00:00:00 2001 From: yuanwang Date: Sat, 14 Oct 2023 14:21:31 -0600 Subject: [PATCH 30/48] how about this --- flake.lock | 30 +++++++++++++++--------------- modules/common.nix | 6 ++++-- 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/flake.lock b/flake.lock index fbdb4aa5..37923019 100644 --- a/flake.lock +++ b/flake.lock @@ -84,11 +84,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1697137147, - "narHash": "sha256-s1KYOB3t5TVxQJDlrM699O9Hx7iY/St2UG3SuKnVa4g=", + "lastModified": 1697307343, + "narHash": "sha256-fTWgAQ9sIxd2IZyr1RzQ6GYAv9yZnTE/Wf2LYgAKCv8=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "bd5c5e9a9b460a275df97c7226f573cd88cb27ef", + "rev": "e7b748e9a98d6fb4864fa61f809ae1e5f60bffbb", "type": "github" }, "original": { @@ -326,11 +326,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1697117905, - "narHash": "sha256-2UVPBKs9hyMgeyrieK9XaPU9mlk25lUNBagPFngWCY0=", + "lastModified": 1697218332, + "narHash": "sha256-vC0EJQOKdW3eYQnb4hYbNa38PcEx0E2v57nxkSoU82M=", "owner": "StevenBlack", "repo": "hosts", - "rev": "6e55708c6473c26f79704047c2f758c8784f976d", + "rev": "be423f999d8df73c5afbd589a2cc243a1b6b638a", "type": "github" }, "original": { @@ -532,11 +532,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1696879762, - "narHash": "sha256-Ud6bH4DMcYHUDKavNMxAhcIpDGgHMyL/yaDEAVSImQY=", + "lastModified": 1697059129, + "narHash": "sha256-9NJcFF9CEYPvHJ5ckE8kvINvI84SZZ87PvqMbH6pro0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f99e5f03cc0aa231ab5950a15ed02afec45ed51a", + "rev": "5e4c2ada4fcd54b99d56d7bd62f384511a7e2593", "type": "github" }, "original": { @@ -562,11 +562,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1696879762, - "narHash": "sha256-Ud6bH4DMcYHUDKavNMxAhcIpDGgHMyL/yaDEAVSImQY=", + "lastModified": 1697059129, + "narHash": "sha256-9NJcFF9CEYPvHJ5ckE8kvINvI84SZZ87PvqMbH6pro0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f99e5f03cc0aa231ab5950a15ed02afec45ed51a", + "rev": "5e4c2ada4fcd54b99d56d7bd62f384511a7e2593", "type": "github" }, "original": { @@ -577,11 +577,11 @@ }, "nur": { "locked": { - "lastModified": 1697152430, - "narHash": "sha256-EvKN6W24vITx9a8Bf6bj/SRai8JcSDmJuWm9yviNSoA=", + "lastModified": 1697307970, + "narHash": "sha256-Cx1i0SPYIWqihf9MA7iWDQ7yLwlg1bdfNNKvmO9NJHE=", "owner": "nix-community", "repo": "NUR", - "rev": "9652d4b7c5c05d982e69d1c9df8d05010d431ba0", + "rev": "3fe397077d0163997d85e7a17251b34832bc01b5", "type": "github" }, "original": { diff --git a/modules/common.nix b/modules/common.nix index a90c781e..558f97ba 100644 --- a/modules/common.nix +++ b/modules/common.nix @@ -52,10 +52,12 @@ inputs.nur.overlay inputs.agenix.overlays.default (_final: _prev: { + + ollama = inputs.ollama-nixpkgs.legacyPackages.${_prev.system}.ollama; stable = inputs.nixpkgs-stable.legacyPackages.${_prev.system}; # https://gitlab.freedesktop.org/mesa/mesa/-/issues/8634 - mesa = if _prev.stdenv.isDarwin then inputs.nixpkgs-stable.legacyPackages.${_prev.system}.mesa else - inputs.nixpkgs.legacyPackages.${_prev.system}.mesa; + # mesa = if _prev.stdenv.isDarwin then inputs.nixpkgs-stable.legacyPackages.${_prev.system}.mesa else + # inputs.nixpkgs.legacyPackages.${_prev.system}.mesa; # # reiryoku-firmware = inputs.reiryoku.packages.${prev.system}.firmware; # # devenv = inputs.devenv.packages.${prev.system}.devenv; From 5fd56d2215921d1a98c8ea5b2e3976ba54809202 Mon Sep 17 00:00:00 2001 From: yuanwang Date: Sat, 14 Oct 2023 14:28:48 -0600 Subject: [PATCH 31/48] clean up --- flake.nix | 20 ++++++++++---------- modules/common.nix | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/flake.nix b/flake.nix index 73e3a544..e0a0495d 100644 --- a/flake.nix +++ b/flake.nix @@ -60,17 +60,17 @@ inputs.treefmt-nix.flakeModule inputs.haskell-flake.flakeModule ]; - perSystem = { system, ... }: { + perSystem = { ... }: { _module.args.pkgs = import inputs.nixpkgs { - inherit system; - overlays = [ - (_final: _prev: { - ollama = inputs.ollama-nixpkgs.legacyPackages.${_prev.system}.ollama; - # # https://gitlab.freedesktop.org/mesa/mesa/-/issues/8634 - # mesa = if _prev.stdenv.isDarwin then inputs.nixpkgs-stable.legacyPackages.${_prev.system}.mesa else - # inputs.nixpkgs.legacyPackages.${_prev.system}.mesa; - }) - ]; + # inherit system; + # overlays = [ + # (_final: _prev: { + # ollama = inputs.ollama-nixpkgs.legacyPackages.${_prev.system}.ollama; + # # # https://gitlab.freedesktop.org/mesa/mesa/-/issues/8634 + # # mesa = if _prev.stdenv.isDarwin then inputs.nixpkgs-stable.legacyPackages.${_prev.system}.mesa else + # # inputs.nixpkgs.legacyPackages.${_prev.system}.mesa; + # }) + # ]; config = { allowUnfree = true; # allowUnsupportedSystem = true; diff --git a/modules/common.nix b/modules/common.nix index 558f97ba..500474c3 100644 --- a/modules/common.nix +++ b/modules/common.nix @@ -52,7 +52,7 @@ inputs.nur.overlay inputs.agenix.overlays.default (_final: _prev: { - + # https://github.com/NixOS/nixpkgs/pull/257760/files ollama = inputs.ollama-nixpkgs.legacyPackages.${_prev.system}.ollama; stable = inputs.nixpkgs-stable.legacyPackages.${_prev.system}; # https://gitlab.freedesktop.org/mesa/mesa/-/issues/8634 From ebb2ce3aa40bf500e1cfc97c73cf3fad81455222 Mon Sep 17 00:00:00 2001 From: Yuan Wang <163165+yuanw@users.noreply.github.com> Date: Sat, 14 Oct 2023 14:30:40 -0600 Subject: [PATCH 32/48] Update ci.yml --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d588ca61..f53ed7a9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,7 +4,7 @@ on: push: jobs: mac: - runs-on: macos-latest-xlarge + runs-on: macos-latest steps: - uses: actions/checkout@v4 - name: Install Nix @@ -14,7 +14,7 @@ jobs: name: yuanwang-wf authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' #https://github.com/github/roadmap/issues/528 - - run: nix build .#wk01174 + - run: nix flake check nixos: runs-on: ubuntu-latest steps: From f9381f5d3a88e97efce9aa887e82565360a763d5 Mon Sep 17 00:00:00 2001 From: yuanwang Date: Sun, 15 Oct 2023 06:34:39 -0600 Subject: [PATCH 33/48] fix check --- flake.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index e0a0495d..b45ac877 100644 --- a/flake.nix +++ b/flake.nix @@ -60,9 +60,9 @@ inputs.treefmt-nix.flakeModule inputs.haskell-flake.flakeModule ]; - perSystem = { ... }: { + perSystem = { system, ... }: { _module.args.pkgs = import inputs.nixpkgs { - # inherit system; + inherit system; # overlays = [ # (_final: _prev: { # ollama = inputs.ollama-nixpkgs.legacyPackages.${_prev.system}.ollama; From f30d27fd85b54fcef20ff1e2a21f23bd9f75cdbc Mon Sep 17 00:00:00 2001 From: yuanwang Date: Sun, 15 Oct 2023 06:35:15 -0600 Subject: [PATCH 34/48] remove old dated things --- flake.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/flake.nix b/flake.nix index b45ac877..45198f70 100644 --- a/flake.nix +++ b/flake.nix @@ -63,17 +63,8 @@ perSystem = { system, ... }: { _module.args.pkgs = import inputs.nixpkgs { inherit system; - # overlays = [ - # (_final: _prev: { - # ollama = inputs.ollama-nixpkgs.legacyPackages.${_prev.system}.ollama; - # # # https://gitlab.freedesktop.org/mesa/mesa/-/issues/8634 - # # mesa = if _prev.stdenv.isDarwin then inputs.nixpkgs-stable.legacyPackages.${_prev.system}.mesa else - # # inputs.nixpkgs.legacyPackages.${_prev.system}.mesa; - # }) - # ]; config = { allowUnfree = true; - # allowUnsupportedSystem = true; }; }; haskellProjects.default = { From 34a832a517b4026c3f4728cb5f1a2eb96ad37480 Mon Sep 17 00:00:00 2001 From: yuanwang Date: Sun, 15 Oct 2023 18:30:23 -0600 Subject: [PATCH 35/48] add flag for scheme to pick an implem --- modules/editor/doom/config/init.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/editor/doom/config/init.el b/modules/editor/doom/config/init.el index 29f8a56b..7d77db1e 100644 --- a/modules/editor/doom/config/init.el +++ b/modules/editor/doom/config/init.el @@ -188,7 +188,7 @@ ;;(ruby +rails) ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"} ;; ; Fe2O3.unwrap().unwrap().unwrap().unwrap() ;;scala ; java, but good - (scheme) ; a fully conniving family of lisps + (scheme +chicken) ; a fully conniving family of lisps sh ; she sells {ba,z,fi}sh shells on the C xor ;;sml ;;solidity ; do you need a blockchain? No. From 7cdd9329dbda65f53cfe38bc0a0a8d3795048152 Mon Sep 17 00:00:00 2001 From: yuanwang Date: Mon, 16 Oct 2023 07:00:24 -0600 Subject: [PATCH 36/48] try out guile --- modules/dev/scheme.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/dev/scheme.nix b/modules/dev/scheme.nix index 47fb3184..7dd7e453 100644 --- a/modules/dev/scheme.nix +++ b/modules/dev/scheme.nix @@ -8,7 +8,7 @@ in { config = mkIf cfg.enable { home-manager.users.${config.my.username} = { # http://wiki.call-cc.org/man/5/Using%20the%20interpreter - home.packages = [ pkgs.chicken ]; + home.packages = [ pkgs.chicken pkgs.guile ]; }; }; } From 719d0f96c5b907810febc0e25a2003b69b3c4b8e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 20 Oct 2023 00:07:49 +0000 Subject: [PATCH 37/48] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'astro-nvim': 'github:AstroNvim/AstroNvim/fb497c6739f5d368fcba2357b02303a8c82e3ec5' (2023-10-11) → 'github:AstroNvim/AstroNvim/3a72c6e1f89c682564c47cf0a2b6f2ecf9b442d8' (2023-10-18) • Updated input 'emacs': 'github:nix-community/emacs-overlay/e7b748e9a98d6fb4864fa61f809ae1e5f60bffbb' (2023-10-14) → 'github:nix-community/emacs-overlay/8bc94376be2ab9290c3275f18a29cc47c7889c4f' (2023-10-19) • Updated input 'emacs/nixpkgs': 'github:NixOS/nixpkgs/5e4c2ada4fcd54b99d56d7bd62f384511a7e2593' (2023-10-11) → 'github:NixOS/nixpkgs/ca012a02bf8327be9e488546faecae5e05d7d749' (2023-10-16) • Updated input 'emacs/nixpkgs-stable': 'github:NixOS/nixpkgs/bd1cde45c77891214131cbbea5b1203e485a9d51' (2023-10-11) → 'github:NixOS/nixpkgs/b5f8ec6be261dfc44c3b56b220e2793d1b61512b' (2023-10-17) • Updated input 'home-manager': 'github:nix-community/home-manager/6bba64781e4b7c1f91a733583defbd3e46b49408' (2023-10-10) → 'github:nix-community/home-manager/c5c1ea85181d2bb44e46e8a944a8a3f56ad88f19' (2023-10-19) • Updated input 'hosts': 'github:StevenBlack/hosts/be423f999d8df73c5afbd589a2cc243a1b6b638a' (2023-10-13) → 'github:StevenBlack/hosts/5b03c5f9c15dd936cff6f6d221ee023a376dde7f' (2023-10-18) • Updated input 'hosts/nixpkgs': 'github:NixOS/nixpkgs/01441e14af5e29c9d27ace398e6dd0b293e25a54' (2023-10-11) → 'github:NixOS/nixpkgs/458ef9126aa380996d77d44f53f886c2d8485f53' (2023-10-19) • Updated input 'nix-darwin': 'github:LnL7/nix-darwin/8b6ea26d5d2e8359d06278364f41fbc4b903b28a' (2023-10-03) → 'github:LnL7/nix-darwin/19f75c2b45fbfc307ecfeb9dadc41a4c1e4fb980' (2023-10-19) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/5e4c2ada4fcd54b99d56d7bd62f384511a7e2593' (2023-10-11) → 'github:NixOS/nixpkgs/ca012a02bf8327be9e488546faecae5e05d7d749' (2023-10-16) • Updated input 'nixpkgs-stable': 'github:nixos/nixpkgs/bd1cde45c77891214131cbbea5b1203e485a9d51' (2023-10-11) → 'github:nixos/nixpkgs/80c1aab725151632ddc2a20caeb914e76dd0673c' (2023-10-18) • Updated input 'nur': 'github:nix-community/NUR/3fe397077d0163997d85e7a17251b34832bc01b5' (2023-10-14) → 'github:nix-community/NUR/014d3f41f5308e668109dca14045835df73119f1' (2023-10-19) • Updated input 'ollama-nixpkgs': 'github:elohmeier/nixpkgs/5a65a6f6d528f472d6fe9787e681364b5a6f7ba4' (2023-10-14) → 'github:elohmeier/nixpkgs/a80f8017e1ea4e9834a46ed29cac1518cb61b066' (2023-10-18) • Updated input 'pre-commit': 'github:cachix/pre-commit-hooks.nix/42e1b6095ef80a51f79595d9951eb38e91c4e6ca' (2023-10-09) → 'github:cachix/pre-commit-hooks.nix/8cc349bfd082da8782b989cad2158c9ad5bd70fd' (2023-10-19) • Updated input 'treefmt-nix': 'github:numtide/treefmt-nix/0b2ffeb3ae1a7449a48a952f3e731cfa41eaf780' (2023-10-11) → 'github:numtide/treefmt-nix/aae39f64f5ecbe89792d05eacea5cb241891292a' (2023-10-15) --- flake.lock | 84 +++++++++++++++++++++++++++--------------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/flake.lock b/flake.lock index 37923019..b2af982d 100644 --- a/flake.lock +++ b/flake.lock @@ -27,11 +27,11 @@ "astro-nvim": { "flake": false, "locked": { - "lastModified": 1697064365, - "narHash": "sha256-LHGH6kAxiBQwy1uA8oSa8cuI+OBQF0b+cTtmLPNbgvs=", + "lastModified": 1697633970, + "narHash": "sha256-BP0Cj9CKg4JJ7s5KWxcydDRLzIv5ppaaM9o82IGGRVU=", "owner": "AstroNvim", "repo": "AstroNvim", - "rev": "fb497c6739f5d368fcba2357b02303a8c82e3ec5", + "rev": "3a72c6e1f89c682564c47cf0a2b6f2ecf9b442d8", "type": "github" }, "original": { @@ -84,11 +84,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1697307343, - "narHash": "sha256-fTWgAQ9sIxd2IZyr1RzQ6GYAv9yZnTE/Wf2LYgAKCv8=", + "lastModified": 1697735529, + "narHash": "sha256-ff0eFJZZ9nnHE2KwdOyoYZL3oCv4RyDg4E9bVEoJ4V0=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "e7b748e9a98d6fb4864fa61f809ae1e5f60bffbb", + "rev": "8bc94376be2ab9290c3275f18a29cc47c7889c4f", "type": "github" }, "original": { @@ -307,11 +307,11 @@ ] }, "locked": { - "lastModified": 1696940889, - "narHash": "sha256-p2Wic74A1tZpFcld1wSEbFQQbrZ/tPDuLieCnspamQo=", + "lastModified": 1697688028, + "narHash": "sha256-d9CAOd9W2iTrgB31a8Dvyp6Vgn/gxASCNrD4Z9yzUOY=", "owner": "nix-community", "repo": "home-manager", - "rev": "6bba64781e4b7c1f91a733583defbd3e46b49408", + "rev": "c5c1ea85181d2bb44e46e8a944a8a3f56ad88f19", "type": "github" }, "original": { @@ -326,11 +326,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1697218332, - "narHash": "sha256-vC0EJQOKdW3eYQnb4hYbNa38PcEx0E2v57nxkSoU82M=", + "lastModified": 1697646757, + "narHash": "sha256-fPMGNj1dXrbxJDxiC8U41NLz1vL5m3Ayw8uC1HJm4sU=", "owner": "StevenBlack", "repo": "hosts", - "rev": "be423f999d8df73c5afbd589a2cc243a1b6b638a", + "rev": "5b03c5f9c15dd936cff6f6d221ee023a376dde7f", "type": "github" }, "original": { @@ -405,11 +405,11 @@ ] }, "locked": { - "lastModified": 1696360011, - "narHash": "sha256-HpPv27qMuPou4acXcZ8Klm7Zt0Elv9dgDvSJaomWb9Y=", + "lastModified": 1697723594, + "narHash": "sha256-W7lTC+kHGS1YCOutGpxUHF0cK66iY/GYr3INaTyVa/I=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "8b6ea26d5d2e8359d06278364f41fbc4b903b28a", + "rev": "19f75c2b45fbfc307ecfeb9dadc41a4c1e4fb980", "type": "github" }, "original": { @@ -484,11 +484,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1696983906, - "narHash": "sha256-L7GyeErguS7Pg4h8nK0wGlcUTbfUMDu+HMf1UcyP72k=", + "lastModified": 1697583813, + "narHash": "sha256-SRXK2EBMZHlOAs/5bjphhX9XnIKR6peTV6i7yoL6/Lg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bd1cde45c77891214131cbbea5b1203e485a9d51", + "rev": "b5f8ec6be261dfc44c3b56b220e2793d1b61512b", "type": "github" }, "original": { @@ -500,11 +500,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1696983906, - "narHash": "sha256-L7GyeErguS7Pg4h8nK0wGlcUTbfUMDu+HMf1UcyP72k=", + "lastModified": 1697655685, + "narHash": "sha256-79Kuv+QdgsVc+rkibuAgWHnh8IXrLBTOKg5nM0Qvux0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bd1cde45c77891214131cbbea5b1203e485a9d51", + "rev": "80c1aab725151632ddc2a20caeb914e76dd0673c", "type": "github" }, "original": { @@ -532,11 +532,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1697059129, - "narHash": "sha256-9NJcFF9CEYPvHJ5ckE8kvINvI84SZZ87PvqMbH6pro0=", + "lastModified": 1697456312, + "narHash": "sha256-roiSnrqb5r+ehnKCauPLugoU8S36KgmWraHgRqVYndo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e4c2ada4fcd54b99d56d7bd62f384511a7e2593", + "rev": "ca012a02bf8327be9e488546faecae5e05d7d749", "type": "github" }, "original": { @@ -548,11 +548,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1697009197, - "narHash": "sha256-viVRhBTFT8fPJTb1N3brQIpFZnttmwo3JVKNuWRVc3s=", + "lastModified": 1697688401, + "narHash": "sha256-61QlajY7R9PbK25uFl55zh968CVNspwXX1zzimic4Uo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "01441e14af5e29c9d27ace398e6dd0b293e25a54", + "rev": "458ef9126aa380996d77d44f53f886c2d8485f53", "type": "github" }, "original": { @@ -562,11 +562,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1697059129, - "narHash": "sha256-9NJcFF9CEYPvHJ5ckE8kvINvI84SZZ87PvqMbH6pro0=", + "lastModified": 1697456312, + "narHash": "sha256-roiSnrqb5r+ehnKCauPLugoU8S36KgmWraHgRqVYndo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5e4c2ada4fcd54b99d56d7bd62f384511a7e2593", + "rev": "ca012a02bf8327be9e488546faecae5e05d7d749", "type": "github" }, "original": { @@ -577,11 +577,11 @@ }, "nur": { "locked": { - "lastModified": 1697307970, - "narHash": "sha256-Cx1i0SPYIWqihf9MA7iWDQ7yLwlg1bdfNNKvmO9NJHE=", + "lastModified": 1697755585, + "narHash": "sha256-g1elAq0y+RykWwRiDQ4TCOq8Ct4htjk7iFQnSXhSAV0=", "owner": "nix-community", "repo": "NUR", - "rev": "3fe397077d0163997d85e7a17251b34832bc01b5", + "rev": "014d3f41f5308e668109dca14045835df73119f1", "type": "github" }, "original": { @@ -592,11 +592,11 @@ }, "ollama-nixpkgs": { "locked": { - "lastModified": 1697261562, - "narHash": "sha256-J3sST/RtkkWjZnYudoEOoVlYeqoACLAubcq0I0GOTRA=", + "lastModified": 1697653527, + "narHash": "sha256-jC2MG+Wz8TEPc5nuhWndyyCeU+fdcpMp27rENFWd/v4=", "owner": "elohmeier", "repo": "nixpkgs", - "rev": "5a65a6f6d528f472d6fe9787e681364b5a6f7ba4", + "rev": "a80f8017e1ea4e9834a46ed29cac1518cb61b066", "type": "github" }, "original": { @@ -617,11 +617,11 @@ "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1696846637, - "narHash": "sha256-0hv4kbXxci2+pxhuXlVgftj/Jq79VSmtAyvfabCCtYk=", + "lastModified": 1697746376, + "narHash": "sha256-gu77VkgdfaHgNCVufeb6WP9oqFLjwK4jHcoPZmBVF3E=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "42e1b6095ef80a51f79595d9951eb38e91c4e6ca", + "rev": "8cc349bfd082da8782b989cad2158c9ad5bd70fd", "type": "github" }, "original": { @@ -746,11 +746,11 @@ ] }, "locked": { - "lastModified": 1697018566, - "narHash": "sha256-tOhoeq621JQOULO9X2U+Io03PK/TQrYFYB4sJFaDCuQ=", + "lastModified": 1697388351, + "narHash": "sha256-63N2eBpKaziIy4R44vjpUu8Nz5fCJY7okKrkixvDQmY=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "0b2ffeb3ae1a7449a48a952f3e731cfa41eaf780", + "rev": "aae39f64f5ecbe89792d05eacea5cb241891292a", "type": "github" }, "original": { From a3f437959e150c1545573772d6700f204d6d6afa Mon Sep 17 00:00:00 2001 From: yuanwang Date: Sun, 22 Oct 2023 06:52:46 -0600 Subject: [PATCH 38/48] add litellm --- modules/ai.nix | 3 +++ modules/dev/python.nix | 1 + 2 files changed, 4 insertions(+) create mode 100644 modules/ai.nix diff --git a/modules/ai.nix b/modules/ai.nix new file mode 100644 index 00000000..5bd3e36b --- /dev/null +++ b/modules/ai.nix @@ -0,0 +1,3 @@ +{ ... }: + +{ } diff --git a/modules/dev/python.nix b/modules/dev/python.nix index 94615ff7..4121dd63 100644 --- a/modules/dev/python.nix +++ b/modules/dev/python.nix @@ -26,6 +26,7 @@ in { virtualenv virtualenvwrapper huggingface-hub + litellm ])) ]; }; From ad706e0faeab8cbb413fa3d2dce7a01572c754e4 Mon Sep 17 00:00:00 2001 From: yuanwang Date: Sun, 22 Oct 2023 07:13:06 -0600 Subject: [PATCH 39/48] what --- modules/dev/python.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/dev/python.nix b/modules/dev/python.nix index 4121dd63..6d7fab84 100644 --- a/modules/dev/python.nix +++ b/modules/dev/python.nix @@ -27,6 +27,7 @@ in { virtualenvwrapper huggingface-hub litellm + tiktoken ])) ]; }; From bb864377b6766a61071c21fd9725c16126c8e889 Mon Sep 17 00:00:00 2001 From: yuanwang Date: Sun, 22 Oct 2023 17:45:36 -0600 Subject: [PATCH 40/48] add tokenizers --- modules/dev/python.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/dev/python.nix b/modules/dev/python.nix index 6d7fab84..244d28e1 100644 --- a/modules/dev/python.nix +++ b/modules/dev/python.nix @@ -27,7 +27,7 @@ in { virtualenvwrapper huggingface-hub litellm - tiktoken + tokenizers ])) ]; }; From 87108a681288d52787fba3954967defc8604023a Mon Sep 17 00:00:00 2001 From: yuanwang Date: Thu, 26 Oct 2023 19:22:30 -0600 Subject: [PATCH 41/48] update ollama --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index b2af982d..9098c100 100644 --- a/flake.lock +++ b/flake.lock @@ -592,11 +592,11 @@ }, "ollama-nixpkgs": { "locked": { - "lastModified": 1697653527, - "narHash": "sha256-jC2MG+Wz8TEPc5nuhWndyyCeU+fdcpMp27rENFWd/v4=", + "lastModified": 1698306065, + "narHash": "sha256-oldBngftldz6l5uIlaPLAXRTG0fXLdym2DhYHi42UKk=", "owner": "elohmeier", "repo": "nixpkgs", - "rev": "a80f8017e1ea4e9834a46ed29cac1518cb61b066", + "rev": "a6ef35a3c0ab6071c1921645eaf85aff9278504b", "type": "github" }, "original": { From a25e5fd5542759292dfe198d8a75779e62aac72b Mon Sep 17 00:00:00 2001 From: yuanwang Date: Thu, 26 Oct 2023 19:23:51 -0600 Subject: [PATCH 42/48] add comment --- flake.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/flake.nix b/flake.nix index 45198f70..51583754 100644 --- a/flake.nix +++ b/flake.nix @@ -3,6 +3,7 @@ inputs = { nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.05"; + # https://github.com/NixOS/nixpkgs/pull/257760 ollama-nixpkgs.url = "github:elohmeier/nixpkgs/ollama"; nixpkgs.url = "nixpkgs/nixos-unstable"; nix-darwin = { From ce204f0c2a8d81b3cf91fd67758aa22fc9fc2f57 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 27 Oct 2023 00:07:12 +0000 Subject: [PATCH 43/48] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'devenv': 'github:cachix/devenv/55294461a62d90c8626feca22f52b0d3d0e18e39' (2023-10-11) → 'github:cachix/devenv/86f476f7edb86159fd20764489ab4e4df6edb4b6' (2023-10-25) • Updated input 'emacs': 'github:nix-community/emacs-overlay/8bc94376be2ab9290c3275f18a29cc47c7889c4f' (2023-10-19) → 'github:nix-community/emacs-overlay/723d8ec014852d74bc04769c5b47446d5eee5a1d' (2023-10-26) • Updated input 'emacs/nixpkgs': 'github:NixOS/nixpkgs/ca012a02bf8327be9e488546faecae5e05d7d749' (2023-10-16) → 'github:NixOS/nixpkgs/8efd5d1e283604f75a808a20e6cde0ef313d07d4' (2023-10-24) • Updated input 'emacs/nixpkgs-stable': 'github:NixOS/nixpkgs/b5f8ec6be261dfc44c3b56b220e2793d1b61512b' (2023-10-17) → 'github:NixOS/nixpkgs/04f431fe64a5ba8ff129cbbbfec489cfe903982c' (2023-10-24) • Updated input 'haskell-flake': 'github:srid/haskell-flake/63a160879e6700b1c9385852043b162183063e9a' (2023-09-26) → 'github:srid/haskell-flake/4f6a2cbe4ee9024ffebb834473592db6c6b2c943' (2023-10-24) • Updated input 'home-manager': 'github:nix-community/home-manager/c5c1ea85181d2bb44e46e8a944a8a3f56ad88f19' (2023-10-19) → 'github:nix-community/home-manager/09587fbbc6a669f7725613e044c2577dc5d43ab5' (2023-10-25) • Updated input 'hosts': 'github:StevenBlack/hosts/5b03c5f9c15dd936cff6f6d221ee023a376dde7f' (2023-10-18) → 'github:StevenBlack/hosts/05cdb4d0a2161aed9e83307c3cfe5c145460862d' (2023-10-23) • Updated input 'hosts/nixpkgs': 'github:NixOS/nixpkgs/458ef9126aa380996d77d44f53f886c2d8485f53' (2023-10-19) → 'github:NixOS/nixpkgs/75a52265bda7fd25e06e3a67dee3f0354e73243c' (2023-10-25) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/ca012a02bf8327be9e488546faecae5e05d7d749' (2023-10-16) → 'github:NixOS/nixpkgs/8efd5d1e283604f75a808a20e6cde0ef313d07d4' (2023-10-24) • Updated input 'nixpkgs-stable': 'github:nixos/nixpkgs/80c1aab725151632ddc2a20caeb914e76dd0673c' (2023-10-18) → 'github:nixos/nixpkgs/60b9db998f71ea49e1a9c41824d09aa274be1344' (2023-10-26) • Updated input 'nur': 'github:nix-community/NUR/014d3f41f5308e668109dca14045835df73119f1' (2023-10-19) → 'github:nix-community/NUR/3b1db33750b06f122e369cac982eed7ba7f25791' (2023-10-26) • Updated input 'ollama-nixpkgs': 'github:elohmeier/nixpkgs/a80f8017e1ea4e9834a46ed29cac1518cb61b066' (2023-10-18) → 'github:elohmeier/nixpkgs/a6ef35a3c0ab6071c1921645eaf85aff9278504b' (2023-10-26) • Updated input 'pre-commit': 'github:cachix/pre-commit-hooks.nix/8cc349bfd082da8782b989cad2158c9ad5bd70fd' (2023-10-19) → 'github:cachix/pre-commit-hooks.nix/bd38df3d508dfcdff52cd243d297f218ed2257bf' (2023-10-25) --- flake.lock | 78 +++++++++++++++++++++++++++--------------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/flake.lock b/flake.lock index b2af982d..d4db98d9 100644 --- a/flake.lock +++ b/flake.lock @@ -64,11 +64,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1697058441, - "narHash": "sha256-gjtW+nkM9suMsjyid63HPmt6WZQEvuVqA5cOAf4lLM0=", + "lastModified": 1698243190, + "narHash": "sha256-n+SbyNQRhUcaZoU00d+7wi17HJpw/kAUrXOL4zRcqE8=", "owner": "cachix", "repo": "devenv", - "rev": "55294461a62d90c8626feca22f52b0d3d0e18e39", + "rev": "86f476f7edb86159fd20764489ab4e4df6edb4b6", "type": "github" }, "original": { @@ -84,11 +84,11 @@ "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { - "lastModified": 1697735529, - "narHash": "sha256-ff0eFJZZ9nnHE2KwdOyoYZL3oCv4RyDg4E9bVEoJ4V0=", + "lastModified": 1698341451, + "narHash": "sha256-l86yjvyaRIje0t++PuNTlBPLcyxf2/lZWrp4NbctgLY=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "8bc94376be2ab9290c3275f18a29cc47c7889c4f", + "rev": "723d8ec014852d74bc04769c5b47446d5eee5a1d", "type": "github" }, "original": { @@ -266,11 +266,11 @@ }, "haskell-flake": { "locked": { - "lastModified": 1695739356, - "narHash": "sha256-GhpmzMW4n+wNDsK9A8QdUP48/Q5aHuA4mNPuW474f08=", + "lastModified": 1698155710, + "narHash": "sha256-WuAVmR0EP/DJDpx0p2wrmijL4sYYhqTixHPDPFXMOXI=", "owner": "srid", "repo": "haskell-flake", - "rev": "63a160879e6700b1c9385852043b162183063e9a", + "rev": "4f6a2cbe4ee9024ffebb834473592db6c6b2c943", "type": "github" }, "original": { @@ -307,11 +307,11 @@ ] }, "locked": { - "lastModified": 1697688028, - "narHash": "sha256-d9CAOd9W2iTrgB31a8Dvyp6Vgn/gxASCNrD4Z9yzUOY=", + "lastModified": 1698250431, + "narHash": "sha256-qs2gTeH4wpnWPO6Oi6sOhp2IhG0i0DzcnrJxIY3/CP8=", "owner": "nix-community", "repo": "home-manager", - "rev": "c5c1ea85181d2bb44e46e8a944a8a3f56ad88f19", + "rev": "09587fbbc6a669f7725613e044c2577dc5d43ab5", "type": "github" }, "original": { @@ -326,11 +326,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1697646757, - "narHash": "sha256-fPMGNj1dXrbxJDxiC8U41NLz1vL5m3Ayw8uC1HJm4sU=", + "lastModified": 1698066884, + "narHash": "sha256-0GcBuv9ecO3Q8/RqarWN4jK0HIbTjrSuuJ5ofi+7OXU=", "owner": "StevenBlack", "repo": "hosts", - "rev": "5b03c5f9c15dd936cff6f6d221ee023a376dde7f", + "rev": "05cdb4d0a2161aed9e83307c3cfe5c145460862d", "type": "github" }, "original": { @@ -484,11 +484,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1697583813, - "narHash": "sha256-SRXK2EBMZHlOAs/5bjphhX9XnIKR6peTV6i7yoL6/Lg=", + "lastModified": 1698160471, + "narHash": "sha256-lH7ZEItqQOWi21St9JyE6t3yyFNYGoQqSEcS90WMnBY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b5f8ec6be261dfc44c3b56b220e2793d1b61512b", + "rev": "04f431fe64a5ba8ff129cbbbfec489cfe903982c", "type": "github" }, "original": { @@ -500,11 +500,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1697655685, - "narHash": "sha256-79Kuv+QdgsVc+rkibuAgWHnh8IXrLBTOKg5nM0Qvux0=", + "lastModified": 1698288402, + "narHash": "sha256-jIIjApPdm+4yt8PglX8pUOexAdEiAax/DXW3S/Mb21E=", "owner": "nixos", "repo": "nixpkgs", - "rev": "80c1aab725151632ddc2a20caeb914e76dd0673c", + "rev": "60b9db998f71ea49e1a9c41824d09aa274be1344", "type": "github" }, "original": { @@ -532,11 +532,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1697456312, - "narHash": "sha256-roiSnrqb5r+ehnKCauPLugoU8S36KgmWraHgRqVYndo=", + "lastModified": 1698134075, + "narHash": "sha256-foCD+nuKzfh49bIoiCBur4+Fx1nozo+4C/6k8BYk4sg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ca012a02bf8327be9e488546faecae5e05d7d749", + "rev": "8efd5d1e283604f75a808a20e6cde0ef313d07d4", "type": "github" }, "original": { @@ -548,11 +548,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1697688401, - "narHash": "sha256-61QlajY7R9PbK25uFl55zh968CVNspwXX1zzimic4Uo=", + "lastModified": 1698266953, + "narHash": "sha256-jf72t7pC8+8h8fUslUYbWTX5rKsRwOzRMX8jJsGqDXA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "458ef9126aa380996d77d44f53f886c2d8485f53", + "rev": "75a52265bda7fd25e06e3a67dee3f0354e73243c", "type": "github" }, "original": { @@ -562,11 +562,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1697456312, - "narHash": "sha256-roiSnrqb5r+ehnKCauPLugoU8S36KgmWraHgRqVYndo=", + "lastModified": 1698134075, + "narHash": "sha256-foCD+nuKzfh49bIoiCBur4+Fx1nozo+4C/6k8BYk4sg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ca012a02bf8327be9e488546faecae5e05d7d749", + "rev": "8efd5d1e283604f75a808a20e6cde0ef313d07d4", "type": "github" }, "original": { @@ -577,11 +577,11 @@ }, "nur": { "locked": { - "lastModified": 1697755585, - "narHash": "sha256-g1elAq0y+RykWwRiDQ4TCOq8Ct4htjk7iFQnSXhSAV0=", + "lastModified": 1698360430, + "narHash": "sha256-Kkr6rPExovu7dFZi50oTyu9QATfBNszY0slpL3pBM0k=", "owner": "nix-community", "repo": "NUR", - "rev": "014d3f41f5308e668109dca14045835df73119f1", + "rev": "3b1db33750b06f122e369cac982eed7ba7f25791", "type": "github" }, "original": { @@ -592,11 +592,11 @@ }, "ollama-nixpkgs": { "locked": { - "lastModified": 1697653527, - "narHash": "sha256-jC2MG+Wz8TEPc5nuhWndyyCeU+fdcpMp27rENFWd/v4=", + "lastModified": 1698306065, + "narHash": "sha256-oldBngftldz6l5uIlaPLAXRTG0fXLdym2DhYHi42UKk=", "owner": "elohmeier", "repo": "nixpkgs", - "rev": "a80f8017e1ea4e9834a46ed29cac1518cb61b066", + "rev": "a6ef35a3c0ab6071c1921645eaf85aff9278504b", "type": "github" }, "original": { @@ -617,11 +617,11 @@ "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1697746376, - "narHash": "sha256-gu77VkgdfaHgNCVufeb6WP9oqFLjwK4jHcoPZmBVF3E=", + "lastModified": 1698227354, + "narHash": "sha256-Fi5H9jbaQLmLw9qBi/mkR33CoFjNbobo5xWdX4tKz1Q=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "8cc349bfd082da8782b989cad2158c9ad5bd70fd", + "rev": "bd38df3d508dfcdff52cd243d297f218ed2257bf", "type": "github" }, "original": { From f33163a247531ebdfbedf1f9f46486a487673648 Mon Sep 17 00:00:00 2001 From: yuanwang Date: Fri, 27 Oct 2023 08:15:40 -0600 Subject: [PATCH 44/48] fix treefmt --- packages/ws-access-token/test/Main.hs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/ws-access-token/test/Main.hs b/packages/ws-access-token/test/Main.hs index 5eb4ae0e..e47d13e3 100644 --- a/packages/ws-access-token/test/Main.hs +++ b/packages/ws-access-token/test/Main.hs @@ -1,5 +1,3 @@ -{-# LANGUAGE TemplateHaskell #-} - module Main where import Hedgehog @@ -7,4 +5,4 @@ import Hedgehog.Main import WsAccessToken main :: IO () -main = defaultMain [checkParallel $$(discover)] +main = defaultMain [checkParallel $$ discover] From 2b3fe3074ea2a0ce93030f22502548f59975788e Mon Sep 17 00:00:00 2001 From: yuanwang Date: Fri, 27 Oct 2023 09:31:08 -0600 Subject: [PATCH 45/48] drop hedgehog --- packages/ws-access-token/test/Main.hs | 6 +----- packages/ws-access-token/ws-access-token.cabal | 1 - 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/packages/ws-access-token/test/Main.hs b/packages/ws-access-token/test/Main.hs index e47d13e3..5c36e595 100644 --- a/packages/ws-access-token/test/Main.hs +++ b/packages/ws-access-token/test/Main.hs @@ -1,8 +1,4 @@ module Main where -import Hedgehog -import Hedgehog.Main -import WsAccessToken - main :: IO () -main = defaultMain [checkParallel $$ discover] +main = putStrLn "Test suite not yet implemented" diff --git a/packages/ws-access-token/ws-access-token.cabal b/packages/ws-access-token/ws-access-token.cabal index 1e3b87fb..ad314b55 100644 --- a/packages/ws-access-token/ws-access-token.cabal +++ b/packages/ws-access-token/ws-access-token.cabal @@ -47,5 +47,4 @@ test-suite ws-access-token-tests ghc-options: -Wall -threaded build-depends: base >=4.11 && <5 - , hedgehog , ws-access-token From 764f36acd9f60d4cd5a8950aea47c687639bd270 Mon Sep 17 00:00:00 2001 From: yuanwang Date: Fri, 27 Oct 2023 12:05:00 -0600 Subject: [PATCH 46/48] try this --- flake.nix | 1 + modules/common.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/flake.nix b/flake.nix index 51583754..987c7d57 100644 --- a/flake.nix +++ b/flake.nix @@ -3,6 +3,7 @@ inputs = { nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-23.05"; + nixpkgs-master.url = "github:nixos/nixpkgs/master"; # https://github.com/NixOS/nixpkgs/pull/257760 ollama-nixpkgs.url = "github:elohmeier/nixpkgs/ollama"; nixpkgs.url = "nixpkgs/nixos-unstable"; diff --git a/modules/common.nix b/modules/common.nix index 500474c3..cc496bf1 100644 --- a/modules/common.nix +++ b/modules/common.nix @@ -55,6 +55,7 @@ # https://github.com/NixOS/nixpkgs/pull/257760/files ollama = inputs.ollama-nixpkgs.legacyPackages.${_prev.system}.ollama; stable = inputs.nixpkgs-stable.legacyPackages.${_prev.system}; + udiskie = inputs.nixpks-master.legacyPackages.${_prev.system}.udiskie; # https://gitlab.freedesktop.org/mesa/mesa/-/issues/8634 # mesa = if _prev.stdenv.isDarwin then inputs.nixpkgs-stable.legacyPackages.${_prev.system}.mesa else # inputs.nixpkgs.legacyPackages.${_prev.system}.mesa; From ec107affbe7fc5795c83b0f8932aeedc4aade617 Mon Sep 17 00:00:00 2001 From: yuanwang Date: Fri, 27 Oct 2023 12:07:56 -0600 Subject: [PATCH 47/48] fix --- modules/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/common.nix b/modules/common.nix index cc496bf1..188528ca 100644 --- a/modules/common.nix +++ b/modules/common.nix @@ -55,7 +55,7 @@ # https://github.com/NixOS/nixpkgs/pull/257760/files ollama = inputs.ollama-nixpkgs.legacyPackages.${_prev.system}.ollama; stable = inputs.nixpkgs-stable.legacyPackages.${_prev.system}; - udiskie = inputs.nixpks-master.legacyPackages.${_prev.system}.udiskie; + udiskie = inputs.nixpkgs-master.legacyPackages.${_prev.system}.udiskie; # https://gitlab.freedesktop.org/mesa/mesa/-/issues/8634 # mesa = if _prev.stdenv.isDarwin then inputs.nixpkgs-stable.legacyPackages.${_prev.system}.mesa else # inputs.nixpkgs.legacyPackages.${_prev.system}.mesa; From bffd79f07b1dd0c62c73aaf167dfb9867123d808 Mon Sep 17 00:00:00 2001 From: yuanwang Date: Fri, 27 Oct 2023 13:31:35 -0600 Subject: [PATCH 48/48] add comment --- modules/common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/common.nix b/modules/common.nix index 188528ca..a42b9c22 100644 --- a/modules/common.nix +++ b/modules/common.nix @@ -55,6 +55,7 @@ # https://github.com/NixOS/nixpkgs/pull/257760/files ollama = inputs.ollama-nixpkgs.legacyPackages.${_prev.system}.ollama; stable = inputs.nixpkgs-stable.legacyPackages.${_prev.system}; + # https://nixpk.gs/pr-tracker.html?pr=263500 udiskie = inputs.nixpkgs-master.legacyPackages.${_prev.system}.udiskie; # https://gitlab.freedesktop.org/mesa/mesa/-/issues/8634 # mesa = if _prev.stdenv.isDarwin then inputs.nixpkgs-stable.legacyPackages.${_prev.system}.mesa else