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

remove pins, comment out nix for lp2

Browse source
This commit is contained in:
Vinzenz Schroeter 2025-09-06 19:16:13 +02:00
parent ac59b05157
commit 857471d3db
5 changed files with 83 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

66
flake.lock generated
View file

@ -40,6 +40,24 @@
"type": "github"
}
},
"flake-utils_2": {
"inputs": {
"systems": "systems_2"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flakey-profile": {
"locked": {
"lastModified": 1712898590,
@ -92,9 +110,7 @@
},
"lix-module": {
"inputs": {
"flake-utils": [
"flake-utils"
],
"flake-utils": "flake-utils",
"flakey-profile": "flakey-profile",
"lix": "lix",
"nixpkgs": [
@ -209,11 +225,24 @@
"type": "github"
}
},
"nix-filter_2": {
"locked": {
"lastModified": 1731533336,
"narHash": "sha256-oRam5PS1vcrr5UPgALW0eo1m/5/pls27Z/pabHNy2Ms=",
"owner": "numtide",
"repo": "nix-filter",
"rev": "f7653272fd234696ae94229839a99b73c9ab7de0",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "nix-filter",
"type": "github"
}
},
"nix-vscode-extensions": {
"inputs": {
"flake-utils": [
"flake-utils"
],
"flake-utils": "flake-utils_2",
"nixpkgs": [
"nixpkgs"
]
@ -266,12 +295,10 @@
},
"root": {
"inputs": {
"flake-utils": "flake-utils",
"home-manager": "home-manager",
"lix-module": "lix-module",
"naersk": "naersk",
"niri": "niri",
"nix-filter": "nix-filter",
"nix-vscode-extensions": "nix-vscode-extensions",
"nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable",
@ -302,9 +329,7 @@
"naersk": [
"naersk"
],
"nix-filter": [
"nix-filter"
],
"nix-filter": "nix-filter",
"nixpkgs": [
"nixpkgs"
]
@ -328,9 +353,7 @@
"naersk": [
"naersk"
],
"nix-filter": [
"nix-filter"
],
"nix-filter": "nix-filter_2",
"nixpkgs": [
"nixpkgs"
]
@ -364,6 +387,21 @@
"type": "github"
}
},
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"xwayland-satellite-stable": {
"flake": false,
"locked": {

67
flake.nix
View file

@ -13,7 +13,6 @@
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz";
inputs = {
nixpkgs.follows = "nixpkgs";
flake-utils.follows = "flake-utils";
};
};
@ -38,7 +37,6 @@
inputs = {
nixpkgs.follows = "nixpkgs";
naersk.follows = "naersk";
nix-filter.follows = "nix-filter";
};
};
@ -47,7 +45,6 @@
inputs = {
nixpkgs.follows = "nixpkgs";
naersk.follows = "naersk";
nix-filter.follows = "nix-filter";
};
};
@ -55,13 +52,8 @@
url = "github:nix-community/nix-vscode-extensions";
inputs = {
nixpkgs.follows = "nixpkgs";
flake-utils.follows = "flake-utils";
};
};
# this is used to pin transitive dependencies to the same version
flake-utils.url = "github:numtide/flake-utils";
nix-filter.url = "github:numtide/nix-filter";
};
outputs =
@ -104,42 +96,41 @@
in
nixpkgs.lib.nixosSystem {
inherit system specialArgs;
modules =
[
lix-module.nixosModules.default
modules = [
lix-module.nixosModules.default
{ networking.hostName = device; }
{ networking.hostName = device; }
./modules/globalinstalls.nix
./modules/networking.nix
./modules/nixpkgs.nix
./modules/globalinstalls.nix
./modules/networking.nix
./modules/nixpkgs.nix
./hosts/${device}/hardware.nix
./hosts/${device}/imports.nix
./hosts/${device}/configuration.nix
./hosts/${device}/hardware.nix
./hosts/${device}/imports.nix
./hosts/${device}/configuration.nix
{
nixpkgs.overlays = [
overlays.unstable-packages
];
}
]
++ (nixpkgs.lib.optionals (builtins.elem device homeDevices) [
home-manager.nixosModules.home-manager
{ home-manager.extraSpecialArgs = specialArgs; }
./modules/home-manager.nix
{
nixpkgs.overlays = [
overlays.unstable-packages
];
}
]
++ (nixpkgs.lib.optionals (builtins.elem device homeDevices) [
home-manager.nixosModules.home-manager
{ home-manager.extraSpecialArgs = specialArgs; }
./modules/home-manager.nix
./modules/i18n.nix
./modules/i18n.nix
niri.nixosModules.niri
{
nixpkgs.overlays = [
niri.overlays.niri
overlays.servicepoint-packages
nix-vscode-extensions.overlays.default
];
}
]);
niri.nixosModules.niri
{
nixpkgs.overlays = [
niri.overlays.niri
overlays.servicepoint-packages
nix-vscode-extensions.overlays.default
];
}
]);
}
);

2
home/vinzenz/default.nix
View file

@ -30,7 +30,7 @@
./fuzzel.nix
./git.nix
./gnome.nix
./niri.nix
#./niri.nix
./ssh.nix
./swaylock.nix
./vscode.nix

2
home/vinzenz/niri.nix
View file

@ -1,7 +1,5 @@
{
pkgs,
lib,
devices,
config,
...
}:

2
hosts/vinzenz-lpt2/imports.nix
View file

@ -4,7 +4,7 @@
../../modules/gaming.nix
../../modules/printing.nix
../../modules/podman.nix
../../modules/niri.nix
#../../modules/niri.nix
../../modules/desktop-environment.nix
../../modules/desktop-hardware.nix