forked from mirrors_public/oddlama_nix-config
chore: remove overlays for now
This commit is contained in:
oddlama
parent
ba0d5f2f5d
commit
aa2a660c61
8 changed files with 79 additions and 64 deletions
|
|
@ -33,8 +33,6 @@ This is my personal nix config.
|
|||
- `extra-builtins.nix` Extra builtins via nix-plugins to support transparent repository-wide secrets
|
||||
- `home-manager.nix` Definition of home-manager only hosts (not used currently)
|
||||
- `hosts.nix` Wrapper that extracts all defined hosts from `hosts/`
|
||||
- `overlays/**` Local overlay packages. Subject for removal.
|
||||
- `overlay.nix` Overlay defintions
|
||||
- `rage-decrypt.sh` Auxiliary script for repository-wide secrets
|
||||
- `secrets.nix` Helper to access repository-wide secrets, used by colmena.nix
|
||||
- `secrets/` Global secrets and age identities
|
||||
|
|
|
|||
82
flake.lock
generated
82
flake.lock
generated
|
|
@ -88,6 +88,28 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"fenix": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"microvm",
|
||||
"nixpkgs"
|
||||
],
|
||||
"rust-analyzer-src": "rust-analyzer-src"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1679466129,
|
||||
"narHash": "sha256-BQt0ADAhPAwuoq3z+iprmHyw1NeyerOw1GiIEJkANGc=",
|
||||
"owner": "nix-community",
|
||||
"repo": "fenix",
|
||||
"rev": "49237f7a76b98954306e77a7bd42f6491ad5c6a7",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "fenix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
|
@ -166,11 +188,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1679786039,
|
||||
"narHash": "sha256-VNjswu0Q4bZOkWNuc0+dHvRdjUCj+MnDlRfw/Q0R3vI=",
|
||||
"lastModified": 1680000368,
|
||||
"narHash": "sha256-TlgC4IJ7aotynUdkGRtaAVxquaiddO38Ws89nB7VGY8=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "cf662b6c98a0da81e06066fff0ecf9cbd4627727",
|
||||
"rev": "765e4007b6f9f111469a25d1df6540e8e0ca73a6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -194,13 +216,37 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"microvm": {
|
||||
"inputs": {
|
||||
"fenix": "fenix",
|
||||
"flake-utils": [
|
||||
"flake-utils"
|
||||
],
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1679533405,
|
||||
"narHash": "sha256-LQbHTnEn/jAME1AsJtjif5oVeNWUGdL/RMUZCb2Ts5I=",
|
||||
"owner": "astro",
|
||||
"repo": "microvm.nix",
|
||||
"rev": "31d3c1a05fba175e5d96f16256296ad4088ca9f5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "astro",
|
||||
"repo": "microvm.nix",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1679765008,
|
||||
"narHash": "sha256-VCkg/wC2e882suYDS5PDAemaMLYSOdFm4fsx2gowMR0=",
|
||||
"lastModified": 1680070330,
|
||||
"narHash": "sha256-aoT2YZCd9LEtiEULFLIF0ykKydgE72X8gw/k9/pRS5I=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "f38f9a4c9b2b6f89a5778465e0afd166a8300680",
|
||||
"rev": "a6aa8174fa61e55bd7e62d35464d3092aefe0421",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -211,11 +257,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1679865578,
|
||||
"narHash": "sha256-sYQmxxqIYL3QFsRYjW0AufhGur8qWfwoOGPGHRJZlGc=",
|
||||
"lastModified": 1679944645,
|
||||
"narHash": "sha256-e5Qyoe11UZjVfgRfwNoSU57ZeKuEmjYb77B9IVW7L/M=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "4361baa782dc3d3b35fd455a1adc370681d9187c",
|
||||
"rev": "4bb072f0a8b267613c127684e099a70e1f6ff106",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -275,12 +321,30 @@
|
|||
"flake-utils": "flake-utils",
|
||||
"home-manager": "home-manager",
|
||||
"impermanence": "impermanence",
|
||||
"microvm": "microvm",
|
||||
"nixos-hardware": "nixos-hardware",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"pre-commit-hooks": "pre-commit-hooks",
|
||||
"templates": "templates"
|
||||
}
|
||||
},
|
||||
"rust-analyzer-src": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1679428647,
|
||||
"narHash": "sha256-gyS7UDFNzQfRKJvUDlVuM8wXCIyreBmVq+aiPXhfTlk=",
|
||||
"owner": "rust-lang",
|
||||
"repo": "rust-analyzer",
|
||||
"rev": "3321799e8fac622db50fe8c3284062f7d0f1bf53",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "rust-lang",
|
||||
"ref": "nightly",
|
||||
"repo": "rust-analyzer",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"stable": {
|
||||
"locked": {
|
||||
"lastModified": 1669735802,
|
||||
|
|
|
|||
10
flake.nix
10
flake.nix
|
|
@ -18,6 +18,12 @@
|
|||
nixos-hardware.url = "github:NixOS/nixos-hardware";
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
|
||||
microvm = {
|
||||
url = "github:astro/microvm.nix";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
inputs.flake-utils.follows = "flake-utils";
|
||||
};
|
||||
|
||||
pre-commit-hooks = {
|
||||
url = "github:cachix/pre-commit-hooks.nix";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
|
@ -56,7 +62,6 @@
|
|||
|
||||
hosts = import ./nix/hosts.nix inputs;
|
||||
colmena = import ./nix/colmena.nix inputs;
|
||||
overlays = import ./nix/overlay.nix inputs;
|
||||
homeConfigurations = import ./nix/home-manager.nix inputs;
|
||||
|
||||
inherit ((colmena.lib.makeHive self.colmena).introspect (x: x)) nodes;
|
||||
|
|
@ -64,9 +69,6 @@
|
|||
// flake-utils.lib.eachDefaultSystem (system: rec {
|
||||
pkgs = import nixpkgs {
|
||||
inherit system;
|
||||
overlays = [
|
||||
self.overlays.default
|
||||
];
|
||||
config.allowUnfree = true;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -64,13 +64,11 @@ in {
|
|||
nix.nixPath = [
|
||||
"nixos-config=${dummyConfig}"
|
||||
"nixpkgs=/run/current-system/nixpkgs"
|
||||
"nixpkgs-overlays=/run/current-system/overlays"
|
||||
];
|
||||
|
||||
system = {
|
||||
extraSystemBuilderCmds = ''
|
||||
ln -sv ${pkgs.path} $out/nixpkgs
|
||||
ln -sv ${../../../nix/overlays} $out/overlays
|
||||
'';
|
||||
|
||||
stateVersion = "23.05";
|
||||
|
|
|
|||
|
|
@ -24,14 +24,12 @@ with nixpkgs.lib; let
|
|||
inherit homeDirectory;
|
||||
sessionVariables.NIX_PATH = concatStringsSep ":" [
|
||||
"nixpkgs=${config.xdg.dataHome}/nixpkgs"
|
||||
"nixpkgs-overlays=${config.xdg.dataHome}/overlays"
|
||||
];
|
||||
};
|
||||
|
||||
xdg = {
|
||||
dataFile = {
|
||||
nixpkgs.source = nixpkgs;
|
||||
overlays.source = ../nix/overlays;
|
||||
};
|
||||
configFile."nix/nix.conf".text = ''
|
||||
flake-registry = ${config.xdg.configHome}/nix/registry.json
|
||||
|
|
|
|||
|
|
@ -1,8 +0,0 @@
|
|||
{nixpkgs, ...}:
|
||||
with nixpkgs.lib; let
|
||||
localOverlays =
|
||||
mapAttrs'
|
||||
(f: _: nameValuePair (removeSuffix ".nix" f) (import (./overlays + "/${f}")))
|
||||
(builtins.readDir ./overlays);
|
||||
in
|
||||
localOverlays // {default = composeManyExtensions (attrValues localOverlays);}
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
final: prev:
|
||||
with prev.lib;
|
||||
with builtins;
|
||||
composeManyExtensions (
|
||||
map
|
||||
(f: import (./. + "/${f}"))
|
||||
(remove "default.nix" (attrNames (readDir ./.)))
|
||||
)
|
||||
final
|
||||
prev
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
final: _: {
|
||||
screenocr =
|
||||
final.callPackage
|
||||
(
|
||||
{
|
||||
writeShellApplication,
|
||||
coreutils,
|
||||
grim,
|
||||
slurp,
|
||||
tesseract4,
|
||||
wl-clipboard,
|
||||
}:
|
||||
writeShellApplication {
|
||||
name = "screenocr";
|
||||
|
||||
runtimeInputs = [coreutils grim slurp tesseract4 wl-clipboard];
|
||||
|
||||
text = ''
|
||||
grim -t png -g "$(slurp)" - \
|
||||
| tesseract stdin stdout -l "eng+equ" \
|
||||
| tr -d '\f' \
|
||||
| wl-copy
|
||||
'';
|
||||
}
|
||||
)
|
||||
{};
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue