qbit/xin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

flakes: clean up inputs and overlays

Browse Source
This commit is contained in:
Aaron Bieber 2023-05-28 15:12:04 -06:00
parent ca8a3618b7
commit 5dcf06effd
No known key found for this signature in database
7 changed files with 68 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
flake.lock
View File

@ -163,38 +163,6 @@
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1660215038,
"narHash": "sha256-tqMyd5QB4MZh59wMHXqpro4hkKjz9ubQxkxFSuCuBGE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "45c9736ed69800a6ff2164fb4538c9e40dad25d6",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-22.05",
"repo": "nixpkgs",
"type": "github"
}
},
"oldStable": {
"locked": {
"lastModified": 1682600000,
"narHash": "sha256-ha4BehR1dh8EnXSoE1m/wyyYVvHI9txjW4w5/oxsW5Y=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "50fc86b75d2744e1ab3837ef74b53f103a9b55a0",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-22.05-small",
"repo": "nixpkgs",
"type": "github"
}
},
"peerix": {
"inputs": {
"flake-compat": "flake-compat",
@ -277,24 +245,6 @@
"type": "github"
}
},
"reform": {
"inputs": {
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1660545962,
"narHash": "sha256-JrsEoAdBzflng/ksBNu2cUZMezRQPytDSkz7bZNzI7s=",
"owner": "nix-community",
"repo": "hardware-mnt-reform",
"rev": "302b06b967e0777b52abd8ee0f9c736d63399137",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "hardware-mnt-reform",
"type": "github"
}
},
"root": {
"inputs": {
"darwin": "darwin",
@ -303,12 +253,10 @@
"gqrss": "gqrss",
"microca": "microca",
"nixos-hardware": "nixos-hardware",
"oldStable": "oldStable",
"peerix": "peerix",
"po": "po",
"pots": "pots",
"pr-status": "pr-status",
"reform": "reform",
"sops-nix": "sops-nix",
"stable": "stable",
"talon": "talon",

25
flake.nix
View File

@ -5,9 +5,7 @@
unstable.url = "github:NixOS/nixpkgs";
unstableSmall.url = "github:NixOS/nixpkgs/nixos-unstable-small";
oldStable.url = "github:NixOS/nixpkgs/nixos-22.05-small";
#stable.url = "github:NixOS/nixpkgs/nixos-22.11-small";
stable.url = "github:NixOS/nixpkgs/nixos-23.05-small";
sops-nix = {
@ -22,7 +20,6 @@
};
nixos-hardware = { url = "github:NixOS/nixos-hardware/master"; };
reform = { url = "github:nix-community/hardware-mnt-reform"; };
emacs-overlay = {
url =
@ -88,9 +85,9 @@
};
};
outputs = { self, unstable, unstableSmall, stable, oldStable, nixos-hardware
, reform, gostart, xintray, tsvnstat, pots, po, pr-status, tsRevProx, darwin
, xin-secrets, talon, peerix, ... }@inputs:
outputs = { self, darwin, gostart, nixos-hardware, peerix, po, pots, pr-status
, stable, talon, tsRevProx, tsvnstat, unstable, unstableSmall, xin-secrets
, xintray, ... }@inputs:
let
xinlib = import ./lib { inherit (unstable) lib; };
supportedSystems = [ "x86_64-linux" ];
@ -116,7 +113,6 @@
inputs.peerix.overlay
inputs.pots.overlay
inputs.pr-status.overlay
inputs.reform.overlay
inputs.talon.overlays.default
inputs.taskobs.overlay
inputs.tsRevProx.overlay
@ -168,8 +164,8 @@
] "europa";
pwntie = buildSys "x86_64-linux" unstable [ ] "pwntie";
stan = buildSys "x86_64-linux" unstable [ ] "stan";
weather = buildSys "aarch64-linux" stable
[ nixos-hardware.nixosModules.raspberry-pi-4 ] "weather";
#weather = buildSys "aarch64-linux" stable
# [ nixos-hardware.nixosModules.raspberry-pi-4 ] "weather";
faf = buildSys "x86_64-linux" stable [ ./configs/hardened.nix ] "faf";
box = buildSys "x86_64-linux" stable [ ./configs/hardened.nix ] "box";
@ -194,17 +190,6 @@
"${stable}/nixos/modules/installer/sd-card/sd-image-aarch64-installer.nix"
];
};
reformInstall = oldStable.lib.nixosSystem {
system = "aarch64-linux";
modules = [
reform.nixosModule
(import (./installer.nix))
xin-secrets.nixosModules.sops
"${reform}/nixos/installer.nix"
];
};
isoInstall = stable.lib.nixosSystem {
system = "x86_64-linux";

18
overlays/default.nix
View File

@ -1,11 +1,11 @@
{ isUnstable, lib, xinlib, ... }:
{ isUnstable, xinlib, ... }:
let
inherit (xinlib) prIsOpen;
openssh = import ./openssh.nix;
#openssh = import ./openssh.nix;
obsidian = prIsOpen 233877 (import ./obsidian.nix);
tailscale = import ./tailscale.nix;
jetbrains = prIsOpen 232308 (import ./jetbrains.nix);
tidal-hifi = prIsOpen 228552 (import ./tidal-hifi.nix { inherit lib; });
#tailscale = import ./tailscale.nix;
#jetbrains = prIsOpen 232308 (import ./jetbrains.nix);
#tidal-hifi = prIsOpen 228552 (import ./tidal-hifi.nix { inherit lib; });
matrix-synapse = prIsOpen 233651 (import ./matrix-synapse.nix);
in {
nixpkgs.overlays = if isUnstable then [
@ -16,15 +16,11 @@ in {
});
};
})
jetbrains
tidal-hifi
obsidian
openssh
(prIsOpen 234161 tailscale)
#(prIsOpen 234161 tailscale)
] else [
matrix-synapse
openssh
(prIsOpen 234229 tailscale)
#(prIsOpen 234229 tailscale)
];
}

