From 48e17884ae9fa3146659d58f31b9683e1a1280af Mon Sep 17 00:00:00 2001 From: "RingOfStorms (Josh)" Date: Thu, 3 Oct 2024 21:56:29 -0500 Subject: [PATCH] updates --- flake.lock | 33 +++++++++++++++++++++++++-------- hosts/_common/shellInit.sh | 1 + 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index 0314384..7375ae9 100644 --- a/flake.lock +++ b/flake.lock @@ -221,16 +221,32 @@ }, "nixpkgs": { "locked": { - "lastModified": 1727634051, - "narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=", + "lastModified": 1728001490, + "narHash": "sha256-jyLDB1hREFhujapdfZNOyFGQ2+FlhsnhCBYa9YBWn+4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9", + "rev": "52cfd83eee767c5d02089efe79c4811ffc52a046", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "master", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1727907660, + "narHash": "sha256-QftbyPoieM5M50WKUMzQmWtBWib/ZJbHo7mhj5riQec=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "5966581aa04be7eff830b9e1457d56dc70a0b798", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } @@ -1018,6 +1034,7 @@ "ringofstorms-nvim": { "inputs": { "nixpkgs": "nixpkgs", + "nixpkgs-stable": "nixpkgs-stable", "nvim_plugin-Almo7aya/openingh.nvim": "nvim_plugin-Almo7aya/openingh.nvim", "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring": "nvim_plugin-JoosepAlviste/nvim-ts-context-commentstring", "nvim_plugin-L3MON4D3/LuaSnip": "nvim_plugin-L3MON4D3/LuaSnip", @@ -1066,11 +1083,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1727735596, - "narHash": "sha256-cwyBfe7WeWlyrAPCYv7wNcsiqwudVfXxkpM1BP5dpgg=", + "lastModified": 1728010547, + "narHash": "sha256-n3TjPNX8+WBQfscxY66IjFJal865Jj+6BsXrgxyeKkY=", "ref": "refs/heads/master", - "rev": "52c1ffd7306e1902120474249306f82eb2835358", - "revCount": 200, + "rev": "5ce78f6a6944a0ca5e1afa4d93828988610e5182", + "revCount": 205, "type": "git", "url": "ssh://git.joshuabell.xyz:3032/nvim" }, diff --git a/hosts/_common/shellInit.sh b/hosts/_common/shellInit.sh index b5f1fb7..7ff64c7 100644 --- a/hosts/_common/shellInit.sh +++ b/hosts/_common/shellInit.sh @@ -111,6 +111,7 @@ from_master () { # nix +alias nixpkgs=nixpkg nixpkg () { if [ $# -eq 0 ]; then echo "Error: No arguments provided. Please specify at least one package."