matt1432/nixos-configs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: go back to nix
All checks were successful
Discord / discord commits (push) Has been skipped
Details

Browse source
This commit is contained in:
matt1432 2024-07-24 21:58:37 -04:00
parent 59d2205e7a
commit 4b7fa67767
6 changed files with 18 additions and 111 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/default.nix
View file

@ -29,6 +29,8 @@
}; };
nix = { nix = {
package = pkgs.nixVersions.nix_2_23;
# Edit nix.conf # Edit nix.conf
settings = { settings = {
# Store # Store

4
devices/servivi/modules/binary-cache.nix
View file

@ -9,7 +9,9 @@
nix-fast-buildPkg = nix-fast-build.packages.${pkgs.system}.nix-fast-build.override { nix-fast-buildPkg = nix-fast-build.packages.${pkgs.system}.nix-fast-build.override {
nix-eval-jobs = nix-eval-jobs =
pkgs.nix-eval-jobs pkgs.nix-eval-jobs.override {
nix = config.nix.package;
}
// { // {
nix = config.nix.package; nix = config.nix.package;
}; };

112
flake.lock
View file

@ -448,24 +448,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_4": {
"inputs": {
"systems": "systems_8"
},
"locked": {
"lastModified": 1710146030,
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flakegen": { "flakegen": {
"inputs": { "inputs": {
"systems": "systems_2" "systems": "systems_2"
@ -484,21 +466,6 @@
"type": "github" "type": "github"
} }
}, },
"flakey-profile": {
"locked": {
"lastModified": 1712898590,
"narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=",
"owner": "lf-",
"repo": "flakey-profile",
"rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d",
"type": "github"
},
"original": {
"owner": "lf-",
"repo": "flakey-profile",
"type": "github"
}
},
"git-theme-src": { "git-theme-src": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -949,7 +916,7 @@
}, },
"lib-aggregate": { "lib-aggregate": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_4", "flake-utils": "flake-utils_3",
"nixpkgs-lib": "nixpkgs-lib_4" "nixpkgs-lib": "nixpkgs-lib_4"
}, },
"locked": { "locked": {
@ -982,43 +949,6 @@
"type": "github" "type": "github"
} }
}, },
"lix": {
"flake": false,
"locked": {
"lastModified": 1718767907,
"narHash": "sha256-gpd+mGQxqVHw2kO6rSPQel8TkChHh9UpqxjsmQi0QJM=",
"rev": "85f282ef572577899b3d80ba8def1b920a386218",
"type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/85f282ef572577899b3d80ba8def1b920a386218.tar.gz"
},
"original": {
"type": "tarball",
"url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"
}
},
"lix-module": {
"inputs": {
"flake-utils": "flake-utils_2",
"flakey-profile": "flakey-profile",
"lix": "lix",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1720695775,
"narHash": "sha256-8Oqzl9QPjEe/n8y0R2tC6+2v/H6xBgABHXOJwxmnBg0=",
"ref": "refs/heads/main",
"rev": "d70318fb946a0e720dfdd1fb10b0645c14e2a02a",
"revCount": 94,
"type": "git",
"url": "https://git.lix.systems/lix-project/nixos-module"
},
"original": {
"type": "git",
"url": "https://git.lix.systems/lix-project/nixos-module"
}
},
"minix": { "minix": {
"inputs": { "inputs": {
"curseforge-server-downloader-src": "curseforge-server-downloader-src", "curseforge-server-downloader-src": "curseforge-server-downloader-src",
@ -1058,7 +988,7 @@
}, },
"mozilla-addons-to-nix": { "mozilla-addons-to-nix": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_3", "flake-utils": "flake-utils_2",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
@ -1491,16 +1421,16 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1721524707, "lastModified": 1715458492,
"narHash": "sha256-5NctRsoE54N86nWd0psae70YSLfrOek3Kv1e8KoXe/0=", "narHash": "sha256-q0OFeZqKQaik2U8wwGDsELEkgoZMK7gvfF6tTXkpsqE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "556533a23879fc7e5f98dd2e0b31a6911a213171", "rev": "8e47858badee5594292921c2668c11004c3b0142",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "release-24.05", "ref": "release-23.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -1775,7 +1705,6 @@
"jovian": "jovian", "jovian": "jovian",
"khepri": "khepri", "khepri": "khepri",
"libratbag-src": "libratbag-src", "libratbag-src": "libratbag-src",
"lix-module": "lix-module",
"minix": "minix", "minix": "minix",
"modernx-src": "modernx-src", "modernx-src": "modernx-src",
"mozilla-addons-to-nix": "mozilla-addons-to-nix", "mozilla-addons-to-nix": "mozilla-addons-to-nix",
@ -1831,11 +1760,11 @@
"sops-nix": "sops-nix" "sops-nix": "sops-nix"
}, },
"locked": { "locked": {
"lastModified": 1721855861, "lastModified": 1716069733,
"narHash": "sha256-rVCnb7CGsiifat9s1xc6MkYu/ossB8pT7f0hHszCxyg=", "narHash": "sha256-80esrChLmwUiWa/j7oJ8JwSW+6k2IMTjiRLTA0cNfJg=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "7ef3e9364c7b1a3fef1e98bf9dcb3847e44bac9e", "rev": "1750659f6783859f22ee02b0fa1987fe4809229c",
"revCount": 67, "revCount": 66,
"type": "git", "type": "git",
"url": "ssh://git@git.nelim.org/matt1432/nixos-secrets" "url": "ssh://git@git.nelim.org/matt1432/nixos-secrets"
}, },
@ -1869,11 +1798,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1721688883, "lastModified": 1715482972,
"narHash": "sha256-9jsjsRKtJRqNSTXKj9zuDFRf2PGix30nMx9VKyPgD2U=", "narHash": "sha256-y1uMzXNlrVOWYj1YNcsGYLm4TOC2aJrwoUY1NjQs9fM=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "aff2f88277dabe695de4773682842c34a0b7fd54", "rev": "b6cb5de2ce57acb10ecdaaf9bbd62a5ff24fa02e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -2048,21 +1977,6 @@
"type": "github" "type": "github"
} }
}, },
"systems_8": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"trash-d-src": { "trash-d-src": {
"flake": false, "flake": false,
"locked": { "locked": {

5
flake.nix
View file

@ -152,11 +152,6 @@
repo = "libratbag"; repo = "libratbag";
type = "github"; type = "github";
}; };
lix-module = {
inputs.nixpkgs.follows = "nixpkgs";
type = "git";
url = "https://git.lix.systems/lix-project/nixos-module";
};
minix = { minix = {
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
owner = "matt1432"; owner = "matt1432";

5
flake/inputs.nix
View file

@ -9,11 +9,6 @@ let
# Inputs # Inputs
nixTools = { nixTools = {
lix-module = mkDep {
type = "git";
url = "https://git.lix.systems/lix-project/nixos-module";
};
nix-fast-build = mkDep { nix-fast-build = mkDep {
owner = "Mic92"; owner = "Mic92";
repo = "nix-fast-build"; repo = "nix-fast-build";

1
flake/lib.nix
View file

@ -16,7 +16,6 @@
"discord-overlay" "discord-overlay"
"grim-hyprland" "grim-hyprland"
"jovian" "jovian"
"lix-module"
"nixpkgs-wayland" "nixpkgs-wayland"
]; ];
}; };