diff --git a/flake.lock b/flake.lock index 0bea81d..37c7c55 100644 --- a/flake.lock +++ b/flake.lock @@ -4,9 +4,33 @@ "inputs": { "flake-compat": "flake-compat", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs", + "nixpkgs": [ + "git-view", + "nixpkgs" + ], "rust-overlay": "rust-overlay" }, + "locked": { + "lastModified": 1688082682, + "narHash": "sha256-nMG/A7qYm9pyHJowKuaNmNYgo748xZrzMJPqtoGozSA=", + "owner": "ipetkov", + "repo": "crane", + "rev": "4d350bb94fdf8ec9d2e22d68bb13e136d73aa9d8", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "crane_2": { + "inputs": { + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_2", + "rust-overlay": "rust-overlay_3" + }, "locked": { "lastModified": 1676846788, "narHash": "sha256-XLsHLgXyMdliMeAXuzdGP+TXBaV44kG1RPTUHNOs6Jk=", @@ -38,7 +62,59 @@ "type": "github" } }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1687709756, + "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1687709756, + "narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { "locked": { "lastModified": 1676283394, "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", @@ -53,6 +129,28 @@ "type": "github" } }, + "git-view": { + "inputs": { + "crane": "crane", + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs", + "rust-overlay": "rust-overlay_2" + }, + "locked": { + "lastModified": 1688345409, + "narHash": "sha256-rDQK3F8KWWqDic1fwppqQ+YHCGlBGuNBahz+jRkN28o=", + "owner": "sgoudham", + "repo": "git-view", + "rev": "58a764794441750575c1c30c777c2851752d080c", + "type": "github" + }, + "original": { + "owner": "sgoudham", + "ref": "v1.0.0", + "repo": "git-view", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -75,8 +173,8 @@ }, "nekowinston-nur": { "inputs": { - "crane": "crane", - "nixpkgs": "nixpkgs_2", + "crane": "crane_2", + "nixpkgs": "nixpkgs_3", "wezterm-src": "wezterm-src" }, "locked": { @@ -114,6 +212,22 @@ } }, "nixpkgs": { + "locked": { + "lastModified": 1688221086, + "narHash": "sha256-cdW6qUL71cNWhHCpMPOJjlw0wzSRP0pVlRn2vqX/VVg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "cd99c2b3c9f160cd004318e0697f90bbd5960825", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { "locked": { "lastModified": 1676426280, "narHash": "sha256-7DltKPrvCP0A9Iemv2ts1vnBYn5xQKScK/sb1VALlao=", @@ -129,7 +243,7 @@ "type": "github" } }, - "nixpkgs_2": { + "nixpkgs_3": { "locked": { "lastModified": 1685677062, "narHash": "sha256-zoHF7+HNwNwne2XEomphbdc4Y8tdWT16EUxUTXpOKpQ=", @@ -145,7 +259,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1687288566, "narHash": "sha256-VckkiJ88Gzdc2cstm0z5eFcrHbvkm4VjxavHBGssvZI=", @@ -178,14 +292,67 @@ }, "root": { "inputs": { + "git-view": "git-view", "home-manager": "home-manager", "nekowinston-nur": "nekowinston-nur", "nix-index-database": "nix-index-database", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "nur": "nur" } }, "rust-overlay": { + "inputs": { + "flake-utils": [ + "git-view", + "crane", + "flake-utils" + ], + "nixpkgs": [ + "git-view", + "crane", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1688351637, + "narHash": "sha256-CLTufJ29VxNOIZ8UTg0lepsn3X03AmopmaLTTeHDCL4=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "f9b92316727af9e6c7fee4a761242f7f46880329", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_2": { + "inputs": { + "flake-utils": [ + "git-view", + "flake-utils" + ], + "nixpkgs": [ + "git-view", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1688351637, + "narHash": "sha256-CLTufJ29VxNOIZ8UTg0lepsn3X03AmopmaLTTeHDCL4=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "f9b92316727af9e6c7fee4a761242f7f46880329", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_3": { "inputs": { "flake-utils": [ "nekowinston-nur", @@ -212,6 +379,36 @@ "type": "github" } }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "wezterm-src": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 1743b05..61f360a 100644 --- a/flake.nix +++ b/flake.nix @@ -13,6 +13,7 @@ }; nix-index-database.url = "github:Mic92/nix-index-database"; nix-index-database.inputs.nixpkgs.follows = "nixpkgs"; + git-view.url = "github:sgoudham/git-view/v1.0.0"; }; nixConfig = { @@ -35,11 +36,13 @@ nekowinston-nur, home-manager, nix-index-database, + git-view, ... }: let system = "x86_64-linux"; pkgs = nixpkgs.legacyPackages.${system}; overlays = final: prev: { + git-view = git-view.packages.${system}.default; nur = import nur { nurpkgs = prev; pkgs = prev; diff --git a/home/default.nix b/home/default.nix index 79c8897..0d9097b 100644 --- a/home/default.nix +++ b/home/default.nix @@ -32,6 +32,7 @@ alejandra fd vivid + git-view ]; home.sessionVariables = { EDITOR = "nvim";