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

feat: nix -> lix
All checks were successful
Discord / discord commits (push) Has been skipped
Details

Browse source
This commit is contained in:
matt1432 2024-07-23 21:40:13 -04:00
parent 92398d5cbf
commit 5ad37a0439
7 changed files with 121 additions and 129 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/default.nix
View file

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

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

@ -1,6 +1,5 @@
{
config,
nix-eval-jobs,
nix-fast-build,
pkgs,
...
@ -8,16 +7,12 @@
inherit (config.vars) mainUser;
inherit (config.sops) secrets;
nix-eval-jobsPkg =
nix-eval-jobs.packages.${pkgs.system}.default.override {
nix = config.nix.package;
}
// {
nix = config.nix.package;
};
nix-fast-buildPkg = nix-fast-build.packages.${pkgs.system}.nix-fast-build.override {
nix-eval-jobs = nix-eval-jobsPkg;
nix-eval-jobs =
pkgs.nix-eval-jobs
// {
nix = config.nix.package;
};
};
in {
services.nix-serve = {

199
flake.lock
View file

@ -443,27 +443,6 @@
}
},
"flake-parts_5": {
"inputs": {
"nixpkgs-lib": [
"nix-eval-jobs",
"nixpkgs"
]
},
"locked": {
"lastModified": 1719994518,
"narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_6": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib"
},
@ -481,7 +460,7 @@
"type": "github"
}
},
"flake-parts_7": {
"flake-parts_6": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib_2"
},
@ -499,7 +478,7 @@
"type": "github"
}
},
"flake-parts_8": {
"flake-parts_7": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib_3"
},
@ -517,7 +496,7 @@
"type": "github"
}
},
"flake-parts_9": {
"flake-parts_8": {
"inputs": {
"nixpkgs-lib": [
"nixpkgs-wayland",
@ -608,6 +587,24 @@
"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": {
"inputs": {
"systems": "systems_2"
@ -626,6 +623,21 @@
"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-hooks": {
"inputs": {
"flake-compat": "flake-compat_3",
@ -1181,7 +1193,7 @@
},
"lib-aggregate": {
"inputs": {
"flake-utils": "flake-utils_3",
"flake-utils": "flake-utils_4",
"nixpkgs-lib": "nixpkgs-lib_4"
},
"locked": {
@ -1214,6 +1226,43 @@
"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": {
"inputs": {
"curseforge-server-downloader-src": "curseforge-server-downloader-src",
@ -1253,7 +1302,7 @@
},
"mozilla-addons-to-nix": {
"inputs": {
"flake-utils": "flake-utils_2",
"flake-utils": "flake-utils_3",
"nixpkgs": [
"nixpkgs"
],
@ -1384,33 +1433,10 @@
},
"nix-eval-jobs": {
"inputs": {
"flake-parts": "flake-parts_5",
"flake-parts": "flake-parts_8",
"nix-github-actions": "nix-github-actions_2",
"nixpkgs": [
"nixpkgs"
],
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1721505437,
"narHash": "sha256-sZpyyf9EiRVyEA9vUVWNxu8yI9MU0nhlEuPBL3hvC60=",
"owner": "nix-community",
"repo": "nix-eval-jobs",
"rev": "2e522fb78d7613cecaf683875ab27b6c90e8a84f",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nix-eval-jobs",
"type": "github"
}
},
"nix-eval-jobs_2": {
"inputs": {
"flake-parts": "flake-parts_9",
"nix-github-actions": "nix-github-actions_3",
"nixpkgs": "nixpkgs_2",
"treefmt-nix": "treefmt-nix_3"
"treefmt-nix": "treefmt-nix_2"
},
"locked": {
"lastModified": 1721505437,
@ -1428,11 +1454,11 @@
},
"nix-fast-build": {
"inputs": {
"flake-parts": "flake-parts_6",
"flake-parts": "flake-parts_5",
"nixpkgs": [
"nixpkgs"
],
"treefmt-nix": "treefmt-nix_2"
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1719475157,
@ -1476,7 +1502,7 @@
},
"nix-gaming": {
"inputs": {
"flake-parts": "flake-parts_7",
"flake-parts": "flake-parts_6",
"nixpkgs": [
"nixpkgs"
],
@ -1519,27 +1545,6 @@
}
},
"nix-github-actions_2": {
"inputs": {
"nixpkgs": [
"nix-eval-jobs",
"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-github-actions_3": {
"inputs": {
"nixpkgs": [
"nixpkgs-wayland",
@ -1628,7 +1633,7 @@
},
"nixd": {
"inputs": {
"flake-parts": "flake-parts_8",
"flake-parts": "flake-parts_7",
"flake-root": "flake-root",
"nixpkgs": [
"nixpkgs"
@ -1805,7 +1810,7 @@
"inputs": {
"flake-compat": "flake-compat_4",
"lib-aggregate": "lib-aggregate",
"nix-eval-jobs": "nix-eval-jobs_2",
"nix-eval-jobs": "nix-eval-jobs",
"nixpkgs": [
"nixpkgs"
]
@ -2056,6 +2061,7 @@
"jellyfin-ultrachromic-src": "jellyfin-ultrachromic-src",
"jovian": "jovian",
"libratbag-src": "libratbag-src",
"lix-module": "lix-module",
"minix": "minix",
"modernx-src": "modernx-src",
"mozilla-addons-to-nix": "mozilla-addons-to-nix",
@ -2064,7 +2070,6 @@
"mpv-touch-gestures-src": "mpv-touch-gestures-src",
"neovim-nightly": "neovim-nightly",
"nh": "nh",
"nix-eval-jobs": "nix-eval-jobs",
"nix-fast-build": "nix-fast-build",
"nix-gaming": "nix-gaming",
"nix-index-db": "nix-index-db",
@ -2330,6 +2335,21 @@
"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": {
"flake": false,
"locked": {
@ -2347,27 +2367,6 @@
}
},
"treefmt-nix": {
"inputs": {
"nixpkgs": [
"nix-eval-jobs",
"nixpkgs"
]
},
"locked": {
"lastModified": 1720930114,
"narHash": "sha256-VZK73b5hG5bSeAn97TTcnPjXUXtV7j/AtS4KN8ggCS0=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "b92afa1501ac73f1d745526adc4f89b527595f14",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"treefmt-nix_2": {
"inputs": {
"nixpkgs": [
"nix-fast-build",
@ -2388,7 +2387,7 @@
"type": "github"
}
},
"treefmt-nix_3": {
"treefmt-nix_2": {
"inputs": {
"nixpkgs": [
"nixpkgs-wayland",

11
flake.nix
View file

@ -158,6 +158,11 @@
repo = "libratbag";
type = "github";
};
lix-module = {
inputs.nixpkgs.follows = "nixpkgs";
type = "git";
url = "https://git.lix.systems/lix-project/nixos-module";
};
minix = {
inputs.nixpkgs.follows = "nixpkgs";
owner = "matt1432";
@ -206,12 +211,6 @@
repo = "nh";
type = "github";
};
nix-eval-jobs = {
inputs.nixpkgs.follows = "nixpkgs";
owner = "nix-community";
repo = "nix-eval-jobs";
type = "github";
};
nix-fast-build = {
inputs.nixpkgs.follows = "nixpkgs";
owner = "Mic92";

20
flake/inputs.nix
View file

@ -9,6 +9,16 @@ let
# Inputs
nixTools = {
lix-module = mkDep {
type = "git";
url = "https://git.lix.systems/lix-project/nixos-module";
};
nix-fast-build = mkDep {
owner = "Mic92";
repo = "nix-fast-build";
};
nurl = mkDep {
owner = "matt1432";
repo = "nurl";
@ -83,16 +93,6 @@ let
owner = "matt1432";
repo = "Minix";
};
nix-eval-jobs = mkDep {
owner = "nix-community";
repo = "nix-eval-jobs";
};
nix-fast-build = mkDep {
owner = "Mic92";
repo = "nix-fast-build";
};
};
nosInputs = {

1
flake/lib.nix
View file

@ -17,6 +17,7 @@
inputs.grim-hyprland.overlays.default
inputs.jovian.overlays.default
inputs.nixpkgs-wayland.overlays.default
inputs.lix-module.overlays.default
];
};

2
modules/desktop/desktop-environment/home/hyprgrass.nix
View file

@ -12,7 +12,7 @@ in
mkIf cfg.isTouchscreen {
wayland.windowManager.hyprland = {
plugins = [
(hyprgrass.packages.${pkgs.system}.default.overrideAttrs (o:{
(hyprgrass.packages.${pkgs.system}.default.overrideAttrs (o: {
nativeBuildInputs = o.nativeBuildInputs ++ [pkgs.meson];
}))
];