Compare commits
3 Commits
fb74703c0d
...
458ff46192
| Author | SHA1 | Date | |
|---|---|---|---|
| 458ff46192 | |||
| 44b51bf454 | |||
| 9d20805a2b |
17
flake.lock
generated
17
flake.lock
generated
@@ -386,6 +386,22 @@
|
|||||||
"url": "https://git.voidarc.co.uk/voidarc/hypr"
|
"url": "https://git.voidarc.co.uk/voidarc/hypr"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"hyprland-config": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1783777857,
|
||||||
|
"narHash": "sha256-5tIpGp3E+hsDvWQWtAEvvQfUv+wdi6OsS1qziLPMJhk=",
|
||||||
|
"ref": "refs/heads/main",
|
||||||
|
"rev": "e561e6d3be18fc3d5dc35380dc6a87ebc518b471",
|
||||||
|
"revCount": 47,
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://git.voidarc.co.uk/voidarc/hypr"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"type": "git",
|
||||||
|
"url": "https://git.voidarc.co.uk/voidarc/hypr"
|
||||||
|
}
|
||||||
|
},
|
||||||
"hyprland-guiutils": {
|
"hyprland-guiutils": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"aquamarine": [
|
"aquamarine": [
|
||||||
@@ -1026,6 +1042,7 @@
|
|||||||
"flake-parts": "flake-parts",
|
"flake-parts": "flake-parts",
|
||||||
"gotify-desktop": "gotify-desktop",
|
"gotify-desktop": "gotify-desktop",
|
||||||
"hyprland": "hyprland",
|
"hyprland": "hyprland",
|
||||||
|
"hyprland-config": "hyprland-config",
|
||||||
"import-tree": "import-tree",
|
"import-tree": "import-tree",
|
||||||
"nixpkgs": "nixpkgs_5",
|
"nixpkgs": "nixpkgs_5",
|
||||||
"nvim": "nvim",
|
"nvim": "nvim",
|
||||||
|
|||||||
@@ -11,6 +11,10 @@
|
|||||||
url = "git+https://git.voidarc.co.uk/voidarc/hypr";
|
url = "git+https://git.voidarc.co.uk/voidarc/hypr";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
hyprland-config = {
|
||||||
|
url = "git+https://git.voidarc.co.uk/voidarc/hypr";
|
||||||
|
flake = false;
|
||||||
|
};
|
||||||
otter-launcher = {
|
otter-launcher = {
|
||||||
url = "github:kuokuo123/otter-launcher";
|
url = "github:kuokuo123/otter-launcher";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
|||||||
@@ -7,6 +7,7 @@
|
|||||||
flake.nixosModules.hyprland = moduleWithSystem ({
|
flake.nixosModules.hyprland = moduleWithSystem ({
|
||||||
self',
|
self',
|
||||||
pkgs,
|
pkgs,
|
||||||
|
inputs',
|
||||||
...
|
...
|
||||||
}: {config, ...}: let
|
}: {config, ...}: let
|
||||||
modules = with self.nixosModules; [
|
modules = with self.nixosModules; [
|
||||||
@@ -39,6 +40,10 @@
|
|||||||
'')
|
'')
|
||||||
runtimePkgs)}
|
runtimePkgs)}
|
||||||
'';
|
'';
|
||||||
|
system.activationScripts.hyprConfig = lib.stringAfter ["specialfs"] ''
|
||||||
|
mkdir -p /run/hypr/config
|
||||||
|
ln -sfn ${inputs.hyprland-config}/* /run/hypr/config
|
||||||
|
'';
|
||||||
});
|
});
|
||||||
perSystem = {
|
perSystem = {
|
||||||
self',
|
self',
|
||||||
@@ -48,6 +53,7 @@
|
|||||||
}: {
|
}: {
|
||||||
packages = {
|
packages = {
|
||||||
hyprland = inputs'.hyprland.packages.default.override {
|
hyprland = inputs'.hyprland.packages.default.override {
|
||||||
|
flags."--config" = "/run/hypr/config/hyprland.lua";
|
||||||
runtimePackages =
|
runtimePackages =
|
||||||
inputs.hyprland.lib.defaultRuntimePkgs.${system}
|
inputs.hyprland.lib.defaultRuntimePkgs.${system}
|
||||||
// {
|
// {
|
||||||
|
|||||||
@@ -14,6 +14,7 @@
|
|||||||
gaming
|
gaming
|
||||||
davinci
|
davinci
|
||||||
sddm-autologin
|
sddm-autologin
|
||||||
|
nix-ld
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
15
modules/system/nix-ld/default.nix
Normal file
15
modules/system/nix-ld/default.nix
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
{moduleWithSystem, ...}: {
|
||||||
|
flake.nixosModules.nix-ld = moduleWithSystem ({pkgs, ...}: {
|
||||||
|
programs = {
|
||||||
|
nix-ld = {
|
||||||
|
enable = true;
|
||||||
|
libraries = with pkgs; [
|
||||||
|
util-linux
|
||||||
|
stdenv.cc.cc
|
||||||
|
zlib
|
||||||
|
libusb1
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
});
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user