feat: rewrite to more nixy flakes
This commit is contained in:
+11
-35
@@ -1,32 +1,22 @@
|
||||
{
|
||||
pkgs ? import <nixpkgs> { config.allowUnfree = true; },
|
||||
config ? (import <nixpkgs/nixos> { }).config,
|
||||
fetchzip ? pkgs.fetchzip,
|
||||
...
|
||||
}:
|
||||
final: prev:
|
||||
|
||||
let
|
||||
system = {
|
||||
stateVersion = config.system.stateVersion;
|
||||
};
|
||||
use = path: pkgs.callPackage (import path) { inherit pkgs; };
|
||||
fetchzip = prev.fetchzip;
|
||||
use = path: prev.callPackage (import path) { pkgs = prev; };
|
||||
in
|
||||
{
|
||||
inherit system;
|
||||
|
||||
wallpaper = use ./wallpaper/default.nix;
|
||||
tetrio.desktop = use ./tetrio/default.nix;
|
||||
wallpaper = use ./wallpaper;
|
||||
tetrio.desktop = use ./tetrio;
|
||||
tetrio.plus =
|
||||
let
|
||||
repo = {
|
||||
owner = "UniQMG";
|
||||
name = "tetrio-plus";
|
||||
job = "11675178434";
|
||||
hash = "sha256-j3ACcnT64eMQtWYDGOE2oGXpnN5EUqk+lyV6ARBEtU8=";
|
||||
};
|
||||
src = fetchzip {
|
||||
url = "https://gitlab.com/${repo.owner}/${repo.name}/-/jobs/${repo.job}/artifacts/raw/app.asar.zip";
|
||||
hash = repo.hash;
|
||||
hash = "sha256-j3ACcnT64eMQtWYDGOE2oGXpnN5EUqk+lyV6ARBEtU8=";
|
||||
};
|
||||
in
|
||||
"${src}/app.asar";
|
||||
@@ -34,25 +24,11 @@ in
|
||||
simple-connected = use ./tetrio/skins/simple-connected.nix;
|
||||
};
|
||||
|
||||
leveldb-cli = use ./leveldb/default.nix;
|
||||
leveldb-cli = use ./leveldb;
|
||||
|
||||
config.neovim = use ./neovim/default.nix;
|
||||
config.fish = use ./fish/default.nix;
|
||||
configs.neovim = use ./neovim;
|
||||
configs.fish = use ./fish;
|
||||
|
||||
font.monaco = use ./monaco-font/default.nix;
|
||||
|
||||
home-manager = {
|
||||
module =
|
||||
let
|
||||
home-manager = fetchzip {
|
||||
url = "https://github.com/nix-community/home-manager/archive/master.tar.gz";
|
||||
hash = "sha256-UZjPc/d5XRxvjDbk4veAO4XFdvx6BUum2l40V688Xq8=";
|
||||
};
|
||||
in
|
||||
import "${home-manager}/nixos";
|
||||
sharedModules = [
|
||||
./home-manager/initialFile.nix
|
||||
./tetrio/module.nix
|
||||
];
|
||||
};
|
||||
nimbus-roman = use ./nimbus;
|
||||
monaco = use ./monaco-font;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user