Compare commits
3 Commits
9b35f07779
...
da34356761
Author | SHA1 | Date | |
---|---|---|---|
da34356761 | |||
cea313ed38 | |||
6917a60e2f |
@ -63,6 +63,9 @@
|
||||
};
|
||||
};
|
||||
|
||||
# enable arbitrary programs, why is this not already on
|
||||
# programs.nix-ld.enable = true;
|
||||
|
||||
# Enable touchpad support (enabled default in most desktopManager).
|
||||
# services.xserver.libinput.enable = true;
|
||||
|
||||
|
72
flake.lock
72
flake.lock
@ -66,6 +66,22 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat_2": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1696426674,
|
||||
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "edolstra",
|
||||
"repo": "flake-compat",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils": {
|
||||
"inputs": {
|
||||
"systems": "systems"
|
||||
@ -84,6 +100,24 @@
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_2": {
|
||||
"inputs": {
|
||||
"systems": "systems_2"
|
||||
},
|
||||
"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"
|
||||
}
|
||||
},
|
||||
"flakey-profile": {
|
||||
"locked": {
|
||||
"lastModified": 1712898590,
|
||||
@ -192,6 +226,28 @@
|
||||
"url": "https://git.lix.systems/lix-project/lix/archive/2.90.0-rc1.tar.gz"
|
||||
}
|
||||
},
|
||||
"nix-ld": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_2",
|
||||
"flake-utils": "flake-utils_2",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1721411691,
|
||||
"narHash": "sha256-fN0NjkYcQrdVSvWlSnvdu8XD34q8tl84SEz5BOJYROA=",
|
||||
"owner": "Mic92",
|
||||
"repo": "nix-ld",
|
||||
"rev": "7a990656e51465a18ba70f49c2cf9c8d0947b4c9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "Mic92",
|
||||
"repo": "nix-ld",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1717179513,
|
||||
@ -248,6 +304,7 @@
|
||||
"home-manager-unstable": "home-manager-unstable",
|
||||
"lix": "lix",
|
||||
"lix-module": "lix-module",
|
||||
"nix-ld": "nix-ld",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"nixpkgs-unstable": "nixpkgs-unstable",
|
||||
"nur": "nur"
|
||||
@ -283,6 +340,21 @@
|
||||
"repo": "default",
|
||||
"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"
|
||||
}
|
||||
}
|
||||
},
|
||||
"root": "root",
|
||||
|
11
flake.nix
11
flake.nix
@ -16,6 +16,10 @@
|
||||
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0-rc1.tar.gz";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
nix-ld = {
|
||||
url = "github:Mic92/nix-ld";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
nur.url = github:nix-community/NUR;
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager/release-24.05";
|
||||
@ -39,6 +43,7 @@
|
||||
nixpkgs,
|
||||
nixpkgs-unstable,
|
||||
lix-module,
|
||||
nix-ld,
|
||||
home-manager,
|
||||
nur,
|
||||
... }: {
|
||||
@ -48,6 +53,7 @@
|
||||
system = "x86_64-linux";
|
||||
specialArgs = { inherit inputs; };
|
||||
modules = [
|
||||
nix-ld.nixosModules.nix-ld
|
||||
"${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares.nix" {
|
||||
networking.wireless.enable = false;
|
||||
}
|
||||
@ -72,6 +78,7 @@
|
||||
system = "aarch64-linux";
|
||||
specialArgs = { inherit inputs; };
|
||||
modules = [
|
||||
nix-ld.nixosModules.nix-ld
|
||||
./configuration.nix {
|
||||
services.xserver.videoDrivers = [ "modesetting" ];
|
||||
boot.binfmt.emulatedSystems = ["x86_64-linux"];
|
||||
@ -105,6 +112,7 @@
|
||||
system = "x86_64-linux";
|
||||
specialArgs = { inherit inputs; };
|
||||
modules = [
|
||||
nix-ld.nixosModules.nix-ld
|
||||
./configuration.nix {
|
||||
networking = {
|
||||
hostName = "breakdown";
|
||||
@ -132,6 +140,7 @@
|
||||
system = "x86_64-linux";
|
||||
specialArgs = { inherit inputs; };
|
||||
modules = [
|
||||
nix-ld.nixosModules.nix-ld
|
||||
./configuration.nix {
|
||||
services.xserver.videoDrivers = [ "modesetting" "displaylink" ];
|
||||
networking = {
|
||||
@ -158,6 +167,7 @@
|
||||
system = "x86_64-linux";
|
||||
specialArgs = { inherit inputs; };
|
||||
modules = [
|
||||
nix-ld.nixosModules.nix-ld
|
||||
# inputs.nur.nixosModules.nur
|
||||
lix-module.nixosModules.default
|
||||
./configuration.nix {
|
||||
@ -188,6 +198,7 @@
|
||||
system = "x86_64-linux";
|
||||
specialArgs = { inherit inputs; };
|
||||
modules = [
|
||||
nix-ld.nixosModules.nix-ld
|
||||
./configuration.nix {
|
||||
services.xserver.videoDrivers = [ "modesetting" "displaylink" ];
|
||||
networking = {
|
||||
|
@ -31,7 +31,6 @@
|
||||
in listToAttrs [
|
||||
# (extension "tree-style-tab" "treestyletab@piro.sakura.ne.jp")
|
||||
(extension "ublock-origin" "uBlock0@raymondhill.net")
|
||||
# (extension "umatrix" "uMatrix@raymondhill.net")
|
||||
(extension "libredirect" "7esoorv3@alefvanoon.anonaddy.me")
|
||||
(extension "clearurls" "{74145f27-f039-47ce-a470-a662b129930a}")
|
||||
(extension "mark-my-search" "{3c87dcad-dbbd-4be1-b07b-b6d0739b0aec}")
|
||||
|
@ -22,8 +22,8 @@
|
||||
builders-use-substitutes = true
|
||||
'';
|
||||
# dynamic linker
|
||||
programs.nix-ld.enable = true;
|
||||
programs.nix-ld.libraries = with pkgs; [
|
||||
programs.nix-ld.dev.enable = true;
|
||||
programs.nix-ld.dev.libraries = with pkgs; [
|
||||
cmake
|
||||
fontconfig
|
||||
harfbuzz
|
||||
@ -36,6 +36,7 @@
|
||||
cairo
|
||||
gdk-pixbuf
|
||||
zlib
|
||||
libz
|
||||
xorg.libxcb
|
||||
libxkbcommon
|
||||
libGL
|
||||
|
Loading…
Reference in New Issue
Block a user