mirror of
https://github.com/srid/nixos-config.git
synced 2025-12-26 23:14:57 +08:00
nix: Revamp and update inputs
Add some to primary-inputs
This commit is contained in:
Sridhar Ratnakumar
Sridhar Ratnakumar
parent
d20f63a876
commit
28eefd8c73
2 changed files with 62 additions and 84 deletions
130
flake.lock
generated
130
flake.lock
generated
|
|
@ -66,22 +66,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"coc-rust-analyzer": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1656639420,
|
||||
"narHash": "sha256-vSyWXZnKPTVxdnw7m9eguRXg85qVkio8JaO6fLoFcN8=",
|
||||
"owner": "fannheyward",
|
||||
"repo": "coc-rust-analyzer",
|
||||
"rev": "b6d7875f2816a5eed6be21cf6d99cd0ad4814405",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "fannheyward",
|
||||
"repo": "coc-rust-analyzer",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"crane": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
|
@ -235,11 +219,11 @@
|
|||
"nixpkgs-stable": "nixpkgs-stable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1707901582,
|
||||
"narHash": "sha256-/u7TGrMRoT/h360iHThg1cumIJ9l2+xw51w4qi+cgFA=",
|
||||
"lastModified": 1708794236,
|
||||
"narHash": "sha256-DTmyCeySQjFOuSNRUFpA2Jxkqo7bMXvSn2tXSVk3RpQ=",
|
||||
"owner": "nix-community",
|
||||
"repo": "emacs-overlay",
|
||||
"rev": "763c614a4cce4296941b44dece54390dd108b781",
|
||||
"rev": "299398be3c27d885cf17ff8310944b307a1449e9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -436,6 +420,20 @@
|
|||
}
|
||||
},
|
||||
"flake-compat_4": {
|
||||
"locked": {
|
||||
"lastModified": 1696426674,
|
||||
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
|
||||
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
|
||||
"revCount": 57,
|
||||
"type": "tarball",
|
||||
"url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz"
|
||||
},
|
||||
"original": {
|
||||
"type": "tarball",
|
||||
"url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
|
||||
}
|
||||
},
|
||||
"flake-compat_5": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1696426674,
|
||||
|
|
@ -847,11 +845,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1707683400,
|
||||
"narHash": "sha256-Zc+J3UO1Xpx+NL8UB6woPHyttEy9cXXtm+0uWwzuYDc=",
|
||||
"lastModified": 1708806879,
|
||||
"narHash": "sha256-MSbxtF3RThI8ANs/G4o1zIqF5/XlShHvwjl9Ws0QAbI=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "21b078306a2ab68748abf72650db313d646cf2ca",
|
||||
"rev": "4ee704cb13a5a7645436f400b9acc89a67b9c08a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -868,11 +866,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1706955260,
|
||||
"narHash": "sha256-W3y0j77IDVbmbajudHoUr46RpswujUCl+D5Vru53UsI=",
|
||||
"lastModified": 1708558280,
|
||||
"narHash": "sha256-w1ns8evB6N9VTrAojcdXLWenROtd77g3vyClrqeFdG8=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "880d9bc2110f7cae59698f715b8ca42cdc53670c",
|
||||
"rev": "0b69d574162cfa6eb7919d5614a48d0185550891",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -914,16 +912,15 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1708541070,
|
||||
"narHash": "sha256-dhi3XXT662o1FtP/Li2dIwcQCco6nhT+Yv71dptTlSw=",
|
||||
"owner": "LoganBarnett",
|
||||
"lastModified": 1708737761,
|
||||
"narHash": "sha256-sR/1cYjpgr71ZSrt6Kp5Dg4Ul3mo6pZIG400tuzYks8=",
|
||||
"owner": "LnL7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "27e6a022f25b94010fdb8e5fbbb79608dc589397",
|
||||
"rev": "bbde06bed1b72eddff063fa42f18644e90a0121e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "LoganBarnett",
|
||||
"ref": "linux-builder-big-config",
|
||||
"owner": "LnL7",
|
||||
"repo": "nix-darwin",
|
||||
"type": "github"
|
||||
}
|
||||
|
|
@ -936,11 +933,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1706833576,
|
||||
"narHash": "sha256-w7BL0EWRts+nD1lbLECIuz6fRzmmV+z8oWwoY7womR0=",
|
||||
"lastModified": 1708231718,
|
||||
"narHash": "sha256-IZdieFWvhBkxoOFMDejqLUYqD94WN6k0YSpw0DFy+4g=",
|
||||
"owner": "lnl7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "bdbae6ecff8fcc322bf6b9053c0b984912378af7",
|
||||
"rev": "0e6857fa1d632637488666c08e7b02c08e3178f8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1000,11 +997,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1707620986,
|
||||
"narHash": "sha256-XE0tCSkSVBeJDWhjFwusNInwAhrnp+TloUNUpvnTiLw=",
|
||||
"lastModified": 1708225687,
|
||||
"narHash": "sha256-NJBDfvknI26beOFmjO2coeJMTTUCCtw2Iu+rvJ1Zb9k=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nix-index-database",
|
||||
"rev": "0cb4345704123492e6d1f1068629069413c80de0",
|
||||
"rev": "17352eb241a8d158c4ac523b19d8d2a6c8efe127",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1099,11 +1096,11 @@
|
|||
},
|
||||
"nixos-flake": {
|
||||
"locked": {
|
||||
"lastModified": 1708523680,
|
||||
"narHash": "sha256-1LhSUAXnTkD3DwrKlyXMRcAEuT329C3dmSTbG2Oyr2E=",
|
||||
"lastModified": 1708785992,
|
||||
"narHash": "sha256-0gEsD/EpKrbLuLcYT9CXIVEY6ChmVvVTZJDAsqBXDhg=",
|
||||
"owner": "srid",
|
||||
"repo": "nixos-flake",
|
||||
"rev": "519febcccd781dd4ab90774b37a586903f6b8ad6",
|
||||
"rev": "50203d68b305abff2f29e555992eb55ddeffbcd5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1166,11 +1163,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1707689078,
|
||||
"narHash": "sha256-UUGmRa84ZJHpGZ1WZEBEUOzaPOWG8LZ0yPg1pdDF/yM=",
|
||||
"lastModified": 1708655239,
|
||||
"narHash": "sha256-ZrP/yACUvDB+zbqYJsln4iwotbH6CTZiTkANJ0AgDv4=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "f9d39fb9aff0efee4a3d5f4a6d7c17701d38a1d8",
|
||||
"rev": "cbc4211f0afffe6dfd2478a62615dd5175a13f9a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1327,11 +1324,11 @@
|
|||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1707786466,
|
||||
"narHash": "sha256-yLPfrmW87M2qt+8bAmwopJawa+MJLh3M9rUbXtpUc1o=",
|
||||
"lastModified": 1708702655,
|
||||
"narHash": "sha256-qxT5jSLhelfLhQ07+AUxSTm1VnVH+hQxDkQSZ/m/Smo=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "01885a071465e223f8f68971f864b15829988504",
|
||||
"rev": "c5101e457206dd437330d283d6626944e28794b3",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1387,11 +1384,11 @@
|
|||
},
|
||||
"nixpkgs_12": {
|
||||
"locked": {
|
||||
"lastModified": 1707689078,
|
||||
"narHash": "sha256-UUGmRa84ZJHpGZ1WZEBEUOzaPOWG8LZ0yPg1pdDF/yM=",
|
||||
"lastModified": 1708655239,
|
||||
"narHash": "sha256-ZrP/yACUvDB+zbqYJsln4iwotbH6CTZiTkANJ0AgDv4=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "f9d39fb9aff0efee4a3d5f4a6d7c17701d38a1d8",
|
||||
"rev": "cbc4211f0afffe6dfd2478a62615dd5175a13f9a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1592,6 +1589,7 @@
|
|||
},
|
||||
"nixvim": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_4",
|
||||
"flake-parts": "flake-parts_8",
|
||||
"home-manager": "home-manager_2",
|
||||
"nix-darwin": "nix-darwin_2",
|
||||
|
|
@ -1601,11 +1599,11 @@
|
|||
"pre-commit-hooks": "pre-commit-hooks"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1707344886,
|
||||
"narHash": "sha256-icqj994+jxpkNMP8r6csF3MoEwYzme4CM0rPF4044oM=",
|
||||
"lastModified": 1708614940,
|
||||
"narHash": "sha256-36muWApzetaV4WAEeqKsWxW4k2l0u3E841RI4sHPiz0=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixvim",
|
||||
"rev": "ec07263b1693ebbd74080b1e21d9b88ae7b74d18",
|
||||
"rev": "060a05138ca1a46fc0a0f79ef27f080cac57a59e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1731,7 +1729,7 @@
|
|||
},
|
||||
"pre-commit-hooks": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_4",
|
||||
"flake-compat": "flake-compat_5",
|
||||
"flake-utils": "flake-utils_7",
|
||||
"gitignore": "gitignore",
|
||||
"nixpkgs": [
|
||||
|
|
@ -1744,11 +1742,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1706424699,
|
||||
"narHash": "sha256-Q3RBuOpZNH2eFA1e+IHgZLAOqDD9SKhJ/sszrL8bQD4=",
|
||||
"lastModified": 1708018599,
|
||||
"narHash": "sha256-M+Ng6+SePmA8g06CmUZWi1AjG2tFBX9WCXElBHEKnyM=",
|
||||
"owner": "cachix",
|
||||
"repo": "pre-commit-hooks.nix",
|
||||
"rev": "7c54e08a689b53c8a1e5d70169f2ec9e2a68ffaf",
|
||||
"rev": "5df5a70ad7575f6601d91f0efec95dd9bc619431",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -1806,7 +1804,6 @@
|
|||
"root": {
|
||||
"inputs": {
|
||||
"actual": "actual",
|
||||
"coc-rust-analyzer": "coc-rust-analyzer",
|
||||
"disko": "disko",
|
||||
"emacs-overlay": "emacs-overlay",
|
||||
"emanote": "emanote",
|
||||
|
|
@ -1829,8 +1826,7 @@
|
|||
"nixvim": "nixvim",
|
||||
"nuenv": "nuenv",
|
||||
"sops-nix": "sops-nix",
|
||||
"treefmt-nix": "treefmt-nix_4",
|
||||
"zk-nvim": "zk-nvim"
|
||||
"treefmt-nix": "treefmt-nix_4"
|
||||
}
|
||||
},
|
||||
"rotate-text": {
|
||||
|
|
@ -2243,22 +2239,6 @@
|
|||
"repo": "ws-butler",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"zk-nvim": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1656603684,
|
||||
"narHash": "sha256-n9mvHT4g+G3sEGDlIrh1nV2AAw9Bj7jZVag8YRe3NQE=",
|
||||
"owner": "mickael-menu",
|
||||
"repo": "zk-nvim",
|
||||
"rev": "fab4bb7fd95edd9eaab7cd7bb517a291351e0574",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "mickael-menu",
|
||||
"repo": "zk-nvim",
|
||||
"type": "github"
|
||||
}
|
||||
}
|
||||
},
|
||||
"root": "root",
|
||||
|
|
|
|||
16
flake.nix
16
flake.nix
|
|
@ -5,8 +5,7 @@
|
|||
# Principle inputs
|
||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||
flake-parts.url = "github:hercules-ci/flake-parts";
|
||||
# nix-darwin.url = "github:lnl7/nix-darwin";
|
||||
nix-darwin.url = "github:LoganBarnett/nix-darwin/linux-builder-big-config"; # https://github.com/LnL7/nix-darwin/pull/878 (for 'systems')
|
||||
nix-darwin.url = "github:LnL7/nix-darwin";
|
||||
nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
|
||||
home-manager.url = "github:nix-community/home-manager";
|
||||
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
|
@ -49,12 +48,6 @@
|
|||
};
|
||||
nix-doom-emacs.inputs.nix-straight.follows = "nix-straight";
|
||||
|
||||
# Vim & its plugins (not in nixpkgs)
|
||||
zk-nvim.url = "github:mickael-menu/zk-nvim";
|
||||
zk-nvim.flake = false;
|
||||
coc-rust-analyzer.url = "github:fannheyward/coc-rust-analyzer";
|
||||
coc-rust-analyzer.flake = false;
|
||||
|
||||
# Devshell
|
||||
treefmt-nix.url = "github:numtide/treefmt-nix";
|
||||
};
|
||||
|
|
@ -89,18 +82,24 @@
|
|||
};
|
||||
|
||||
perSystem = { self', system, pkgs, lib, config, inputs', ... }: {
|
||||
# Flake inputs we want to update periodically
|
||||
# Run: `nix run .#update`.
|
||||
nixos-flake.primary-inputs = [
|
||||
"nixpkgs"
|
||||
"home-manager"
|
||||
"nix-darwin"
|
||||
"nixos-flake"
|
||||
"nix-index-database"
|
||||
"nixvim"
|
||||
"emacs-overlay"
|
||||
"nix-doom-emacs"
|
||||
];
|
||||
|
||||
treefmt.config = {
|
||||
projectRootFile = "flake.nix";
|
||||
programs.nixpkgs-fmt.enable = true;
|
||||
};
|
||||
formatter = config.treefmt.build.wrapper;
|
||||
|
||||
packages.default = self'.packages.activate;
|
||||
devShells.default = pkgs.mkShell {
|
||||
|
|
@ -112,7 +111,6 @@
|
|||
pkgs.just
|
||||
];
|
||||
};
|
||||
formatter = config.treefmt.build.wrapper;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue