Compare commits

..

No commits in common. "2a6740c86cf385af6c9faa8adb1ead396714df1d" and "21ef485375d3e5410c17cd42b37a4447d910f392" have entirely different histories.

3 changed files with 17 additions and 192 deletions

View File

@ -36,42 +36,6 @@
"type": "github"
}
},
"flake-utils_3": {
"inputs": {
"systems": "systems_4"
},
"locked": {
"lastModified": 1726560853,
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_4": {
"inputs": {
"systems": "systems_5"
},
"locked": {
"lastModified": 1726560853,
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"ghettoptt": {
"inputs": {
"nixpkgs": [
@ -158,28 +122,6 @@
"type": "github"
}
},
"nix-github-actions_2": {
"inputs": {
"nixpkgs": [
"nixprstatus",
"poetry2nix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1720066371,
"narHash": "sha256-uPlLYH2S0ACj0IcgaK9Lsf4spmJoGejR9DotXiXSBZQ=",
"owner": "nix-community",
"repo": "nix-github-actions",
"rev": "622f829f5fe69310a866c8a6cd07e747c44ef820",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nix-github-actions",
"type": "github"
}
},
"nix-packages": {
"inputs": {
"nixpkgs": [
@ -219,11 +161,11 @@
},
"nixpkgs-master": {
"locked": {
"lastModified": 1727733484,
"narHash": "sha256-EYUyvDEKbmMVsUSyt0fguSKn4R2Uyive7Y5Gyvjknck=",
"lastModified": 1727722408,
"narHash": "sha256-9dONW89K5Nex0fCFJ5OGn611xHHjZnSVzn+Mw6cwvN8=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "22b3e817a2916e4bbd745e141d7129cec1499fb5",
"rev": "afab97c863b16b43b1b23009d4d0f1f5d2d4f0ae",
"type": "github"
},
"original": {
@ -281,29 +223,6 @@
"type": "github"
}
},
"nixprstatus": {
"inputs": {
"flake-utils": "flake-utils_3",
"nixpkgs": [
"nixpkgs"
],
"poetry2nix": "poetry2nix_2"
},
"locked": {
"lastModified": 1727733801,
"narHash": "sha256-n93TfJSS9qOp/G7NPBT39kMWg1IW7O9FVKa/0DmmLrg=",
"ref": "master",
"rev": "68f7c3ab434b5c0420234337e5912bdb02849cf2",
"revCount": 4,
"type": "git",
"url": "https://git.t-juice.club/torjus/nixprstatus"
},
"original": {
"ref": "master",
"type": "git",
"url": "https://git.t-juice.club/torjus/nixprstatus"
}
},
"poetry2nix": {
"inputs": {
"flake-utils": "flake-utils_2",
@ -329,31 +248,6 @@
"type": "github"
}
},
"poetry2nix_2": {
"inputs": {
"flake-utils": "flake-utils_4",
"nix-github-actions": "nix-github-actions_2",
"nixpkgs": [
"nixprstatus",
"nixpkgs"
],
"systems": "systems_6",
"treefmt-nix": "treefmt-nix_2"
},
"locked": {
"lastModified": 1727711975,
"narHash": "sha256-zkkL5gw+TNXhVO2zpeH70TKh2dSzUbkBbO6gKHO37s0=",
"owner": "nix-community",
"repo": "poetry2nix",
"rev": "ef877b8e159b23f36ebc39155021657bed744a68",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "poetry2nix",
"type": "github"
}
},
"root": {
"inputs": {
"ghettoptt": "ghettoptt",
@ -363,7 +257,6 @@
"nixpkgs": "nixpkgs",
"nixpkgs-master": "nixpkgs-master",
"nixpkgs-stable": "nixpkgs-stable",
"nixprstatus": "nixprstatus",
"sops-nix": "sops-nix"
}
},
@ -430,50 +323,6 @@
"type": "indirect"
}
},
"systems_4": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_5": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"systems_6": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"id": "systems",
"type": "indirect"
}
},
"treefmt-nix": {
"inputs": {
"nixpkgs": [
@ -495,28 +344,6 @@
"repo": "treefmt-nix",
"type": "github"
}
},
"treefmt-nix_2": {
"inputs": {
"nixpkgs": [
"nixprstatus",
"poetry2nix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1727431250,
"narHash": "sha256-uGRlRT47ecicF9iLD1G3g43jn2e+b5KaMptb59LHnvM=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "879b29ae9a0378904fbbefe0dadaed43c8905754",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
}
},
"root": "root",

View File

@ -23,10 +23,6 @@
url = "git+https://git.t-juice.club/torjus/nix-packages?ref=master";
inputs.nixpkgs.follows = "nixpkgs";
};
nixprstatus = {
url = "git+https://git.t-juice.club/torjus/nixprstatus?ref=master";
inputs.nixpkgs.follows = "nixpkgs";
};
};
outputs =
@ -35,7 +31,6 @@
nixpkgs,
nixpkgs-master,
nixpkgs-stable,
nixprstatus,
sops-nix,
ghettoptt,
huecli,
@ -65,14 +60,6 @@
];
forAllSystems =
f: nixpkgs.lib.genAttrs allSystems (system: f { pkgs = import nixpkgs { inherit system; }; });
commonOverlays = [
overlay-stable
overlay-master
ghettoptt.overlays.default
huecli.overlays.default
nix-packages.overlays.default
nixprstatus.overlays.default
];
in
{
nixosConfigurations = {
@ -92,7 +79,13 @@
(
{ config, pkgs, ... }:
{
nixpkgs.overlays = commonOverlays;
nixpkgs.overlays = [
overlay-stable
overlay-master
ghettoptt.overlays.default
huecli.overlays.default
nix-packages.overlays.default
];
}
)
./hosts/magicman
@ -113,7 +106,13 @@
(
{ config, pkgs, ... }:
{
nixpkgs.overlays = commonOverlays;
nixpkgs.overlays = [
overlay-stable
overlay-master
ghettoptt.overlays.default
huecli.overlays.default
nix-packages.overlays.default
];
}
)
./hosts/gunter

View File

@ -98,7 +98,6 @@ in
# Homemade shit
ghettoptt
huecli
nixprstatus
# Stuff with overrides
# Btop