8
overlays/tailscale.nix
View File

@ -1,8 +1,6 @@
let
tailscale = _: super: {
tailscale = super.callPackage "${super.path}/pkgs/servers/tailscale" {
buildGoModule = args:
super.buildGo120Module (args // rec {
tailscale = super.tailscale.overrideAttrs (_: rec {
version = "1.42.0";
src = super.fetchFromGitHub {
owner = "tailscale";
@ -10,14 +8,14 @@ let
rev = "v${version}";
hash = "sha256-J7seajRoUOG/nm5iYuiv3lcS5vTT1XxZTxiSmf/TjGI=";
};
vendorHash = "sha256-7L+dvS++UNfMVcPUCbK/xuBPwtrzW4RpZTtcl7VCwQs=";
vendorSha256 = "_unset";
ldflags = [
"-X tailscale.com/version.longStamp=${version}"
"-X tailscale.com/version.shortStamp=${version}"
];
});
};
};
in tailscale

18
pull_requests/233877.json
View File

@ -1,8 +1,20 @@
{
"branches": [],
"branches": [
"master",
"nixos-unstable-small",
"staging",
"staging-next"
],
"pull_request": 233877,
"release": "stable",
"release": "unstable",
"status": "open",
"status_info": {},
"status_info": {
"master": true,
"nixos-unstable": false,
"nixos-unstable-small": true,
"nixpkgs-unstable": false,
"staging": true,
"staging-next": true
},
"title": "obsidian: 1.2.8 -> 1.3.4"
}

17
pull_requests/234161.json
View File

@ -1,8 +1,19 @@
{
"branches": [],
"branches": [
"master",
"staging",
"staging-next"
],
"pull_request": 234161,
"release": "stable",
"release": "unstable",
"status": "open",
"status_info": {},
"status_info": {
"master": true,
"nixos-unstable": false,
"nixos-unstable-small": false,
"nixpkgs-unstable": false,
"staging": true,
"staging-next": true
},
"title": "tailscale: 1.40.1 -> 1.42.0"
}

13
pull_requests/234229.json
View File

@ -1,8 +1,17 @@
{
"branches": [],
"branches": [
"nixos-23.05-small",
"nixpkgs-23.05-darwin",
"release-23.05",
"staging-next-23.05"
],
"pull_request": 234229,
"release": "stable",
"status": "open",
"status_info": {},
"status_info": {
"nixos-23.05-small": false,
"release-23.05": true,
"staging-next-23.05": true
},
"title": "tailscale: 1.40.1 -> 1.42.0"
}