cleslie/nixfiles
1
0
Fork 0
mirror of https://github.com/callumio/nixfiles.git synced 2025-12-17 03:29:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

switch to nvf
Some checks failed
/ ci (push) Has been cancelled
Details

Browse source
This commit is contained in:
Callum Leslie 2025-04-10 16:18:46 +01:00
parent 44419a52d6
commit 1eece5263a
Signed by: cleslie
GPG key ID: D382C4AFEECEAA90
6 changed files with 228 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

226
flake.lock generated
View file

@ -528,6 +528,24 @@
}
},
"flake-parts_7": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib_3"
},
"locked": {
"lastModified": 1741352980,
"narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_8": {
"inputs": {
"nixpkgs-lib": [
"omnix",
@ -615,6 +633,24 @@
}
},
"flake-utils_4": {
"inputs": {
"systems": "systems_4"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_5": {
"inputs": {
"systems": [
"stylix",
@ -980,6 +1016,21 @@
"type": "github"
}
},
"mnw": {
"locked": {
"lastModified": 1742255973,
"narHash": "sha256-XfEGVKatTgEMMOVb4SNp1LYLQOSzzrFTDMVDTZFyMVE=",
"owner": "Gerg-L",
"repo": "mnw",
"rev": "b982dbd5e6d55d4438832b3567c09bc2a129649d",
"type": "github"
},
"original": {
"owner": "Gerg-L",
"repo": "mnw",
"type": "github"
}
},
"neovim-nightly-overlay": {
"inputs": {
"flake-compat": "flake-compat_3",
@ -1020,6 +1071,34 @@
"type": "github"
}
},
"nil": {
"inputs": {
"flake-utils": [
"nvf",
"nvf",
"flake-utils"
],
"nixpkgs": [
"nvf",
"nvf",
"nixpkgs"
],
"rust-overlay": "rust-overlay_2"
},
"locked": {
"lastModified": 1741118843,
"narHash": "sha256-ggXU3RHv6NgWw+vc+HO4/9n0GPufhTIUjVuLci8Za8c=",
"owner": "oxalica",
"repo": "nil",
"rev": "577d160da311cc7f5042038456a0713e9863d09e",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "nil",
"type": "github"
}
},
"nish": {
"inputs": {
"advisory-db": "advisory-db",
@ -1219,6 +1298,21 @@
"type": "github"
}
},
"nixpkgs-lib_3": {
"locked": {
"lastModified": 1740877520,
"narHash": "sha256-oiwv/ZK/2FhGxrCkQkB83i7GnWXPPLzoqFHpDD3uYpk=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "147dee35aab2193b174e4c0868bd80ead5ce755c",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixpkgs.lib",
"type": "github"
}
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1710695816,
@ -1284,6 +1378,22 @@
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1743076231,
"narHash": "sha256-yQugdVfi316qUfqzN8JMaA2vixl+45GxNm4oUfXlbgw=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "6c5963357f3c1c840201eda129a99d455074db04",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_5": {
"locked": {
"lastModified": 1725194671,
"narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=",
@ -1408,17 +1518,61 @@
"type": "github"
}
},
"nvf": {
"inputs": {
"nixpkgs": [
"unstable"
],
"nvf": "nvf_2"
},
"locked": {
"lastModified": 1744191266,
"narHash": "sha256-c8sBC1Kr67IVAUm4xjeNbm7BM+5Wyy2BqlJuUQssxEg=",
"owner": "callumio",
"repo": "nvf",
"rev": "502e30cfbd4582994efb75c8f68a8387046c8a94",
"type": "github"
},
"original": {
"owner": "callumio",
"repo": "nvf",
"type": "github"
}
},
"nvf_2": {
"inputs": {
"flake-parts": "flake-parts_7",
"flake-utils": "flake-utils_4",
"mnw": "mnw",
"nil": "nil",
"nixpkgs": "nixpkgs_4",
"systems": "systems_5"
},
"locked": {
"lastModified": 1743551988,
"narHash": "sha256-tUfTPHXiVf0LxjbMqw0nDAtnLdKcL8Ha0LfrgTwcBb8=",
"owner": "notashelf",
"repo": "nvf",
"rev": "ae23c34be1e358f28b9cb54f304bcf4cb9ae28f8",
"type": "github"
},
"original": {
"owner": "notashelf",
"repo": "nvf",
"type": "github"
}
},
"omnix": {
"inputs": {
"cachix-push": "cachix-push",
"devour-flake": "devour-flake_2",
"flake-parts": "flake-parts_7",
"flake-parts": "flake-parts_8",
"inspect": "inspect",
"nix-systems-aarch64-darwin": "nix-systems-aarch64-darwin",
"nix-systems-aarch64-linux": "nix-systems-aarch64-linux",
"nix-systems-x86_64-darwin": "nix-systems-x86_64-darwin",
"nix-systems-x86_64-linux": "nix-systems-x86_64-linux",
"nixpkgs": "nixpkgs_4",
"nixpkgs": "nixpkgs_5",
"rust-flake": "rust-flake",
"systems": [
"systems"
@ -1428,11 +1582,11 @@
]
},
"locked": {
"lastModified": 1733936163,
"narHash": "sha256-IFSrHmmbo4rX7/UBjEYUYZHbHo9Amcc2+762Mgp+aVQ=",
"lastModified": 1736267463,
"narHash": "sha256-aJFlq41WrbPL/7GJ2ZyW9Qvp0HiGCYYAENgAwVDvmGQ=",
"owner": "juspay",
"repo": "omnix",
"rev": "9aa5d61ed6bc50a95db0ae633b184f91545588cf",
"rev": "f33c4e01647b7616c3ce21dc0d6351e543503390",
"type": "github"
},
"original": {
@ -1508,10 +1662,11 @@
"nixpkgs": "nixpkgs",
"nixvim": "nixvim",
"nsbm": "nsbm",
"nvf": "nvf",
"omnix": "omnix",
"pre-commit-hooks": "pre-commit-hooks",
"stylix": "stylix",
"systems": "systems_5",
"systems": "systems_7",
"treefmt-nix": "treefmt-nix_4",
"unstable": "unstable"
}
@ -1540,7 +1695,7 @@
"omnix",
"nixpkgs"
],
"rust-overlay": "rust-overlay_2"
"rust-overlay": "rust-overlay_3"
},
"locked": {
"lastModified": 1730771644,
@ -1582,6 +1737,29 @@
}
},
"rust-overlay_2": {
"inputs": {
"nixpkgs": [
"nvf",
"nvf",
"nil",
"nixpkgs"
]
},
"locked": {
"lastModified": 1741055476,
"narHash": "sha256-52vwEV0oS2lCnx3c/alOFGglujZTLmObit7K8VblnS8=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "aefb7017d710f150970299685e8d8b549d653649",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"rust-overlay_3": {
"flake": false,
"locked": {
"lastModified": 1725243956,
@ -1628,7 +1806,7 @@
"base16-helix": "base16-helix",
"base16-vim": "base16-vim",
"flake-compat": "flake-compat_7",
"flake-utils": "flake-utils_4",
"flake-utils": "flake-utils_5",
"gnome-shell": "gnome-shell",
"home-manager": [
"home-manager"
@ -1636,7 +1814,7 @@
"nixpkgs": [
"nixpkgs"
],
"systems": "systems_4",
"systems": "systems_6",
"tinted-foot": "tinted-foot",
"tinted-kitty": "tinted-kitty",
"tinted-tmux": "tinted-tmux"
@ -1731,6 +1909,36 @@
"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"
}
},
"systems_7": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"tinted-foot": {
"flake": false,
"locked": {

6
flake.nix
View file

@ -71,7 +71,7 @@
devShells.default = final.mkShell {
meta.description = "Default dev shell";
inputsFrom = [config.pre-commit.devShell config.treefmt.build.devShell];
packages = with final; [just git nixvim cachix jq devour-flake om agenix deadnix];
packages = with final; [just git nvf cachix jq devour-flake om agenix deadnix];
};
apps = nixpkgs.lib.mapAttrs' (name: value: nixpkgs.lib.nameValuePair ("deploy-" + name) value) (inputs'.nixinate.packages self);
@ -96,6 +96,10 @@
flake = false;
};
nvf = {
url = "github:callumio/nvf";
inputs.nixpkgs.follows = "unstable";
};
nixvim = {
url = "github:callumio/nixvim";
inputs.nixpkgs.follows = "unstable";

9
home/c/default.nix
View file

@ -1,8 +1,4 @@
{
inputs,
pkgs,
...
}: {
{pkgs, ...}: {
imports = [./programs ./services];
programs.home-manager.enable = true;
@ -59,7 +55,8 @@
unzip
just
wireshark
inputs.nixvim.packages."x86_64-linux".default # nixvim
nvf
#inputs.nixvim.packages."x86_64-linux".default # nixvim
];
home.stateVersion = "24.05";

2
justfile
View file

@ -14,7 +14,7 @@ deploy MACHINE:
nix run .#deploy-{{MACHINE}}
vim:
nix flake lock --update-input nixvim
nix flake lock --update-input nvf
update:
nix flake update

1
overlays/default.nix
View file

@ -1,5 +1,6 @@
{inputs, ...}: _final: prev: {
nixvim = inputs.nixvim.packages.${prev.system}.default;
nvf = inputs.nvf.packages.${prev.system}.default;
devour-flake = prev.callPackage inputs.devour-flake {};
agenix = inputs.agenix.packages.${prev.system}.default;
}

1
packages/default.nix
View file

@ -6,6 +6,7 @@
tmux-sessionizer-cl = pkgs.callPackage ./tmux-sessionizer {};
om = inputs'.omnix.packages.default;
nixvim = inputs'.nixvim.packages.default;
nvf = inputs'.nvf.packages.default;
agenix = inputs'.agenix.packages.default;
vaapiIntel = pkgs.vaapiIntel.override {enableHybridCodec = true;};
devour-flake = pkgs.callPackage inputs.devour-flake {};