From 23534315152c43f1d05504bf1d5f6197d1308461 Mon Sep 17 00:00:00 2001 From: Youwen Wu Date: Mon, 19 Aug 2024 20:15:18 -0700 Subject: [PATCH] update system* *added overlay to build typst-lsp --- flake.lock | 84 ++++++++++++++++++++++---------------------- flake.nix | 15 ++++---- overlays/default.nix | 7 ++++ 3 files changed, 57 insertions(+), 49 deletions(-) create mode 100644 overlays/default.nix diff --git a/flake.lock b/flake.lock index 7f72b6f..3386095 100755 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ }, "bleedingpkgs": { "locked": { - "lastModified": 1723688039, - "narHash": "sha256-/QVv3/9gnukdsUZRR5eJQLhcuXBCLe0rGrF5O6w6jA0=", + "lastModified": 1724117083, + "narHash": "sha256-26Zgap4D9E8PRL9jvc4Df9POMNGFS9fMwKz+SiGrlXI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1ad352fd9ea96cebc7862782fa8d0d295c68ff15", + "rev": "44f636f8cb95238dabd5f33d00557329c0681cd5", "type": "github" }, "original": { @@ -57,11 +57,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1722997334, - "narHash": "sha256-vE5FcKVQ3E0txJKt5w3vOlfcN1XoTAlxK9PnQ/CJavA=", + "lastModified": 1724048768, + "narHash": "sha256-OZ9OXsPQi+fNdMM7SBPtU8OB1ntLzOvUwA/3zYJY6Eo=", "owner": "catppuccin", "repo": "nix", - "rev": "66f4ea170093b62f319f41cebd2337a51b225c5a", + "rev": "ff4128f8ea57879050145cf077a27b9d3a9cbf33", "type": "github" }, "original": { @@ -303,11 +303,11 @@ ] }, "locked": { - "lastModified": 1723202784, - "narHash": "sha256-qbhjc/NEGaDbyy0ucycubq4N3//gDFFH3DOmp1D3u1Q=", + "lastModified": 1723803910, + "narHash": "sha256-yezvUuFiEnCFbGuwj/bQcqg7RykIEqudOy/RBrId0pc=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "c7012d0c18567c889b948781bc74a501e92275d1", + "rev": "bfef0ada09e2c8ac55bbcd0831bd0c9d42e651ba", "type": "github" }, "original": { @@ -367,11 +367,11 @@ ] }, "locked": { - "lastModified": 1723399884, - "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=", + "lastModified": 1723986931, + "narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=", "owner": "nix-community", "repo": "home-manager", - "rev": "086f619dd991a4d355c07837448244029fc2d9ab", + "rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671", "type": "github" }, "original": { @@ -388,11 +388,11 @@ ] }, "locked": { - "lastModified": 1723399884, - "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=", + "lastModified": 1723986931, + "narHash": "sha256-Fy+KEvDQ+Hc8lJAV3t6leXhZJ2ncU5/esxkgt3b8DEY=", "owner": "nix-community", "repo": "home-manager", - "rev": "086f619dd991a4d355c07837448244029fc2d9ab", + "rev": "2598861031b78aadb4da7269df7ca9ddfc3e1671", "type": "github" }, "original": { @@ -404,11 +404,11 @@ "homebrew-cask": { "flake": false, "locked": { - "lastModified": 1723687108, - "narHash": "sha256-yS7kiSJyJzd+mpzAQ1ntrfejGICEhScev6NA0F5rsDE=", + "lastModified": 1724120139, + "narHash": "sha256-vVE53gBCJPc3/dj7OHvQ7mNuUk1bWVpNR4c0jKe+K9U=", "owner": "homebrew", "repo": "homebrew-cask", - "rev": "5feec29994320afeeb5a1a74860a57d9f845bc30", + "rev": "606d3429e6fae79849c0eaf4bbcf05ff1570051a", "type": "github" }, "original": { @@ -420,11 +420,11 @@ "homebrew-core": { "flake": false, "locked": { - "lastModified": 1723681288, - "narHash": "sha256-uU0etusCLcip1KNB2FA8/Zpi+hGwAzKX9X32fdFnTNw=", + "lastModified": 1724119620, + "narHash": "sha256-p+M24z3IDeIJBppaWWTpaz63WMGvi3HGW/mQHQVYpgM=", "owner": "homebrew", "repo": "homebrew-core", - "rev": "5bf3c1c505315f0adff00ce8921169fbf7df217c", + "rev": "cd06a79081ce6e08b475e01315cdf1cb51952d77", "type": "github" }, "original": { @@ -502,11 +502,11 @@ ] }, "locked": { - "lastModified": 1722924007, - "narHash": "sha256-+CQDamNwqO33REJLft8c26NbUi2Td083hq6SvAm2xkU=", + "lastModified": 1723859949, + "narHash": "sha256-kiaGz4deGYKMjJPOji/JVvSP/eTefrIA3rAjOnOpXl4=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "91010a5613ffd7ee23ee9263213157a1c422b705", + "rev": "076b9a905af8a52b866c8db068d6da475839d97b", "type": "github" }, "original": { @@ -541,11 +541,11 @@ ] }, "locked": { - "lastModified": 1722924007, - "narHash": "sha256-+CQDamNwqO33REJLft8c26NbUi2Td083hq6SvAm2xkU=", + "lastModified": 1723859949, + "narHash": "sha256-kiaGz4deGYKMjJPOji/JVvSP/eTefrIA3rAjOnOpXl4=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "91010a5613ffd7ee23ee9263213157a1c422b705", + "rev": "076b9a905af8a52b866c8db068d6da475839d97b", "type": "github" }, "original": { @@ -622,11 +622,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1723362943, - "narHash": "sha256-dFZRVSgmJkyM0bkPpaYRtG/kRMRTorUIDj8BxoOt1T4=", + "lastModified": 1723991338, + "narHash": "sha256-Grh5PF0+gootJfOJFenTTxDTYPidA3V28dqJ/WV7iis=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a58bc8ad779655e790115244571758e8de055e3d", + "rev": "8a3354191c0d7144db9756a74755672387b702ba", "type": "github" }, "original": { @@ -651,11 +651,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1723816538, - "narHash": "sha256-h37ltjdifkd7iLtMtBXSBBeYSTuBEKMW6ClFoC7nReQ=", + "lastModified": 1724118730, + "narHash": "sha256-UwtVD2FyD7FjfLLmqGLsCBCQgLC1Jj78e1PhiVb0MJk=", "owner": "nix-community", "repo": "nixvim", - "rev": "00f32f0430f82c74919c72af84bc95bf5ae434e4", + "rev": "39081a41067a7bdb66f6f85a3fee9693ff8a21b1", "type": "github" }, "original": { @@ -673,11 +673,11 @@ ] }, "locked": { - "lastModified": 1723367906, - "narHash": "sha256-v1qA4WBGDI2uH/TVqRwuXSBP341W681psbzYJ8zrjog=", + "lastModified": 1723969429, + "narHash": "sha256-BuewfNEXEf11MIkJY+uvWsdLu1dIvgJqntWChvNdALg=", "owner": "NuschtOS", "repo": "search", - "rev": "6ca2c3ae05a915c160512bd41f6810f456c9b30d", + "rev": "a05d1805f2a2bc47d230e5e92aecbf69f784f3d0", "type": "github" }, "original": { @@ -773,11 +773,11 @@ }, "stablepkgs": { "locked": { - "lastModified": 1723556749, - "narHash": "sha256-+CHVZnTnIYRLYsARInHYoWkujzcRkLY/gXm3s5bE52o=", + "lastModified": 1723938990, + "narHash": "sha256-9tUadhnZQbWIiYVXH8ncfGXGvkNq3Hag4RCBEMUk7MI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "4a92571f9207810b559c9eac203d1f4d79830073", + "rev": "c42fcfbdfeae23e68fc520f9182dde9f38ad1890", "type": "github" }, "original": { @@ -855,11 +855,11 @@ ] }, "locked": { - "lastModified": 1723454642, - "narHash": "sha256-S0Gvsenh0II7EAaoc9158ZB4vYyuycvMGKGxIbERNAM=", + "lastModified": 1723808491, + "narHash": "sha256-rhis3qNuGmJmYC/okT7Dkc4M8CeUuRCSvW6kC2f3hBc=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "349de7bc435bdff37785c2466f054ed1766173be", + "rev": "1d07739554fdc4f8481068f1b11d6ab4c1a4167a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 593cd6f..95eda5d 100755 --- a/flake.nix +++ b/flake.nix @@ -68,6 +68,7 @@ ./modules/nixos/fonts ./modules/nixos/greeter ./modules/nixos/core + ./overlays catppuccin.nixosModules.catppuccin lix-module.nixosModules.default @@ -83,10 +84,10 @@ ./users/youwen/linux/packages/x86_64 ./users/youwen/linux/programs ./users/youwen/common/neofetch - ./users/youwen/common/neovim + ./users/youwen/common/neovim ./users/youwen/common inputs.catppuccin.homeManagerModules.catppuccin - inputs.nixvim.homeManagerModules.nixvim + inputs.nixvim.homeManagerModules.nixvim ]; }; } @@ -117,10 +118,10 @@ ./users/youwen/common/neofetch/asahi-only.nix ./users/youwen/linux/laptop ./users/youwen/linux/packages/aarch-64 - ./users/youwen/common/neovim + ./users/youwen/common/neovim inputs.catppuccin.homeManagerModules.catppuccin - inputs.nixvim.homeManagerModules.nixvim + inputs.nixvim.homeManagerModules.nixvim ]; }; } @@ -159,12 +160,12 @@ ./users/youwen/linux/laptop ./users/youwen/linux/packages/x86_64 ./users/youwen/linux/programs - ./users/youwen/common/neovim + ./users/youwen/common/neovim ./users/youwen/common ./users/youwen/common/neofetch ./hosts/adrastea/home-manager-overrides.nix inputs.catppuccin.homeManagerModules.catppuccin - inputs.nixvim.homeManagerModules.nixvim + inputs.nixvim.homeManagerModules.nixvim ]; }; } @@ -187,7 +188,7 @@ ./users/youwen/darwin/darwin-home.nix ./users/youwen/common/core.nix ./users/youwen/common/neofetch - ./users/youwen/common/neovim + ./users/youwen/common/neovim ]; home-manager.backupFileExtension = "backup"; diff --git a/overlays/default.nix b/overlays/default.nix new file mode 100644 index 0000000..268d5f5 --- /dev/null +++ b/overlays/default.nix @@ -0,0 +1,7 @@ +{inputs, ...}: { + nixpkgs.overlays = [ + (self: super: { + typst-lsp = inputs.stablepkgs.legacyPackages.${self.system}.typst-lsp; + }) + ]; +}