diff --git a/flake.lock b/flake.lock index f330725..18f67a3 100644 --- a/flake.lock +++ b/flake.lock @@ -224,22 +224,6 @@ "type": "github" } }, - "doomemacs": { - "flake": false, - "locked": { - "lastModified": 1756822563, - "narHash": "sha256-rdgLAFUPwDtAYuqVuXK7dcLf5iF9NmybEi8Op6Jro58=", - "owner": "doomemacs", - "repo": "doomemacs", - "rev": "f5c6c2a1bd3b25cd7812dc59289f614339aa00e4", - "type": "github" - }, - "original": { - "owner": "doomemacs", - "repo": "doomemacs", - "type": "github" - } - }, "ema": { "flake": false, "locked": { @@ -257,29 +241,6 @@ "type": "github" } }, - "emacs-overlay": { - "inputs": { - "nixpkgs": [ - "nix-doom-emacs-unstraightened" - ], - "nixpkgs-stable": [ - "nix-doom-emacs-unstraightened" - ] - }, - "locked": { - "lastModified": 1756887754, - "narHash": "sha256-7OL0lKLSyOaJe3jvNWgMeMEA/QPJMTvSrMkQr0Ts2zk=", - "owner": "nix-community", - "repo": "emacs-overlay", - "rev": "29e23edd74721ebb7d7c1fa3720cd713982a27b1", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "emacs-overlay", - "type": "github" - } - }, "emanote": { "inputs": { "commonmark-simple": "commonmark-simple", @@ -446,24 +407,6 @@ } }, "flake-parts_6": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_2" - }, - "locked": { - "lastModified": 1754487366, - "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_7": { "inputs": { "nixpkgs-lib": [ "vira", @@ -486,7 +429,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1681202837, @@ -504,7 +447,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1681202837, @@ -767,11 +710,11 @@ ] }, "locked": { - "lastModified": 1765859973, - "narHash": "sha256-LN5O0h9GSgcDE/sz4+sLS3CbQALru1x4lh9hrxpeHwI=", + "lastModified": 1765979862, + "narHash": "sha256-/r9/1KamvbHJx6I40H4HsSXnEcBAkj46ZwibhBx9kg0=", "owner": "nix-community", "repo": "home-manager", - "rev": "7df150f0d3857cf68dae443813b27acfb201b2d8", + "rev": "d3135ab747fd9dac250ffb90b4a7e80634eacbe9", "type": "github" }, "original": { @@ -949,11 +892,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1765894766, - "narHash": "sha256-QX5/kwdAsxgfsbwM68jMEtv4MBZjps9vwXhKRUVQZbc=", + "lastModified": 1766068456, + "narHash": "sha256-aQLGBE3rAbHW5foCCNRtAXAggjuFYlH5t7BDOzWEKho=", "owner": "numtide", "repo": "nix-ai-tools", - "rev": "431825d77100f10e23853c0fa3edc357e11f9382", + "rev": "d6bcf9b4afc751a054a639e062497c2936009064", "type": "github" }, "original": { @@ -983,29 +926,6 @@ "type": "github" } }, - "nix-doom-emacs-unstraightened": { - "inputs": { - "doomemacs": "doomemacs", - "emacs-overlay": "emacs-overlay", - "nixpkgs": [ - "nixpkgs" - ], - "systems": "systems_3" - }, - "locked": { - "lastModified": 1756888828, - "narHash": "sha256-95/l9Le9kAD9ibcareUzamtJBEftYNjQ6T8R7/YYpgU=", - "owner": "marienz", - "repo": "nix-doom-emacs-unstraightened", - "rev": "264b3cd40364769db2469ec587ec1cf872256cb8", - "type": "github" - }, - "original": { - "owner": "marienz", - "repo": "nix-doom-emacs-unstraightened", - "type": "github" - } - }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -1179,21 +1099,6 @@ "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" } }, - "nixpkgs-lib_2": { - "locked": { - "lastModified": 1753579242, - "narHash": "sha256-zvaMGVn14/Zz8hnp4VWT9xVnhc8vuL3TStRqwk22biA=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "0f36c44e01a6129be94e3ade315a5883f0228a6e", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1738264807, @@ -1241,11 +1146,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1765762245, - "narHash": "sha256-3iXM/zTqEskWtmZs3gqNiVtRTsEjYAedIaLL0mSBsrk=", + "lastModified": 1765838191, + "narHash": "sha256-m5KWt1nOm76ILk/JSCxBM4MfK3rYY7Wq9/TZIIeGnT8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c8cfcd6ccd422e41cc631a0b73ed4d5a925c393d", + "rev": "c6f52ebd45e5925c188d1a20119978aa4ffd5ef6", "type": "github" }, "original": { @@ -1270,22 +1175,6 @@ } }, "nixpkgs_7": { - "locked": { - "lastModified": 1755577059, - "narHash": "sha256-5hYhxIpco8xR+IpP3uU56+4+Bw7mf7EMyxS/HqUYHQY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "97eb7ee0da337d385ab015a23e15022c865be75c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_8": { "locked": { "lastModified": 1760349414, "narHash": "sha256-W4Ri1ZwYuNcBzqQQa7NnWfrv0wHMo7rduTWjIeU9dZk=", @@ -1307,14 +1196,14 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_5" + "systems": "systems_4" }, "locked": { - "lastModified": 1765894186, - "narHash": "sha256-tB+fg8patWema9dmVUjgD/twHBLQUjs3bhmdm1buAXk=", + "lastModified": 1766065187, + "narHash": "sha256-1d6+VDO26pJzibS5xtANeD6C0e39W07xO4GUPsIwTpk=", "owner": "nix-community", "repo": "nixvim", - "rev": "771cb3c8520caa0c51c749bfe14d16212c241d12", + "rev": "2a1f48e701bb11297432864ba4cadee3b886eba3", "type": "github" }, "original": { @@ -1413,7 +1302,6 @@ "landrun-nix": "landrun-nix", "nix-ai-tools": "nix-ai-tools", "nix-darwin": "nix-darwin", - "nix-doom-emacs-unstraightened": "nix-doom-emacs-unstraightened", "nix-index-database": "nix-index-database", "nixos-hardware": "nixos-hardware", "nixos-unified": "nixos-unified_3", @@ -1421,7 +1309,6 @@ "nixpkgs": "nixpkgs_5", "nixvim": "nixvim", "nuenv": "nuenv", - "try": "try", "vira": "vira" } }, @@ -1554,21 +1441,6 @@ "type": "github" } }, - "systems_6": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tabler-icons": { "flake": false, "locked": { @@ -1631,11 +1503,11 @@ ] }, "locked": { - "lastModified": 1762938485, - "narHash": "sha256-AlEObg0syDl+Spi4LsZIBrjw+snSVU4T8MOeuZJUJjM=", + "lastModified": 1766000401, + "narHash": "sha256-+cqN4PJz9y0JQXfAK5J1drd0U05D5fcAGhzhfVrDlsI=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4", + "rev": "42d96e75aa56a3f70cab7e7dc4a32868db28e8fd", "type": "github" }, "original": { @@ -1644,25 +1516,6 @@ "type": "github" } }, - "try": { - "inputs": { - "flake-parts": "flake-parts_6", - "nixpkgs": "nixpkgs_7" - }, - "locked": { - "lastModified": 1756813707, - "narHash": "sha256-GsJgVnWwlRrB1H7M+jvbZTX2SWXQ4gHvNKw2Tzulf3c=", - "owner": "tobi", - "repo": "try", - "rev": "5f8eb9b9ab061df874212c786ed933f064542d25", - "type": "github" - }, - "original": { - "owner": "tobi", - "repo": "try", - "type": "github" - } - }, "unionmount": { "flake": false, "locked": { @@ -1700,7 +1553,7 @@ "inputs": { "co-log-effectful": "co-log-effectful_2", "devour-flake": "devour-flake", - "flake-parts": "flake-parts_7", + "flake-parts": "flake-parts_6", "fourmolu-nix": "fourmolu-nix_3", "git-hooks": "git-hooks_4", "haskell-flake": "haskell-flake_4", @@ -1710,7 +1563,7 @@ "nix-serve-ng": "nix-serve-ng", "nix-systems": "nix-systems", "nixos-unified": "nixos-unified_4", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_7", "process-compose-flake": "process-compose-flake", "record-hasfield": "record-hasfield", "servant-event-stream": "servant-event-stream_2", diff --git a/flake.nix b/flake.nix index aed1135..abe2a2e 100644 --- a/flake.nix +++ b/flake.nix @@ -31,7 +31,6 @@ nixos-vscode-server.url = "github:nix-community/nixos-vscode-server"; nix-index-database.url = "github:nix-community/nix-index-database"; nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; - try.url = "github:tobi/try"; vira.url = "github:juspay/vira"; nix-ai-tools.url = "github:numtide/nix-ai-tools"; nix-ai-tools.inputs.nixpkgs.follows = "nixpkgs"; @@ -44,9 +43,6 @@ # Neovim nixvim.url = "github:nix-community/nixvim"; nixvim.inputs.nixpkgs.follows = "nixpkgs"; - # Emacs - nix-doom-emacs-unstraightened.url = "github:marienz/nix-doom-emacs-unstraightened"; - nix-doom-emacs-unstraightened.inputs.nixpkgs.follows = "nixpkgs"; # Emanote & Imako emanote.url = "github:srid/emanote"; diff --git a/modules/flake-parts/claude-sandboxed.nix b/modules/flake-parts/claude-sandboxed.nix index 4dafd5b..6015e2d 100644 --- a/modules/flake-parts/claude-sandboxed.nix +++ b/modules/flake-parts/claude-sandboxed.nix @@ -26,6 +26,7 @@ in "$HOME/.claude" "$HOME/.claude.json" "$HOME/.config/gcloud" + "$HOME/.cache/claude-cli-nodejs" ]; rwx = [ "." ]; env = [ diff --git a/modules/flake-parts/nixos-flake.nix b/modules/flake-parts/nixos-flake.nix index 427b68c..a4d0c5c 100644 --- a/modules/flake-parts/nixos-flake.nix +++ b/modules/flake-parts/nixos-flake.nix @@ -14,6 +14,7 @@ "nixpkgs" "home-manager" "nix-darwin" + # "nixos-hardware" "nix-index-database" "nixvim" "nix-ai-tools" diff --git a/modules/home/cli/terminal.nix b/modules/home/cli/terminal.nix index 32030f5..fb0dac3 100644 --- a/modules/home/cli/terminal.nix +++ b/modules/home/cli/terminal.nix @@ -7,7 +7,6 @@ in { imports = [ inputs.nix-index-database.homeModules.nix-index - inputs.try.homeManagerModules.default ]; home.packages = with pkgs; [ # Unixy tools @@ -58,7 +57,7 @@ in # Txns hledger - # hledger-web + hledger-web gnupg ffmpeg @@ -89,9 +88,5 @@ in }; jq.enable = true; btop.enable = true; - try = { - enable = true; - path = "~/tries"; - }; }; } diff --git a/modules/home/darwin-only.nix b/modules/home/darwin-only.nix index 57be8d9..2d51977 100644 --- a/modules/home/darwin-only.nix +++ b/modules/home/darwin-only.nix @@ -4,6 +4,5 @@ ./cli/zsh.nix ./cli/bash.nix ./cli/nushell - # ./editors/emacs.nix ]; } diff --git a/modules/home/editors/emacs.nix b/modules/home/editors/emacs.nix deleted file mode 100644 index 70c99e1..0000000 --- a/modules/home/editors/emacs.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ flake, pkgs, lib, ... }: - -let - inherit (flake) inputs; -in -{ - imports = [ - inputs.nix-doom-emacs-unstraightened.hmModule - ]; - - # https://docs.doomemacs.org/v21.12/modules/lang/org/#/prerequisites/nixos - home.packages = [ - pkgs.texlive.combined.scheme-medium - ]; - - programs.doom-emacs = { - enable = true; - emacs = pkgs.emacs-pgtk; - doomDir = ../../../doom.d; - experimentalFetchTree = true; # Disable if there are fetcher issues - extraPackages = epkgs: with epkgs; lib.optionals pkgs.stdenv.isLinux [ - vterm - ]; - }; -} diff --git a/modules/home/services/vira.nix b/modules/home/services/vira.nix index 798e77a..98cd007 100644 --- a/modules/home/services/vira.nix +++ b/modules/home/services/vira.nix @@ -30,6 +30,7 @@ in nixos-unified = "https://github.com/srid/nixos-unified.git"; hackage-publish = "https://github.com/srid/hackage-publish.git"; haskell-flake = "https://github.com/srid/haskell-flake.git"; + heist-extra = "https://github.com/srid/heist-extra.git"; rust-flake = "https://github.com/juspay/rust-flake.git"; services-flake = "https://github.com/juspay/services-flake.git"; process-compose-flake = "https://github.com/Platonic-Systems/process-compose-flake.git";