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

add om

Browse source
This commit is contained in:
Callum Leslie 2024-09-06 15:33:46 +01:00
parent ff50aa6e25
commit abf3edb061
Signed by: cleslie
GPG key ID: D382C4AFEECEAA90
2 changed files with 332 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

334
flake.lock generated
View file

@ -137,6 +137,58 @@
"type": "github" "type": "github"
} }
}, },
"cachix-push": {
"locked": {
"lastModified": 1725315090,
"narHash": "sha256-d/ZGRHfSGPEpCCNSVlfZ0ND2IZV0H9nN/3BLMA7d9fs=",
"owner": "juspay",
"repo": "cachix-push",
"rev": "fbe9734921e19abc4830dc4ea425aaa82cf61991",
"type": "github"
},
"original": {
"owner": "juspay",
"repo": "cachix-push",
"type": "github"
}
},
"cargo-doc-live": {
"locked": {
"lastModified": 1724704668,
"narHash": "sha256-kJFYXlWUodg5WhJ0NuvrP0mCvOT/2AOIo8oGeYLXocs=",
"owner": "srid",
"repo": "cargo-doc-live",
"rev": "b09d5d258d2498829e03014931fc19aed499b86f",
"type": "github"
},
"original": {
"owner": "srid",
"repo": "cargo-doc-live",
"type": "github"
}
},
"crane": {
"inputs": {
"nixpkgs": [
"omnix",
"rust-flake",
"nixpkgs"
]
},
"locked": {
"lastModified": 1718474113,
"narHash": "sha256-UKrfy/46YF2TRnxTtKCYzqf2f5ZPRRWwKCCJb7O5X8U=",
"owner": "ipetkov",
"repo": "crane",
"rev": "0095fd8ea00ae0a9e6014f39c375e40c2fbd3386",
"type": "github"
},
"original": {
"owner": "ipetkov",
"repo": "crane",
"type": "github"
}
},
"devour-flake": { "devour-flake": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -295,9 +347,27 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_6": {
"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-parts": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": [
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1725234343, "lastModified": 1725234343,
@ -315,7 +385,7 @@
}, },
"flake-parts_2": { "flake-parts_2": {
"inputs": { "inputs": {
"nixpkgs-lib": "nixpkgs-lib_2" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1725234343, "lastModified": 1725234343,
@ -375,6 +445,21 @@
"type": "indirect" "type": "indirect"
} }
}, },
"flake-schemas": {
"locked": {
"lastModified": 1719857163,
"narHash": "sha256-wM+8JtoKBkahHiKn+EM1ikurMnitwRQrZ91hipJIJK8=",
"owner": "DeterminateSystems",
"repo": "flake-schemas",
"rev": "61a02d7183d4241962025e6c6307a22a0bb72a21",
"type": "github"
},
"original": {
"owner": "DeterminateSystems",
"repo": "flake-schemas",
"type": "github"
}
},
"flake-utils": { "flake-utils": {
"locked": { "locked": {
"lastModified": 1629284811, "lastModified": 1629284811,
@ -409,6 +494,21 @@
} }
}, },
"flake-utils_3": { "flake-utils_3": {
"locked": {
"lastModified": 1667395993,
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_4": {
"inputs": { "inputs": {
"systems": [ "systems": [
"stylix", "stylix",
@ -678,6 +778,22 @@
"type": "github" "type": "github"
} }
}, },
"libgit2": {
"flake": false,
"locked": {
"lastModified": 1697646580,
"narHash": "sha256-oX4Z3S9WtJlwvj0uH9HlYcWv+x1hqp8mhXl7HsLu2f0=",
"owner": "libgit2",
"repo": "libgit2",
"rev": "45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5",
"type": "github"
},
"original": {
"owner": "libgit2",
"repo": "libgit2",
"type": "github"
}
},
"neovim-nightly-overlay": { "neovim-nightly-overlay": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
@ -717,6 +833,35 @@
"type": "github" "type": "github"
} }
}, },
"nix": {
"inputs": {
"flake-compat": "flake-compat_5",
"flake-parts": [
"omnix",
"flake-parts"
],
"flake-schemas": "flake-schemas",
"libgit2": "libgit2",
"nixpkgs": "nixpkgs_3",
"nixpkgs-23-11": "nixpkgs-23-11",
"nixpkgs-regression": "nixpkgs-regression",
"pre-commit-hooks": "pre-commit-hooks"
},
"locked": {
"lastModified": 1722511816,
"narHash": "sha256-jSrAhqM3qTKUmVvM0PQXoxKv2SQzWNRGvcW11DyOemE=",
"owner": "shivaraj-bh",
"repo": "nix",
"rev": "af109049cf392a6b4ede343a4756692eee9b4fd6",
"type": "github"
},
"original": {
"owner": "shivaraj-bh",
"ref": "flake-schemas",
"repo": "nix",
"type": "github"
}
},
"nix-darwin": { "nix-darwin": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -775,6 +920,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-23-11": {
"locked": {
"lastModified": 1717159533,
"narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446",
"type": "github"
},
"original": {
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446",
"type": "github"
}
},
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1725233747, "lastModified": 1725233747,
@ -787,16 +948,20 @@
"url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" "url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz"
} }
}, },
"nixpkgs-lib_2": { "nixpkgs-regression": {
"locked": { "locked": {
"lastModified": 1725233747, "lastModified": 1643052045,
"narHash": "sha256-Ss8QWLXdr2JCBPcYChJhz4xJm+h/xjl4G0c0XlP6a74=", "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=",
"type": "tarball", "owner": "NixOS",
"url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" "repo": "nixpkgs",
"rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
"type": "github"
}, },
"original": { "original": {
"type": "tarball", "owner": "NixOS",
"url": "https://github.com/NixOS/nixpkgs/archive/356624c12086a18f2ea2825fed34523d60ccc4e3.tar.gz" "repo": "nixpkgs",
"rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
"type": "github"
} }
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
@ -833,16 +998,16 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1725103162, "lastModified": 1717432640,
"narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=", "narHash": "sha256-+f9c4/ZX5MWDOuB1rKoWj+lBNm0z0rs4CK47HBLxy1o=",
"owner": "nixos", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b", "rev": "88269ab3044128b7c2f4c7d68448b2fb50456870",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "NixOS",
"ref": "nixos-unstable", "ref": "release-24.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -925,7 +1090,80 @@
"type": "github" "type": "github"
} }
}, },
"omnix": {
"inputs": {
"cachix-push": "cachix-push",
"cargo-doc-live": "cargo-doc-live",
"devour-flake": [
"devour-flake"
],
"flake-parts": [
"flake-parts"
],
"nix": "nix",
"nixpkgs": [
"nixpkgs"
],
"process-compose-flake": "process-compose-flake",
"rust-flake": "rust-flake",
"systems": [
"systems"
],
"treefmt-nix": [
"treefmt-nix"
]
},
"locked": {
"lastModified": 1725590656,
"narHash": "sha256-G6D96mILdxAGG7SVItC7xIKF1y8gijGkNMCGW/3N0MU=",
"owner": "juspay",
"repo": "omnix",
"rev": "c566f7a4566473fdedca6bb8d32178820be0502f",
"type": "github"
},
"original": {
"owner": "juspay",
"repo": "omnix",
"type": "github"
}
},
"pre-commit-hooks": { "pre-commit-hooks": {
"inputs": {
"flake-compat": [
"omnix",
"nix"
],
"flake-utils": "flake-utils_3",
"gitignore": [
"omnix",
"nix"
],
"nixpkgs": [
"omnix",
"nix",
"nixpkgs"
],
"nixpkgs-stable": [
"omnix",
"nix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1712897695,
"narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=",
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "pre-commit-hooks.nix",
"type": "github"
}
},
"pre-commit-hooks_2": {
"inputs": { "inputs": {
"flake-compat": [ "flake-compat": [
"flake-compat" "flake-compat"
@ -950,6 +1188,21 @@
"type": "github" "type": "github"
} }
}, },
"process-compose-flake": {
"locked": {
"lastModified": 1718031437,
"narHash": "sha256-+RrlkAVZx0QhyeHAGFJnjST+/7Dc3zsDU3zAKXoDXaI=",
"owner": "Platonic-Systems",
"repo": "process-compose-flake",
"rev": "9344fac44edced4c686721686a6ad904d067c546",
"type": "github"
},
"original": {
"owner": "Platonic-Systems",
"repo": "process-compose-flake",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",
@ -962,13 +1215,54 @@
"nixinate": "nixinate", "nixinate": "nixinate",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixvim": "nixvim", "nixvim": "nixvim",
"pre-commit-hooks": "pre-commit-hooks", "omnix": "omnix",
"pre-commit-hooks": "pre-commit-hooks_2",
"stylix": "stylix", "stylix": "stylix",
"systems": "systems_4", "systems": "systems_4",
"treefmt-nix": "treefmt-nix_2", "treefmt-nix": "treefmt-nix_2",
"unstable": "unstable" "unstable": "unstable"
} }
}, },
"rust-flake": {
"inputs": {
"crane": "crane",
"nixpkgs": [
"omnix",
"nixpkgs"
],
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1725522236,
"narHash": "sha256-dP8ie2arXvvNzn5uqHGf3r0x5pfHm4d5rIg3j1fpwcA=",
"owner": "juspay",
"repo": "rust-flake",
"rev": "ea2bdf67ec3924adb0361630365c34ba8bc11ad9",
"type": "github"
},
"original": {
"owner": "juspay",
"ref": "granular-autoWire",
"repo": "rust-flake",
"type": "github"
}
},
"rust-overlay": {
"flake": false,
"locked": {
"lastModified": 1725243956,
"narHash": "sha256-0A5ZP8uDCyBdYUzayZfy6JFdTefP79oZVAjyqA/yuSI=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "a10c8092d5f82622be79ed4dd12289f72011f850",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"stylix": { "stylix": {
"inputs": { "inputs": {
"base16": "base16", "base16": "base16",
@ -978,8 +1272,8 @@
"base16-kitty": "base16-kitty", "base16-kitty": "base16-kitty",
"base16-tmux": "base16-tmux", "base16-tmux": "base16-tmux",
"base16-vim": "base16-vim", "base16-vim": "base16-vim",
"flake-compat": "flake-compat_5", "flake-compat": "flake-compat_6",
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_4",
"gnome-shell": "gnome-shell", "gnome-shell": "gnome-shell",
"home-manager": [ "home-manager": [
"home-manager" "home-manager"
@ -1087,7 +1381,9 @@
}, },
"treefmt-nix_2": { "treefmt-nix_2": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_3" "nixpkgs": [
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1725271838, "lastModified": 1725271838,

19
flake.nix
View file

@ -41,6 +41,7 @@
artemis = mkLinuxSystem ./hosts/artemis; artemis = mkLinuxSystem ./hosts/artemis;
hermes = mkLinuxSystem ./hosts/hermes; hermes = mkLinuxSystem ./hosts/hermes;
}; };
om.health.default = {nix-version.min-required = "2.18.5";};
}; };
perSystem = { perSystem = {
@ -70,12 +71,13 @@
devShells.default = final.mkShell { devShells.default = final.mkShell {
meta.description = "Default dev shell"; meta.description = "Default dev shell";
inputsFrom = [config.pre-commit.devShell config.treefmt.build.devShell]; inputsFrom = [config.pre-commit.devShell config.treefmt.build.devShell];
packages = with final; [just git nixvim cachix jq devour-flake agenix deadnix]; packages = with final; [just git nixvim cachix jq devour-flake om agenix deadnix];
}; };
apps = nixpkgs.lib.mapAttrs' (name: value: nixpkgs.lib.nameValuePair ("deploy-" + name) value) (inputs.nixinate.nixinate.${system} self).nixinate; apps = nixpkgs.lib.mapAttrs' (name: value: nixpkgs.lib.nameValuePair ("deploy-" + name) value) (inputs.nixinate.nixinate.${system} self).nixinate;
packages = { packages = {
om = inputs.omnix.packages.${system}.default;
nixvim = inputs.nixvim.packages.${system}.default; nixvim = inputs.nixvim.packages.${system}.default;
agenix = inputs.agenix.packages.${system}.default; agenix = inputs.agenix.packages.${system}.default;
vaapiIntel = pkgs.vaapiIntel.override {enableHybridCodec = true;}; vaapiIntel = pkgs.vaapiIntel.override {enableHybridCodec = true;};
@ -127,7 +129,17 @@
inputs.nixpkgs.follows = "unstable"; inputs.nixpkgs.follows = "unstable";
inputs.home-manager.follows = "home-manager"; inputs.home-manager.follows = "home-manager";
}; };
#omnix-flake.url = "github:juspay/omnix?dir=nix/om";
omnix = {
url = "github:juspay/omnix";
inputs = {
nixpkgs.follows = "nixpkgs";
flake-parts.follows = "flake-parts";
treefmt-nix.follows = "treefmt-nix";
devour-flake.follows = "devour-flake";
systems.follows = "systems";
};
};
disko = { disko = {
url = "github:nix-community/disko"; url = "github:nix-community/disko";
@ -148,12 +160,15 @@
}; };
flake-compat.url = "github:edolstra/flake-compat"; flake-compat.url = "github:edolstra/flake-compat";
flake-parts.url = "github:hercules-ci/flake-parts"; flake-parts.url = "github:hercules-ci/flake-parts";
flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs";
systems.url = "github:nix-systems/default"; systems.url = "github:nix-systems/default";
#systems.url = "github:nix-systems/default-linux"; #systems.url = "github:nix-systems/default-linux";
#systems.url = "github:nix-systems/x86_64-linux"; #systems.url = "github:nix-systems/x86_64-linux";
treefmt-nix.url = "github:numtide/treefmt-nix"; treefmt-nix.url = "github:numtide/treefmt-nix";
treefmt-nix.inputs.nixpkgs.follows = "nixpkgs";
}; };
} }