update all services most recent 26.05
This commit is contained in:
Generated
+12
-30
@@ -16,36 +16,18 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-utils": {
|
|
||||||
"inputs": {
|
|
||||||
"systems": "systems"
|
|
||||||
},
|
|
||||||
"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"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nix-minecraft": {
|
"nix-minecraft": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-compat": "flake-compat",
|
"flake-compat": "flake-compat",
|
||||||
"flake-utils": "flake-utils",
|
"nixpkgs": "nixpkgs",
|
||||||
"nixpkgs": "nixpkgs"
|
"systems": "systems"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1750471420,
|
"lastModified": 1780375694,
|
||||||
"narHash": "sha256-NdmGCaMJH1OxOpscofZ61aqzHfVf8pMXtl9XFO/1T0k=",
|
"narHash": "sha256-TznzgYVONg28KiSFB2rVdf/eLVIMtEQOxKt13Kzyrp8=",
|
||||||
"owner": "Infinidoge",
|
"owner": "Infinidoge",
|
||||||
"repo": "nix-minecraft",
|
"repo": "nix-minecraft",
|
||||||
"rev": "c2cda7b9a94779abe0632ac5b64207df002fea40",
|
"rev": "e6f8bec35104ca5955efe73742da58d2823684f7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -56,11 +38,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1748929857,
|
"lastModified": 1769461804,
|
||||||
"narHash": "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q=",
|
"narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "c2a03962b8e24e669fb37b7df10e7c79531ff1a4",
|
"rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -72,16 +54,16 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1750400657,
|
"lastModified": 1781216227,
|
||||||
"narHash": "sha256-3vkjFnxCOP6vm5Pm13wC/Zy6/VYgei/I/2DWgW4RFeA=",
|
"narHash": "sha256-9mUW6gNwoN2SWc/l0fW4svPNOulXLl8ijqKyeSOGgJE=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "b2485d56967598da068b5a6946dadda8bfcbcd37",
|
"rev": "a0374025a863d007d98e3297f6aa46cc3141c2f0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"ref": "nixos-25.05",
|
"ref": "nixos-26.05",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,146 +3,165 @@
|
|||||||
description = "Declarative MC config";
|
description = "Declarative MC config";
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
|
nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05";
|
||||||
nix-minecraft.url = "github:Infinidoge/nix-minecraft";
|
nix-minecraft.url = "github:Infinidoge/nix-minecraft";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { self, nixpkgs, nix-minecraft }: {
|
outputs =
|
||||||
|
{
|
||||||
|
self,
|
||||||
|
nixpkgs,
|
||||||
|
nix-minecraft,
|
||||||
|
}:
|
||||||
|
{
|
||||||
|
|
||||||
nixosModules.mc-service = { config, lib, pkgs, ... }:
|
nixosModules.mc-service =
|
||||||
let
|
{
|
||||||
system = "x86_64-linux";
|
config,
|
||||||
pkgs = import nixpkgs {
|
lib,
|
||||||
inherit system;
|
pkgs,
|
||||||
overlays = [ nix-minecraft.overlay ];
|
...
|
||||||
config = { allowUnfree = true; };
|
}:
|
||||||
};
|
let
|
||||||
opts = config.services.mc-service;
|
system = "x86_64-linux";
|
||||||
in {
|
pkgs = import nixpkgs {
|
||||||
|
inherit system;
|
||||||
imports = [ nix-minecraft.nixosModules.minecraft-servers ];
|
overlays = [ nix-minecraft.overlay ];
|
||||||
|
config = {
|
||||||
options.services.mc-service = {
|
allowUnfree = true;
|
||||||
enable = lib.mkEnableOption "Enable Minecraft Server";
|
|
||||||
|
|
||||||
storeDir = lib.mkOption {
|
|
||||||
type = lib.types.path;
|
|
||||||
default = "/persist/srv/minecraft";
|
|
||||||
description = "Minecraft files locations";
|
|
||||||
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
config = lib.mkIf opts.enable {
|
|
||||||
users.groups.mc-service = {};
|
|
||||||
users.users.mc-service = {
|
|
||||||
isSystemUser = true;
|
|
||||||
createHome = true;
|
|
||||||
home = "${opts.storeDir}";
|
|
||||||
group = "mc-service";
|
|
||||||
};
|
|
||||||
|
|
||||||
services.minecraft-servers = {
|
|
||||||
enable = true;
|
|
||||||
eula = true;
|
|
||||||
openFirewall = true;
|
|
||||||
dataDir = "${opts.storeDir}";
|
|
||||||
user = "mc-service";
|
|
||||||
group = "mc-service";
|
|
||||||
|
|
||||||
servers.homeServer = {
|
|
||||||
enable = true;
|
|
||||||
restart = "always";
|
|
||||||
jvmOpts = "-Xmx16G -Xms16G";
|
|
||||||
whitelist = {
|
|
||||||
SquidMcJiggles = "7ae4f5a9-dc2b-4b42-ab30-f8d10d38fa83";
|
|
||||||
Baloneyjohn = "aa33ea9c-05ce-46d4-9ae3-715c80f618da";
|
|
||||||
Beankurd = "4bdd135f-e9a6-4830-9755-6282ec71e338";
|
|
||||||
couchdomination = "6272ebe9-6191-43fa-adbd-9d1a9ca36a8c";
|
|
||||||
Grutkoek = "bb1b7067-18d8-4d63-92fa-49b003d39826";
|
|
||||||
};
|
|
||||||
serverProperties = {
|
|
||||||
server-port = 25565;
|
|
||||||
difficulty = 3;
|
|
||||||
gamemode = 0;
|
|
||||||
force-gamemode = true;
|
|
||||||
max-players = 10;
|
|
||||||
motd = "Home MC Server";
|
|
||||||
white-list = true;
|
|
||||||
spawn-protection = 0;
|
|
||||||
};
|
};
|
||||||
|
};
|
||||||
|
opts = config.services.mc-service;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
|
||||||
package = pkgs.fabricServers.fabric;
|
imports = [ nix-minecraft.nixosModules.minecraft-servers ];
|
||||||
|
|
||||||
|
options.services.mc-service = {
|
||||||
|
enable = lib.mkEnableOption "Enable Minecraft Server";
|
||||||
|
|
||||||
|
storeDir = lib.mkOption {
|
||||||
|
type = lib.types.path;
|
||||||
|
default = "/persist/srv/minecraft";
|
||||||
|
description = "Minecraft files locations";
|
||||||
|
|
||||||
symlinks = {
|
|
||||||
mods = pkgs.linkFarmFromDrvs "mods" (builtins.attrValues {
|
|
||||||
Sleep = pkgs.fetchurl {
|
|
||||||
url = "https://cdn.modrinth.com/data/WTzuSu8P/versions/w4ONshdx/sleep-v4.1.4.jar";
|
|
||||||
sha512 = "f4f759a6b9f503ed606bbeb3422b5e31c02d99a7ee91befa7fc4afe364db147bd1e03042d4b6e67bebed7f81e34d6aa60a3a5d690011ef0e726190028d903346";
|
|
||||||
};
|
|
||||||
Lithium = pkgs.fetchurl {
|
|
||||||
url = "https://cdn.modrinth.com/data/gvQqBUqZ/versions/XWGBHYcB/lithium-fabric-0.17.0%2Bmc1.21.6.jar";
|
|
||||||
sha512 = "a8d6a8b69ae2b10dd0cf8f8149260d5bdbd2583147462bad03380014edd857852972b967d97df69728333d8836b1e9db8997712ea26365ddb8a05b8c845c6534";
|
|
||||||
};
|
|
||||||
FabricAPI = pkgs.fetchurl {
|
|
||||||
url = "https://cdn.modrinth.com/data/P7dR8mSH/versions/b2dnY6PN/fabric-api-0.128.0%2B1.21.6.jar";
|
|
||||||
sha512 = "c668402e1a877c2d572d16e31e6d2783be27a80993fa83bf040ea2007994518786bd3140dcea15334f8ee1630836292b8ae4d41444e47cba0ac43d05f1eb1e78";
|
|
||||||
};
|
|
||||||
});
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
servers.testingServer = {
|
config = lib.mkIf opts.enable {
|
||||||
enable = true;
|
users.groups.mc-service = { };
|
||||||
restart = "always";
|
users.users.mc-service = {
|
||||||
jvmOpts = "-Xmx1G -Xms1G";
|
isSystemUser = true;
|
||||||
whitelist = {
|
createHome = true;
|
||||||
SquidMcJiggles = "7ae4f5a9-dc2b-4b42-ab30-f8d10d38fa83";
|
home = "${opts.storeDir}";
|
||||||
};
|
group = "mc-service";
|
||||||
serverProperties = {
|
|
||||||
server-port = 43000;
|
|
||||||
difficulty = 3;
|
|
||||||
gamemode = 1;
|
|
||||||
force-gamemode = true;
|
|
||||||
max-players = 2;
|
|
||||||
motd = "Mod Test Server";
|
|
||||||
white-list = true;
|
|
||||||
spawn-protection = 0;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
package = pkgs.fabricServers.fabric;
|
services.minecraft-servers = {
|
||||||
|
enable = true;
|
||||||
|
eula = true;
|
||||||
|
openFirewall = true;
|
||||||
|
dataDir = "${opts.storeDir}";
|
||||||
|
user = "mc-service";
|
||||||
|
group = "mc-service";
|
||||||
|
|
||||||
symlinks = {
|
servers.homeServer = {
|
||||||
mods = pkgs.linkFarmFromDrvs "mods" (builtins.attrValues {
|
enable = true;
|
||||||
Sleep = pkgs.fetchurl {
|
restart = "always";
|
||||||
url = "https://cdn.modrinth.com/data/WTzuSu8P/versions/w4ONshdx/sleep-v4.1.4.jar";
|
jvmOpts = "-Xmx16G -Xms16G";
|
||||||
sha512 = "f4f759a6b9f503ed606bbeb3422b5e31c02d99a7ee91befa7fc4afe364db147bd1e03042d4b6e67bebed7f81e34d6aa60a3a5d690011ef0e726190028d903346";
|
whitelist = {
|
||||||
|
SquidMcJiggles = "7ae4f5a9-dc2b-4b42-ab30-f8d10d38fa83";
|
||||||
|
Baloneyjohn = "aa33ea9c-05ce-46d4-9ae3-715c80f618da";
|
||||||
|
Beankurd = "4bdd135f-e9a6-4830-9755-6282ec71e338";
|
||||||
|
couchdomination = "6272ebe9-6191-43fa-adbd-9d1a9ca36a8c";
|
||||||
|
Grutkoek = "bb1b7067-18d8-4d63-92fa-49b003d39826";
|
||||||
};
|
};
|
||||||
Lithium = pkgs.fetchurl {
|
serverProperties = {
|
||||||
url = "https://cdn.modrinth.com/data/gvQqBUqZ/versions/XWGBHYcB/lithium-fabric-0.17.0%2Bmc1.21.6.jar";
|
server-port = 25565;
|
||||||
sha512 = "a8d6a8b69ae2b10dd0cf8f8149260d5bdbd2583147462bad03380014edd857852972b967d97df69728333d8836b1e9db8997712ea26365ddb8a05b8c845c6534";
|
difficulty = 3;
|
||||||
|
gamemode = 0;
|
||||||
|
force-gamemode = true;
|
||||||
|
max-players = 10;
|
||||||
|
motd = "Home MC Server";
|
||||||
|
white-list = true;
|
||||||
|
spawn-protection = 0;
|
||||||
};
|
};
|
||||||
FabricAPI = pkgs.fetchurl {
|
|
||||||
url = "https://cdn.modrinth.com/data/P7dR8mSH/versions/b2dnY6PN/fabric-api-0.128.0%2B1.21.6.jar";
|
package = pkgs.fabricServers.fabric;
|
||||||
sha512 = "c668402e1a877c2d572d16e31e6d2783be27a80993fa83bf040ea2007994518786bd3140dcea15334f8ee1630836292b8ae4d41444e47cba0ac43d05f1eb1e78";
|
|
||||||
|
symlinks = {
|
||||||
|
mods = pkgs.linkFarmFromDrvs "mods" (
|
||||||
|
builtins.attrValues {
|
||||||
|
Sleep = pkgs.fetchurl {
|
||||||
|
url = "https://cdn.modrinth.com/data/WTzuSu8P/versions/w4ONshdx/sleep-v4.1.4.jar";
|
||||||
|
sha512 = "f4f759a6b9f503ed606bbeb3422b5e31c02d99a7ee91befa7fc4afe364db147bd1e03042d4b6e67bebed7f81e34d6aa60a3a5d690011ef0e726190028d903346";
|
||||||
|
};
|
||||||
|
Lithium = pkgs.fetchurl {
|
||||||
|
url = "https://cdn.modrinth.com/data/gvQqBUqZ/versions/XWGBHYcB/lithium-fabric-0.17.0%2Bmc1.21.6.jar";
|
||||||
|
sha512 = "a8d6a8b69ae2b10dd0cf8f8149260d5bdbd2583147462bad03380014edd857852972b967d97df69728333d8836b1e9db8997712ea26365ddb8a05b8c845c6534";
|
||||||
|
};
|
||||||
|
FabricAPI = pkgs.fetchurl {
|
||||||
|
url = "https://cdn.modrinth.com/data/P7dR8mSH/versions/b2dnY6PN/fabric-api-0.128.0%2B1.21.6.jar";
|
||||||
|
sha512 = "c668402e1a877c2d572d16e31e6d2783be27a80993fa83bf040ea2007994518786bd3140dcea15334f8ee1630836292b8ae4d41444e47cba0ac43d05f1eb1e78";
|
||||||
|
};
|
||||||
|
}
|
||||||
|
);
|
||||||
};
|
};
|
||||||
ScaleableLux = pkgs.fetchurl {
|
};
|
||||||
url = "https://cdn.modrinth.com/data/Ps1zyz6x/versions/PQLHDg2Q/ScalableLux-0.1.5%2Bfabric.e4acdcb-all.jar";
|
|
||||||
sha512 = "ec8fabc3bf991fbcbe064c1e97ded3e70f145a87e436056241cbb1e14c57ea9f59ef312f24c205160ccbda43f693e05d652b7f19aa71f730caec3bb5f7f7820a";
|
servers.testingServer = {
|
||||||
|
enable = true;
|
||||||
|
restart = "always";
|
||||||
|
jvmOpts = "-Xmx1G -Xms1G";
|
||||||
|
whitelist = {
|
||||||
|
SquidMcJiggles = "7ae4f5a9-dc2b-4b42-ab30-f8d10d38fa83";
|
||||||
};
|
};
|
||||||
Noisium = pkgs.fetchurl {
|
serverProperties = {
|
||||||
url = "https://cdn.modrinth.com/data/KuNKN7d2/versions/V9mMIy0f/noisium-fabric-2.7.0%2Bmc1.21.6.jar";
|
server-port = 43000;
|
||||||
sha512 = "80cc286f3a51b2d12304ef6a44f84c11d67cedec1a02fbaf59e2e816d9b5f0abd17cc6b5a0ca5880935e9dadfea3b951b790ee1e54300c009bc419c1c7451785";
|
difficulty = 3;
|
||||||
|
gamemode = 1;
|
||||||
|
force-gamemode = true;
|
||||||
|
max-players = 2;
|
||||||
|
motd = "Mod Test Server";
|
||||||
|
white-list = true;
|
||||||
|
spawn-protection = 0;
|
||||||
};
|
};
|
||||||
C2ME = pkgs.fetchurl {
|
|
||||||
url = "https://cdn.modrinth.com/data/VSNURh3q/versions/Erjpfj2l/c2me-fabric-mc1.21.7-0.3.4%2Bbeta.1.0.jar";
|
package = pkgs.fabricServers.fabric;
|
||||||
sha512 = "8942e82c216315198d4752fbb9396e6d59d6447085ce5c00811ba0189765b20acad0153a10532f7ade29f7c090e0299c01802174aa89d4da642bc10f9429998d";
|
|
||||||
|
symlinks = {
|
||||||
|
mods = pkgs.linkFarmFromDrvs "mods" (
|
||||||
|
builtins.attrValues {
|
||||||
|
Sleep = pkgs.fetchurl {
|
||||||
|
url = "https://cdn.modrinth.com/data/WTzuSu8P/versions/w4ONshdx/sleep-v4.1.4.jar";
|
||||||
|
sha512 = "f4f759a6b9f503ed606bbeb3422b5e31c02d99a7ee91befa7fc4afe364db147bd1e03042d4b6e67bebed7f81e34d6aa60a3a5d690011ef0e726190028d903346";
|
||||||
|
};
|
||||||
|
Lithium = pkgs.fetchurl {
|
||||||
|
url = "https://cdn.modrinth.com/data/gvQqBUqZ/versions/XWGBHYcB/lithium-fabric-0.17.0%2Bmc1.21.6.jar";
|
||||||
|
sha512 = "a8d6a8b69ae2b10dd0cf8f8149260d5bdbd2583147462bad03380014edd857852972b967d97df69728333d8836b1e9db8997712ea26365ddb8a05b8c845c6534";
|
||||||
|
};
|
||||||
|
FabricAPI = pkgs.fetchurl {
|
||||||
|
url = "https://cdn.modrinth.com/data/P7dR8mSH/versions/b2dnY6PN/fabric-api-0.128.0%2B1.21.6.jar";
|
||||||
|
sha512 = "c668402e1a877c2d572d16e31e6d2783be27a80993fa83bf040ea2007994518786bd3140dcea15334f8ee1630836292b8ae4d41444e47cba0ac43d05f1eb1e78";
|
||||||
|
};
|
||||||
|
ScaleableLux = pkgs.fetchurl {
|
||||||
|
url = "https://cdn.modrinth.com/data/Ps1zyz6x/versions/PQLHDg2Q/ScalableLux-0.1.5%2Bfabric.e4acdcb-all.jar";
|
||||||
|
sha512 = "ec8fabc3bf991fbcbe064c1e97ded3e70f145a87e436056241cbb1e14c57ea9f59ef312f24c205160ccbda43f693e05d652b7f19aa71f730caec3bb5f7f7820a";
|
||||||
|
};
|
||||||
|
Noisium = pkgs.fetchurl {
|
||||||
|
url = "https://cdn.modrinth.com/data/KuNKN7d2/versions/V9mMIy0f/noisium-fabric-2.7.0%2Bmc1.21.6.jar";
|
||||||
|
sha512 = "80cc286f3a51b2d12304ef6a44f84c11d67cedec1a02fbaf59e2e816d9b5f0abd17cc6b5a0ca5880935e9dadfea3b951b790ee1e54300c009bc419c1c7451785";
|
||||||
|
};
|
||||||
|
C2ME = pkgs.fetchurl {
|
||||||
|
url = "https://cdn.modrinth.com/data/VSNURh3q/versions/Erjpfj2l/c2me-fabric-mc1.21.7-0.3.4%2Bbeta.1.0.jar";
|
||||||
|
sha512 = "8942e82c216315198d4752fbb9396e6d59d6447085ce5c00811ba0189765b20acad0153a10532f7ade29f7c090e0299c01802174aa89d4da642bc10f9429998d";
|
||||||
|
};
|
||||||
|
}
|
||||||
|
);
|
||||||
};
|
};
|
||||||
});
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|||||||
+4
-4
@@ -2,16 +2,16 @@
|
|||||||
"nodes": {
|
"nodes": {
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1749727998,
|
"lastModified": 1781216227,
|
||||||
"narHash": "sha256-mHv/yeUbmL91/TvV95p+mBVahm9mdQMJoqaTVTALaFw=",
|
"narHash": "sha256-9mUW6gNwoN2SWc/l0fW4svPNOulXLl8ijqKyeSOGgJE=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "fd487183437963a59ba763c0cc4f27e3447dd6dd",
|
"rev": "a0374025a863d007d98e3297f6aa46cc3141c2f0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"ref": "nixos-25.05",
|
"ref": "nixos-26.05",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,11 +2,11 @@
|
|||||||
description = "minio service for storing images with api access";
|
description = "minio service for storing images with api access";
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
|
nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs =
|
outputs =
|
||||||
{ self, nixpkgs, ... }:
|
{ ... }:
|
||||||
{
|
{
|
||||||
nixosModules.minio-service =
|
nixosModules.minio-service =
|
||||||
{
|
{
|
||||||
|
|||||||
Generated
+27
@@ -0,0 +1,27 @@
|
|||||||
|
{
|
||||||
|
"nodes": {
|
||||||
|
"nixpkgs": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1781216227,
|
||||||
|
"narHash": "sha256-9mUW6gNwoN2SWc/l0fW4svPNOulXLl8ijqKyeSOGgJE=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "a0374025a863d007d98e3297f6aa46cc3141c2f0",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"ref": "nixos-26.05",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"root": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": "nixpkgs"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"root": "root",
|
||||||
|
"version": 7
|
||||||
|
}
|
||||||
@@ -2,11 +2,11 @@
|
|||||||
description = "Flake that configures a static site hosted in a k3s pod";
|
description = "Flake that configures a static site hosted in a k3s pod";
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
|
nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs =
|
outputs =
|
||||||
{ self, nixpkgs, ... }:
|
{ ... }:
|
||||||
{
|
{
|
||||||
nixosModules.nimh-static =
|
nixosModules.nimh-static =
|
||||||
{
|
{
|
||||||
|
|||||||
+4
-4
@@ -2,16 +2,16 @@
|
|||||||
"nodes": {
|
"nodes": {
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1767313136,
|
"lastModified": 1781216227,
|
||||||
"narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=",
|
"narHash": "sha256-9mUW6gNwoN2SWc/l0fW4svPNOulXLl8ijqKyeSOGgJE=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d",
|
"rev": "a0374025a863d007d98e3297f6aa46cc3141c2f0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"ref": "nixos-25.05",
|
"ref": "nixos-26.05",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,11 +2,11 @@
|
|||||||
description = "Declare a new table and user for postgresql";
|
description = "Declare a new table and user for postgresql";
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
|
nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05";
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs =
|
outputs =
|
||||||
{ self, nixpkgs, ... }:
|
{ ... }:
|
||||||
{
|
{
|
||||||
nixosModules.postgresql-db =
|
nixosModules.postgresql-db =
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -31,29 +31,31 @@
|
|||||||
"cloudflare-api-email" = {
|
"cloudflare-api-email" = {
|
||||||
sopsFile = ./secrets/cloudflare.json;
|
sopsFile = ./secrets/cloudflare.json;
|
||||||
key = "CF_API_EMAIL";
|
key = "CF_API_EMAIL";
|
||||||
|
owner = "acme";
|
||||||
|
group = "acme";
|
||||||
};
|
};
|
||||||
|
|
||||||
"cloudflare-api-key" = {
|
"cloudflare-api-key" = {
|
||||||
sopsFile = ./secrets/cloudflare.json;
|
sopsFile = ./secrets/cloudflare.json;
|
||||||
key = "CF_API_KEY";
|
key = "CF_API_KEY";
|
||||||
|
owner = "acme";
|
||||||
|
group = "acme";
|
||||||
};
|
};
|
||||||
|
|
||||||
"minio-credentials" = {
|
"minio-credentials" = {
|
||||||
sopsFile = ./secrets/minio.yaml;
|
sopsFile = ./secrets/minio.yaml;
|
||||||
key = "minioCredentials";
|
key = "minioCredentials";
|
||||||
format = "yaml";
|
format = "yaml";
|
||||||
};
|
owner = "minio";
|
||||||
|
group = "minio";
|
||||||
"tests-service" = {
|
|
||||||
sopsFile = ./secrets/tests-service.yaml;
|
|
||||||
key = "credentials";
|
|
||||||
format = "yaml";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
"postgresql-credentials" = {
|
"postgresql-credentials" = {
|
||||||
sopsFile = ./secrets/psql.yaml;
|
sopsFile = ./secrets/psql.yaml;
|
||||||
key = "credentials";
|
key = "credentials";
|
||||||
format = "yaml";
|
format = "yaml";
|
||||||
|
owner = "postgres";
|
||||||
|
group = "postgres";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
Generated
+41
-126
@@ -7,11 +7,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1779226674,
|
"lastModified": 1781152676,
|
||||||
"narHash": "sha256-wuOkjI6pRiN4sEn/EPBRnNW5cmcpvd7xtIM8y5LooAs=",
|
"narHash": "sha256-RxWs5ND31KzTG7wvMM+PMfUjyNpmIEr999lqNARaM5o=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "disko",
|
"repo": "disko",
|
||||||
"rev": "65fb947964bd44fc0008faf77d1fcb7a9f40bb32",
|
"rev": "ff8702b4de27f72b4c78573dfb89ec74e36abdf1",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -28,11 +28,11 @@
|
|||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"dir": "pkgs/firefox-addons",
|
"dir": "pkgs/firefox-addons",
|
||||||
"lastModified": 1779163369,
|
"lastModified": 1781928171,
|
||||||
"narHash": "sha256-B00xeNzvUjg6PhJbIpMJvIAQJZGN+d8Q6bdCrIC8ml8=",
|
"narHash": "sha256-2IIxdVe7afJ8HyTeR/MD9Qw5iIJ68o1iRYkiXn7LDag=",
|
||||||
"owner": "rycee",
|
"owner": "rycee",
|
||||||
"repo": "nur-expressions",
|
"repo": "nur-expressions",
|
||||||
"rev": "c4ec5990ec6a18a514edc41adf7a764e4b81025b",
|
"rev": "1777920f3688105a47b95b229dcefc85ae1bb42e",
|
||||||
"type": "gitlab"
|
"type": "gitlab"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -66,11 +66,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1768135262,
|
"lastModified": 1778716662,
|
||||||
"narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=",
|
"narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
|
||||||
"owner": "hercules-ci",
|
"owner": "hercules-ci",
|
||||||
"repo": "flake-parts",
|
"repo": "flake-parts",
|
||||||
"rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac",
|
"rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -97,24 +97,6 @@
|
|||||||
"type": "github"
|
"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"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"home-manager": {
|
"home-manager": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
@@ -122,16 +104,16 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1778905220,
|
"lastModified": 1781981105,
|
||||||
"narHash": "sha256-ox/5IHc8uwy6UTw6N7Shp6uCHIgu/S2PsWeuXsOHSo8=",
|
"narHash": "sha256-/1nNBbA7PrSQpTc9Qazkhl4kIPg+TNl0CjxS3UQJKlw=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "d1686dc7d36cbd1234cb226ad6ef97e882716acb",
|
"rev": "7bfff44b465909f69a442701293bc0badcf476dc",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"ref": "release-25.11",
|
"ref": "release-26.05",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
@@ -176,34 +158,6 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"ixx": {
|
|
||||||
"inputs": {
|
|
||||||
"flake-utils": [
|
|
||||||
"nixvim",
|
|
||||||
"nuschtosSearch",
|
|
||||||
"flake-utils"
|
|
||||||
],
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixvim",
|
|
||||||
"nuschtosSearch",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1754860581,
|
|
||||||
"narHash": "sha256-EM0IE63OHxXCOpDHXaTyHIOk2cNvMCGPqLt/IdtVxgk=",
|
|
||||||
"owner": "NuschtOS",
|
|
||||||
"repo": "ixx",
|
|
||||||
"rev": "babfe85a876162c4acc9ab6fb4483df88fa1f281",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NuschtOS",
|
|
||||||
"ref": "v0.1.1",
|
|
||||||
"repo": "ixx",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"mc-service": {
|
"mc-service": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nix-minecraft": "nix-minecraft",
|
"nix-minecraft": "nix-minecraft",
|
||||||
@@ -301,80 +255,80 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs_3": {
|
"nixpkgs_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1750400657,
|
"lastModified": 1781216227,
|
||||||
"narHash": "sha256-3vkjFnxCOP6vm5Pm13wC/Zy6/VYgei/I/2DWgW4RFeA=",
|
"narHash": "sha256-9mUW6gNwoN2SWc/l0fW4svPNOulXLl8ijqKyeSOGgJE=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "b2485d56967598da068b5a6946dadda8bfcbcd37",
|
"rev": "a0374025a863d007d98e3297f6aa46cc3141c2f0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"ref": "nixos-25.05",
|
"ref": "nixos-26.05",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_4": {
|
"nixpkgs_4": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1749727998,
|
"lastModified": 1781216227,
|
||||||
"narHash": "sha256-mHv/yeUbmL91/TvV95p+mBVahm9mdQMJoqaTVTALaFw=",
|
"narHash": "sha256-9mUW6gNwoN2SWc/l0fW4svPNOulXLl8ijqKyeSOGgJE=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "fd487183437963a59ba763c0cc4f27e3447dd6dd",
|
"rev": "a0374025a863d007d98e3297f6aa46cc3141c2f0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"ref": "nixos-25.05",
|
"ref": "nixos-26.05",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_5": {
|
"nixpkgs_5": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1779467186,
|
"lastModified": 1781216227,
|
||||||
"narHash": "sha256-nOesoDCiXcUftqbRBMz9tt4blI5PvljMWbm3kuCA+0s=",
|
"narHash": "sha256-9mUW6gNwoN2SWc/l0fW4svPNOulXLl8ijqKyeSOGgJE=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "b77b3de8775677f84492abe84635f87b0e153f0f",
|
"rev": "a0374025a863d007d98e3297f6aa46cc3141c2f0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"ref": "nixos-25.11",
|
"ref": "nixos-26.05",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_6": {
|
"nixpkgs_6": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1779102034,
|
"lastModified": 1781216227,
|
||||||
"narHash": "sha256-vZJZjLo513IeI8hjzHFc6TDezUd4uCE2Eq4SNO3DNNg=",
|
"narHash": "sha256-9mUW6gNwoN2SWc/l0fW4svPNOulXLl8ijqKyeSOGgJE=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "687f05a9184cad4eaf905c48b63649e3a86f5433",
|
"rev": "a0374025a863d007d98e3297f6aa46cc3141c2f0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"ref": "nixos-25.11",
|
"ref": "nixos-26.05",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs_7": {
|
"nixpkgs_7": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1767313136,
|
"lastModified": 1781216227,
|
||||||
"narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=",
|
"narHash": "sha256-9mUW6gNwoN2SWc/l0fW4svPNOulXLl8ijqKyeSOGgJE=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d",
|
"rev": "a0374025a863d007d98e3297f6aa46cc3141c2f0",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"ref": "nixos-25.05",
|
"ref": "nixos-26.05",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
@@ -385,47 +339,23 @@
|
|||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
],
|
],
|
||||||
"nuschtosSearch": "nuschtosSearch",
|
"systems": "systems_2"
|
||||||
"systems": "systems_3"
|
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1769049374,
|
"lastModified": 1781971008,
|
||||||
"narHash": "sha256-h0Os2qqNyycDY1FyZgtbn28VF1ySP74/n0f+LDd8j+w=",
|
"narHash": "sha256-T2u2RQZWKvD1J+TgcxjiJr8IymBr/PrUNeAGhMZFZU4=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nixvim",
|
"repo": "nixvim",
|
||||||
"rev": "b8f76bf5751835647538ef8784e4e6ee8deb8f95",
|
"rev": "7afca458f064f166d3a9c98db3b41a984fe46492",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"ref": "nixos-25.11",
|
"ref": "nixos-26.05",
|
||||||
"repo": "nixvim",
|
"repo": "nixvim",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nuschtosSearch": {
|
|
||||||
"inputs": {
|
|
||||||
"flake-utils": "flake-utils_2",
|
|
||||||
"ixx": "ixx",
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixvim",
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1768249818,
|
|
||||||
"narHash": "sha256-ANfn5OqIxq3HONPIXZ6zuI5sLzX1sS+2qcf/Pa0kQEc=",
|
|
||||||
"owner": "NuschtOS",
|
|
||||||
"repo": "search",
|
|
||||||
"rev": "b6f77b88e9009bfde28e2130e218e5123dc66796",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "NuschtOS",
|
|
||||||
"repo": "search",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"postgresql-db": {
|
"postgresql-db": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": "nixpkgs_7"
|
"nixpkgs": "nixpkgs_7"
|
||||||
@@ -479,11 +409,11 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1777944972,
|
"lastModified": 1781943681,
|
||||||
"narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=",
|
"narHash": "sha256-NFHmA7H47adqiyp+0iEOyZOQhmigDqA/NBAlf4imB6U=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "c591bf665727040c6cc5cb409079acb22dcce33c",
|
"rev": "420f8d2e9882911f65cfac15cc706f639ba96cca",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -521,21 +451,6 @@
|
|||||||
"repo": "default",
|
"repo": "default",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"systems_3": {
|
|
||||||
"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",
|
"root": "root",
|
||||||
|
|||||||
+3
-3
@@ -2,14 +2,14 @@
|
|||||||
description = "Server Config Controller";
|
description = "Server Config Controller";
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
|
nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05";
|
||||||
nixvim = {
|
nixvim = {
|
||||||
url = "github:nix-community/nixvim/nixos-25.11";
|
url = "github:nix-community/nixvim/nixos-26.05";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
quasiSecrets.url = "git+ssh://git@github.com/RoyDumblauskas/server-semi-secrets?shallow=1";
|
quasiSecrets.url = "git+ssh://git@github.com/RoyDumblauskas/server-semi-secrets?shallow=1";
|
||||||
home-manager = {
|
home-manager = {
|
||||||
url = "github:nix-community/home-manager/release-25.11";
|
url = "github:nix-community/home-manager/release-26.05";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
disko = {
|
disko = {
|
||||||
|
|||||||
@@ -1,17 +0,0 @@
|
|||||||
[general]
|
|
||||||
import = [
|
|
||||||
"~/.config/alacritty/catppuccin-frappe.toml"
|
|
||||||
]
|
|
||||||
|
|
||||||
[terminal]
|
|
||||||
shell = "fish"
|
|
||||||
|
|
||||||
[font]
|
|
||||||
normal = { family = "UbuntuMono Nerd Font" }
|
|
||||||
italic = { family = "UbuntuMono Nerd Font" }
|
|
||||||
bold = { family = "UbuntuMono Nerd Font" }
|
|
||||||
size = 16
|
|
||||||
|
|
||||||
[window]
|
|
||||||
decorations = "full"
|
|
||||||
opacity = 1
|
|
||||||
@@ -1,65 +0,0 @@
|
|||||||
[colors.primary]
|
|
||||||
background = "#303446"
|
|
||||||
foreground = "#c6d0f5"
|
|
||||||
dim_foreground = "#838ba7"
|
|
||||||
bright_foreground = "#c6d0f5"
|
|
||||||
|
|
||||||
[colors.cursor]
|
|
||||||
text = "#303446"
|
|
||||||
cursor = "#f2d5cf"
|
|
||||||
|
|
||||||
[colors.vi_mode_cursor]
|
|
||||||
text = "#303446"
|
|
||||||
cursor = "#babbf1"
|
|
||||||
|
|
||||||
[colors.search.matches]
|
|
||||||
foreground = "#303446"
|
|
||||||
background = "#a5adce"
|
|
||||||
|
|
||||||
[colors.search.focused_match]
|
|
||||||
foreground = "#303446"
|
|
||||||
background = "#a6d189"
|
|
||||||
|
|
||||||
[colors.footer_bar]
|
|
||||||
foreground = "#303446"
|
|
||||||
background = "#a5adce"
|
|
||||||
|
|
||||||
[colors.hints.start]
|
|
||||||
foreground = "#303446"
|
|
||||||
background = "#e5c890"
|
|
||||||
|
|
||||||
[colors.hints.end]
|
|
||||||
foreground = "#303446"
|
|
||||||
background = "#a5adce"
|
|
||||||
|
|
||||||
[colors.selection]
|
|
||||||
text = "#303446"
|
|
||||||
background = "#f2d5cf"
|
|
||||||
|
|
||||||
[colors.normal]
|
|
||||||
black = "#51576d"
|
|
||||||
red = "#e78284"
|
|
||||||
green = "#a6d189"
|
|
||||||
yellow = "#e5c890"
|
|
||||||
blue = "#8caaee"
|
|
||||||
magenta = "#f4b8e4"
|
|
||||||
cyan = "#81c8be"
|
|
||||||
white = "#b5bfe2"
|
|
||||||
|
|
||||||
[colors.bright]
|
|
||||||
black = "#626880"
|
|
||||||
red = "#e78284"
|
|
||||||
green = "#a6d189"
|
|
||||||
yellow = "#e5c890"
|
|
||||||
blue = "#8caaee"
|
|
||||||
magenta = "#f4b8e4"
|
|
||||||
cyan = "#81c8be"
|
|
||||||
white = "#a5adce"
|
|
||||||
|
|
||||||
[[colors.indexed_colors]]
|
|
||||||
index = 16
|
|
||||||
color = "#ef9f76"
|
|
||||||
|
|
||||||
[[colors.indexed_colors]]
|
|
||||||
index = 17
|
|
||||||
color = "#f2d5cf"
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
if status is-interactive
|
|
||||||
# Commands to run in interactive sessions can go here
|
|
||||||
end
|
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
# This file contains fish universal variable definitions.
|
|
||||||
# VERSION: 3.0
|
|
||||||
SETUVAR __fish_initialized:3800
|
|
||||||
SETUVAR fish_color_autosuggestion:brblack
|
|
||||||
SETUVAR fish_color_cancel:\x2dr
|
|
||||||
SETUVAR fish_color_command:normal
|
|
||||||
SETUVAR fish_color_comment:red
|
|
||||||
SETUVAR fish_color_cwd:green
|
|
||||||
SETUVAR fish_color_cwd_root:red
|
|
||||||
SETUVAR fish_color_end:green
|
|
||||||
SETUVAR fish_color_error:brred
|
|
||||||
SETUVAR fish_color_escape:brcyan
|
|
||||||
SETUVAR fish_color_history_current:\x2d\x2dbold
|
|
||||||
SETUVAR fish_color_host:normal
|
|
||||||
SETUVAR fish_color_host_remote:yellow
|
|
||||||
SETUVAR fish_color_normal:normal
|
|
||||||
SETUVAR fish_color_operator:brcyan
|
|
||||||
SETUVAR fish_color_param:cyan
|
|
||||||
SETUVAR fish_color_quote:yellow
|
|
||||||
SETUVAR fish_color_redirection:cyan\x1e\x2d\x2dbold
|
|
||||||
SETUVAR fish_color_search_match:white\x1e\x2d\x2dbackground\x3dbrblack
|
|
||||||
SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack
|
|
||||||
SETUVAR fish_color_status:red
|
|
||||||
SETUVAR fish_color_user:brgreen
|
|
||||||
SETUVAR fish_color_valid_path:\x2d\x2dunderline
|
|
||||||
SETUVAR fish_key_bindings:fish_default_key_bindings
|
|
||||||
SETUVAR fish_pager_color_completion:normal
|
|
||||||
SETUVAR fish_pager_color_description:yellow\x1e\x2di
|
|
||||||
SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
|
|
||||||
SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
|
|
||||||
SETUVAR fish_pager_color_selected_background:\x2dr
|
|
||||||
SETUVAR fish_prompt_pwd_dir_length:100
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
function fish_greeting
|
|
||||||
# echo (set_color yellow)(date +%T)
|
|
||||||
end
|
|
||||||
@@ -1,83 +0,0 @@
|
|||||||
function fish_prompt --description 'Write out the prompt'
|
|
||||||
set -l last_pipestatus $pipestatus
|
|
||||||
set -lx __fish_last_status $status # Export for __fish_print_pipestatus.
|
|
||||||
set -l normal (set_color normal)
|
|
||||||
set -q fish_color_status
|
|
||||||
or set -g fish_color_status red
|
|
||||||
|
|
||||||
# Color the prompt differently when we're root
|
|
||||||
set -l color_cwd $fish_color_cwd
|
|
||||||
set -l suffix '>'
|
|
||||||
if functions -q fish_is_root_user; and fish_is_root_user
|
|
||||||
if set -q fish_color_cwd_root
|
|
||||||
set color_cwd $fish_color_cwd_root
|
|
||||||
end
|
|
||||||
set suffix '#'
|
|
||||||
end
|
|
||||||
|
|
||||||
# Write pipestatus
|
|
||||||
# If the status was carried over (if no command is issued or if `set` leaves the status untouched), don't bold it.
|
|
||||||
set -l bold_flag --bold
|
|
||||||
set -q __fish_prompt_status_generation; or set -g __fish_prompt_status_generation $status_generation
|
|
||||||
if test $__fish_prompt_status_generation = $status_generation
|
|
||||||
set bold_flag
|
|
||||||
end
|
|
||||||
set __fish_prompt_status_generation $status_generation
|
|
||||||
set -l status_color (set_color $fish_color_status)
|
|
||||||
set -l statusb_color (set_color $bold_flag $fish_color_status)
|
|
||||||
set -l prompt_status (__fish_print_pipestatus "[" "]" "|" "$status_color" "$statusb_color" $last_pipestatus)
|
|
||||||
|
|
||||||
echo -n -s (prompt_login)' ' (set_color $color_cwd) (prompt_pwd) $normal (fish_vcs_prompt) $normal " "$prompt_status $suffix " "
|
|
||||||
end
|
|
||||||
|
|
||||||
function prompt_pwd --description 'short CWD for the prompt'
|
|
||||||
set -l options h/help d/dir-length= D/full-length-dirs=
|
|
||||||
argparse -n prompt_pwd $options -- $argv
|
|
||||||
or return
|
|
||||||
|
|
||||||
if set -q _flag_help
|
|
||||||
__fish_print_help prompt_pwd
|
|
||||||
return 0
|
|
||||||
end
|
|
||||||
|
|
||||||
set -q argv[1]
|
|
||||||
or set argv $PWD
|
|
||||||
|
|
||||||
set -ql _flag_d
|
|
||||||
and set -l fish_prompt_pwd_dir_length $_flag_d
|
|
||||||
|
|
||||||
set -q fish_prompt_pwd_dir_length
|
|
||||||
or set -l fish_prompt_pwd_dir_length 1
|
|
||||||
|
|
||||||
set -l fulldirs 0
|
|
||||||
set -ql _flag_D
|
|
||||||
and set -l fish_prompt_pwd_full_dirs $_flag_D
|
|
||||||
|
|
||||||
set -q fish_prompt_pwd_full_dirs
|
|
||||||
or set -l fish_prompt_pwd_full_dirs 1
|
|
||||||
|
|
||||||
for path in $argv
|
|
||||||
# Replace $HOME with "~"
|
|
||||||
set -l realhome (string escape --style=regex -- ~)
|
|
||||||
set -l tmp (string replace -r '^'"$realhome"'($|/)' '~$1' $path)
|
|
||||||
|
|
||||||
if test "$fish_prompt_pwd_dir_length" -eq 0
|
|
||||||
echo $tmp
|
|
||||||
else
|
|
||||||
# Shorten to at most $fish_prompt_pwd_dir_length characters per directory
|
|
||||||
# with full-length-dirs components left at full length.
|
|
||||||
set -l full
|
|
||||||
if test $fish_prompt_pwd_full_dirs -gt 0
|
|
||||||
set -l all (string split -m (math $fish_prompt_pwd_full_dirs - 1) -r / $tmp)
|
|
||||||
set tmp $all[1]
|
|
||||||
set full $all[2..]
|
|
||||||
else if test $fish_prompt_pwd_full_dirs -eq 0
|
|
||||||
# 0 means not even the last component is kept
|
|
||||||
string replace -ar '(\.?[^/]{'"$fish_prompt_pwd_dir_length"'})[^/]*' '$1' $tmp
|
|
||||||
continue
|
|
||||||
end
|
|
||||||
|
|
||||||
string join / -- (string replace -ar -- '(\.?[^/]{'"$fish_prompt_pwd_dir_length"'})[^/]*/' '$1/' $tmp) $full
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -1,272 +0,0 @@
|
|||||||
# You can split this configuration into multiple files
|
|
||||||
# Create your files separately and then link them to this file like this:
|
|
||||||
# source = ~/.config/hypr/myColors.conf
|
|
||||||
|
|
||||||
|
|
||||||
################
|
|
||||||
### MONITORS ###
|
|
||||||
################
|
|
||||||
|
|
||||||
# See https://wiki.hyprland.org/Configuring/Monitors/
|
|
||||||
# built-in monitor
|
|
||||||
monitor=,preferred,auto,1
|
|
||||||
|
|
||||||
monitorv2 {
|
|
||||||
output = DP-1
|
|
||||||
mode = 3840x2160@60
|
|
||||||
position = auto
|
|
||||||
scale = 1.5
|
|
||||||
transform = 0
|
|
||||||
}
|
|
||||||
|
|
||||||
monitorv2 {
|
|
||||||
output = HDMI-A-1
|
|
||||||
mode = 2560x1440@59.95
|
|
||||||
position = auto
|
|
||||||
scale = 1
|
|
||||||
transform = 0
|
|
||||||
}
|
|
||||||
|
|
||||||
###################
|
|
||||||
### MY PROGRAMS ###
|
|
||||||
###################
|
|
||||||
|
|
||||||
# See https://wiki.hyprland.org/Configuring/Keywords/
|
|
||||||
|
|
||||||
# Set programs that you use
|
|
||||||
$terminal = alacritty
|
|
||||||
$fileManager = dolphin
|
|
||||||
$menu = wofi --show=drun --prompt="Search Programs"
|
|
||||||
|
|
||||||
|
|
||||||
#################
|
|
||||||
### AUTOSTART ###
|
|
||||||
#################
|
|
||||||
|
|
||||||
# Autostart necessary processes (like notifications daemons, status bars, etc.)
|
|
||||||
# Or execute your favorite apps at launch like this:
|
|
||||||
|
|
||||||
exec-once = $terminal
|
|
||||||
exec-once = waybar
|
|
||||||
|
|
||||||
#############################
|
|
||||||
### ENVIRONMENT VARIABLES ###
|
|
||||||
#############################
|
|
||||||
|
|
||||||
# See https://wiki.hyprland.org/Configuring/Environment-variables/
|
|
||||||
|
|
||||||
env = HYPRCURSOR_THEME,rose-pine-hyprcursor
|
|
||||||
env = HYPRCURSOR_SIZE,18
|
|
||||||
|
|
||||||
####################
|
|
||||||
### SCRIPT PATHS ###
|
|
||||||
####################
|
|
||||||
|
|
||||||
$switchFocus = ~/.config/hypr/scripts/switch-to-unfocused-monitor.sh
|
|
||||||
$moveAndSwitch = ~/.config/hypr/scripts/move-workspace-to-unfocused-monitor.sh
|
|
||||||
|
|
||||||
#####################
|
|
||||||
### LOOK AND FEEL ###
|
|
||||||
#####################
|
|
||||||
|
|
||||||
# Refer to https://wiki.hyprland.org/Configuring/Variables/
|
|
||||||
|
|
||||||
# https://wiki.hyprland.org/Configuring/Variables/#general
|
|
||||||
general {
|
|
||||||
gaps_in = 0
|
|
||||||
gaps_out = 0
|
|
||||||
|
|
||||||
border_size = 1
|
|
||||||
|
|
||||||
# https://wiki.hyprland.org/Configuring/Variables/#variable-types for info about colors
|
|
||||||
col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg
|
|
||||||
col.inactive_border = rgba(595959aa)
|
|
||||||
|
|
||||||
# Set to true enable resizing windows by clicking and dragging on borders and gaps
|
|
||||||
resize_on_border = false
|
|
||||||
|
|
||||||
# Please see https://wiki.hyprland.org/Configuring/Tearing/ before you turn this on
|
|
||||||
allow_tearing = false
|
|
||||||
|
|
||||||
layout = dwindle
|
|
||||||
}
|
|
||||||
|
|
||||||
# https://wiki.hyprland.org/Configuring/Variables/#decoration
|
|
||||||
decoration {
|
|
||||||
rounding = 0
|
|
||||||
|
|
||||||
# Change transparency of focused and unfocused windows
|
|
||||||
active_opacity = 1.0
|
|
||||||
inactive_opacity = 1.0
|
|
||||||
|
|
||||||
shadow {
|
|
||||||
enabled = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
# https://wiki.hyprland.org/Configuring/Variables/#blur
|
|
||||||
blur {
|
|
||||||
enabled = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# https://wiki.hyprland.org/Configuring/Variables/#animations
|
|
||||||
animations {
|
|
||||||
enabled = false;
|
|
||||||
workspace_wraparound = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
# Ref https://wiki.hyprland.org/Configuring/Workspace-Rules/
|
|
||||||
# "Smart gaps" / "No gaps when only"
|
|
||||||
# uncomment all if you wish to use that.
|
|
||||||
# workspace = w[tv1], gapsout:0, gapsin:0
|
|
||||||
# workspace = f[1], gapsout:0, gapsin:0
|
|
||||||
# windowrulev2 = bordersize 0, floating:0, onworkspace:w[tv1]
|
|
||||||
# windowrulev2 = rounding 0, floating:0, onworkspace:w[tv1]
|
|
||||||
# windowrulev2 = bordersize 0, floating:0, onworkspace:f[1]
|
|
||||||
# windowrulev2 = rounding 0, floating:0, onworkspace:f[1]
|
|
||||||
|
|
||||||
# See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
|
|
||||||
dwindle {
|
|
||||||
pseudotile = true # Master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
|
|
||||||
preserve_split = true # You probably want this
|
|
||||||
}
|
|
||||||
|
|
||||||
# See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
|
|
||||||
master {
|
|
||||||
new_status = master
|
|
||||||
}
|
|
||||||
|
|
||||||
# https://wiki.hyprland.org/Configuring/Variables/#misc
|
|
||||||
misc {
|
|
||||||
force_default_wallpaper = 0 # Set to 0 or 1 to disable the anime mascot wallpapers
|
|
||||||
disable_hyprland_logo = true # If true disables the random hyprland logo / anime girl background. :(
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
#############
|
|
||||||
### INPUT ###
|
|
||||||
#############
|
|
||||||
|
|
||||||
# https://wiki.hyprland.org/Configuring/Variables/#input
|
|
||||||
input {
|
|
||||||
kb_layout = us
|
|
||||||
kb_variant =
|
|
||||||
kb_model =
|
|
||||||
kb_options =
|
|
||||||
kb_rules =
|
|
||||||
|
|
||||||
follow_mouse = 1
|
|
||||||
|
|
||||||
sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
|
|
||||||
|
|
||||||
touchpad {
|
|
||||||
natural_scroll = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
###################
|
|
||||||
### KEYBINDINGS ###
|
|
||||||
###################
|
|
||||||
|
|
||||||
# See https://wiki.hyprland.org/Configuring/Keywords/
|
|
||||||
$mainMod = SUPER # Sets "Windows" key as main modifier
|
|
||||||
|
|
||||||
# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
|
|
||||||
bind = $mainMod, Return, exec, $terminal
|
|
||||||
bind = $mainMod, Q, killactive,
|
|
||||||
bind = $mainMod, M, exit,
|
|
||||||
bind = $mainMod, E, exec, $fileManager
|
|
||||||
bind = $mainMod, V, togglefloating,
|
|
||||||
bind = $mainMod, Space, exec, $menu
|
|
||||||
bind = $mainMod, P, togglesplit, # dwindle
|
|
||||||
bind = $mainMod SHIFT, Return, exec, firefox
|
|
||||||
|
|
||||||
# Move focus with mainMod + hjkl
|
|
||||||
bind = $mainMod, h, movefocus, l
|
|
||||||
bind = $mainMod, l, movefocus, r
|
|
||||||
bind = $mainMod, k, movefocus, u
|
|
||||||
bind = $mainMod, j, movefocus, d
|
|
||||||
|
|
||||||
# Switch workspaces with mainMod + [0-9]
|
|
||||||
bind = $mainMod, 1, workspace, 1
|
|
||||||
bind = $mainMod, 2, workspace, 2
|
|
||||||
bind = $mainMod, 3, workspace, 3
|
|
||||||
bind = $mainMod, 4, workspace, 4
|
|
||||||
bind = $mainMod, 5, workspace, 5
|
|
||||||
bind = $mainMod, 6, workspace, 6
|
|
||||||
bind = $mainMod, 7, workspace, 7
|
|
||||||
bind = $mainMod, 8, workspace, 8
|
|
||||||
bind = $mainMod, 9, workspace, 9
|
|
||||||
bind = $mainMod, 0, workspace, 10
|
|
||||||
|
|
||||||
# Move active window to a workspace with mainMod + SHIFT + [0-9]
|
|
||||||
bind = $mainMod SHIFT, 1, movetoworkspace, 1
|
|
||||||
bind = $mainMod SHIFT, 2, movetoworkspace, 2
|
|
||||||
bind = $mainMod SHIFT, 3, movetoworkspace, 3
|
|
||||||
bind = $mainMod SHIFT, 4, movetoworkspace, 4
|
|
||||||
bind = $mainMod SHIFT, 5, movetoworkspace, 5
|
|
||||||
bind = $mainMod SHIFT, 6, movetoworkspace, 6
|
|
||||||
bind = $mainMod SHIFT, 7, movetoworkspace, 7
|
|
||||||
bind = $mainMod SHIFT, 8, movetoworkspace, 8
|
|
||||||
bind = $mainMod SHIFT, 9, movetoworkspace, 9
|
|
||||||
bind = $mainMod SHIFT, 0, movetoworkspace, 10
|
|
||||||
|
|
||||||
# Move workspace to unfocused monitor (Does not currently support more than two monitors)
|
|
||||||
bind = $mainMod SHIFT, TAB, exec, sh -c $moveAndSwitch
|
|
||||||
|
|
||||||
# Switch to unfocused monitor (Does not currently support more than two monitors)
|
|
||||||
bind = $mainMod, TAB, exec, sh -c $switchFocus
|
|
||||||
|
|
||||||
# Rotate screen with arrows
|
|
||||||
# TODO: only works on builtin display (see scripts)
|
|
||||||
bind = $mainMod SHIFT, up, exec, hyprctl keyword monitor "eDP-1,preferred,auto,1,transform,0"
|
|
||||||
bind = $mainMod SHIFT, down, exec, hyprctl keyword monitor "eDP-1,preferred,auto,1,transform,2"
|
|
||||||
bind = $mainMod SHIFT, left, exec, hyprctl keyword monitor "eDP-1,preferred,auto,1,transform,1"
|
|
||||||
bind = $mainMod SHIFT, right, exec, hyprctl keyword monitor "eDP-1,preferred,auto,1,transform,3"
|
|
||||||
|
|
||||||
# Screenshot to clipboard
|
|
||||||
bind = $mainMod SHIFT, S, exec, grim -g "$(slurp -d)" - | wl-copy
|
|
||||||
|
|
||||||
# Make display fullscreen (hide the waybar)
|
|
||||||
bind = $mainMod SHIFT, f, fullscreen
|
|
||||||
|
|
||||||
# Scroll through existing workspaces with mainMod + scroll
|
|
||||||
bind = $mainMod, mouse_down, workspace, e+1
|
|
||||||
bind = $mainMod, mouse_up, workspace, e-1
|
|
||||||
|
|
||||||
# Move/resize windows with mainMod + LMB/RMB and dragging
|
|
||||||
bindm = $mainMod, mouse:272, movewindow
|
|
||||||
bindm = $mainMod, mouse:273, resizewindow
|
|
||||||
|
|
||||||
# Laptop multimedia keys for volume and LCD brightness
|
|
||||||
bindel = ,XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+
|
|
||||||
bindel = ,XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-
|
|
||||||
bindel = ,XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
|
|
||||||
bindel = ,XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle
|
|
||||||
bindel = ,XF86MonBrightnessUp, exec, brightnessctl s 10%+
|
|
||||||
bindel = ,XF86MonBrightnessDown, exec, brightnessctl s 10%-
|
|
||||||
|
|
||||||
# Requires playerctl
|
|
||||||
bindl = , XF86AudioNext, exec, playerctl next
|
|
||||||
bindl = , XF86AudioPause, exec, playerctl play-pause
|
|
||||||
bindl = , XF86AudioPlay, exec, playerctl play-pause
|
|
||||||
bindl = , XF86AudioPrev, exec, playerctl previous
|
|
||||||
|
|
||||||
##############################
|
|
||||||
### WINDOWS AND WORKSPACES ###
|
|
||||||
##############################
|
|
||||||
|
|
||||||
# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
|
|
||||||
# See https://wiki.hyprland.org/Configuring/Workspace-Rules/ for workspace rules
|
|
||||||
|
|
||||||
# Example windowrule v1
|
|
||||||
# windowrule = float, ^(kitty)$
|
|
||||||
|
|
||||||
# Example windowrule v2
|
|
||||||
# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
|
|
||||||
|
|
||||||
# Ignore maximize requests from apps. You'll probably like this.
|
|
||||||
# windowrulev2 = suppressevent maximize, class:.*
|
|
||||||
|
|
||||||
# Fix some dragging issues with XWayland
|
|
||||||
windowrulev2 = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
monitor=$(hyprctl monitors -j | jq -r 'first(.[] | select(.focused == false) | .name)')
|
|
||||||
hyprctl dispatch movecurrentworkspacetomonitor $monitor
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
monitor=$(hyprctl monitors -j | jq -r 'first(.[] | select(.focused == false) | .name)')
|
|
||||||
|
|
||||||
hyprctl dispatch focusmonitor $monitor
|
|
||||||
@@ -1,49 +0,0 @@
|
|||||||
{
|
|
||||||
"layer": "top",
|
|
||||||
"position": "top",
|
|
||||||
"height": 26,
|
|
||||||
"spacing": 3,
|
|
||||||
|
|
||||||
"modules-left": ["hyprland/workspaces"],
|
|
||||||
"modules-center": ["clock"],
|
|
||||||
"modules-right": ["wireplumber", "group/bat", "group/net"],
|
|
||||||
|
|
||||||
"group/bat": {
|
|
||||||
"orientation": "horizontal",
|
|
||||||
"modules": ["battery"]
|
|
||||||
},
|
|
||||||
"group/net": {
|
|
||||||
"orientation": "horizontal",
|
|
||||||
"modules": ["network"]
|
|
||||||
},
|
|
||||||
"hyprland/workspaces": {
|
|
||||||
"format": "{name}",
|
|
||||||
"sort-by-number": true,
|
|
||||||
"persistent-workspaces": {}
|
|
||||||
},
|
|
||||||
"clock": {
|
|
||||||
"format": "{:%d.%m.%Y | %H:%M:%S}",
|
|
||||||
"interval": 1
|
|
||||||
},
|
|
||||||
"wireplumber": {
|
|
||||||
"format": "\udb81\udd7e {volume}%",
|
|
||||||
"max-volume": 100,
|
|
||||||
"scroll-step": 5
|
|
||||||
},
|
|
||||||
"battery": {
|
|
||||||
"bat": "BAT0",
|
|
||||||
"interval": 60,
|
|
||||||
"format": "{icon} {capacity}%",
|
|
||||||
"format-icons": ["\uf244", "\uf243", "\uf242", "\uf241", "\uf240"],
|
|
||||||
},
|
|
||||||
"network": {
|
|
||||||
"format": "",
|
|
||||||
"format-ethernet": "\udb83\udc9d ",
|
|
||||||
"format-wifi": "{icon} ",
|
|
||||||
"format-disconnected": "\udb83\udc9c ",
|
|
||||||
"format-icons": ["\udb82\udd2f", "\udb82\udd1f", "\udb82\udd22", "\udb82\udd25", "\udb82\udd28"],
|
|
||||||
"tooltip-format-wifi": "{essid} ({signalStrength}%)",
|
|
||||||
"tooltip-format-ethernet": "{ifname}",
|
|
||||||
"tooltip-format-disconnected": "Disconnected",
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,40 +0,0 @@
|
|||||||
@define-color foreground #eff0f1;
|
|
||||||
@define-color foreground-inactive #7f8c8d;
|
|
||||||
@define-color background #232629;
|
|
||||||
@define-color background-alt #31363b;
|
|
||||||
|
|
||||||
* {
|
|
||||||
font-family: UbuntuMono Nerd Font;
|
|
||||||
font-size: 16px;
|
|
||||||
padding: 0;
|
|
||||||
margin: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
#waybar {
|
|
||||||
color: @foreground;
|
|
||||||
background-color: @background;
|
|
||||||
}
|
|
||||||
|
|
||||||
#workspaces button {
|
|
||||||
color: @foreground-inactive;
|
|
||||||
padding-left: 2px;
|
|
||||||
padding-right: 2px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#workspaces button.active {
|
|
||||||
color: @foreground;
|
|
||||||
background-color: @background-alt;
|
|
||||||
border-radius: 2px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#wireplumber,
|
|
||||||
#bat,
|
|
||||||
#net {
|
|
||||||
background-color: @background-alt;
|
|
||||||
border-radius: 3px;
|
|
||||||
padding-left: 0.5em;
|
|
||||||
padding-right: 0.5em;
|
|
||||||
}
|
|
||||||
|
|
||||||
#battery,
|
|
||||||
#network {}
|
|
||||||
@@ -1,43 +0,0 @@
|
|||||||
credentials: ENC[AES256_GCM,data:fsvEDVdMEDFpUSMcJrFMGyngIKLZjEmT0CbIZHXj17l8eWjonDgZTX+0URKW50li8w+7lhUtCv/HdW8y6aqKtfD15PTqLqlW1RLFVWzptqj+BJU3bKc=,iv:U8UGeDXse5+111KP56dIERLFK1KbDD+9PflRCTmZwSA=,tag:gxNg7IPLhMedsrrbeDzwIw==,type:str]
|
|
||||||
sops:
|
|
||||||
age:
|
|
||||||
- recipient: age1zad0qu648dhjav4pzjhkc6vswnqtacuv9230xcgle8wmv56r8ykqn0ud7y
|
|
||||||
enc: |
|
|
||||||
-----BEGIN AGE ENCRYPTED FILE-----
|
|
||||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAvZFRPRWtNSVBIU1pYU0xY
|
|
||||||
eVlnZzQ0Z3pHYnArL0REUmZzSlMrcHFqcEc0Ci9ZbUxLcWpqNndqRkQzWldrVDdH
|
|
||||||
TEZwOHlUMGhwVXFkY09iTDQ5cUdFcW8KLS0tIFd2YnJPS25RUHg0S3ZMSFdpaEdI
|
|
||||||
a3g2UXBuOXFFbVcrSmhQTEUvTWJCVFEKP0PyLwpcRfzZy/bSSID05cTJOXajzEmV
|
|
||||||
velwClP9LKsJqAvr6ycOoT4ykBYGra/F7741taYGzhVxR8TprtuLpA==
|
|
||||||
-----END AGE ENCRYPTED FILE-----
|
|
||||||
- recipient: age1rwugh86469664fwhgrj9xuhjxs9vpflx3r0ftuvd0glphf2gecfs8thxsj
|
|
||||||
enc: |
|
|
||||||
-----BEGIN AGE ENCRYPTED FILE-----
|
|
||||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBvS3U4dXFnSThpYVAxUW5l
|
|
||||||
em5oSDFGOGtTa0d3UW1heTdKVEd5azJIZGg4CnBFaS9PUDN3Y2kwRTVDZURXYWQ2
|
|
||||||
NXVvS3ljd0RkaXU3UHdLOThMcXFzejQKLS0tIDNZQjFHQlJIOFlqNitST2RIbXBZ
|
|
||||||
UTFyRkdxWkFVSWhpUHRuK1MyT2E1NG8KzuFAicNVITcmWExg7GsXQMcCUzWDgzfo
|
|
||||||
w6B4tnVxAv/yt+38KLAMj1druZ6+Oq4l+mMyPF4yo6z9Locg1/1IJQ==
|
|
||||||
-----END AGE ENCRYPTED FILE-----
|
|
||||||
- recipient: age16ht8xkm70pmhl28m6g5fr3gl7xtsec37y57wauee6jqu06678ctqfw87ml
|
|
||||||
enc: |
|
|
||||||
-----BEGIN AGE ENCRYPTED FILE-----
|
|
||||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBiRHBHeFQ3ZFBKODhmRG9O
|
|
||||||
WjNkekZBMm1TNHg3amdJT21YVEZCQXA1VEhJClVkNEVpcFpYV0hmMFRnT2I4MFFR
|
|
||||||
V1VyUTN5N1RxQXBucWZ3TFp2eVhmRTgKLS0tIFVjWm1PdXM3enpxUFVZK0tzNGZV
|
|
||||||
aVlPT0FSTGFDT3psTjQxQ1Q0UzBVdDAKykqATQQvEbG75ohNPt/oj3bW8LC8wcNv
|
|
||||||
BYNDznd0oN2LkTo+KoEwW7t65KlwgVXawq9aAofH89jdRoGoJblY3g==
|
|
||||||
-----END AGE ENCRYPTED FILE-----
|
|
||||||
- recipient: age1hzaf8j6djfc4yc98m3kqjzzdj4tcskf9kdzvjmje2xuqcfmrz5lqdtn5w7
|
|
||||||
enc: |
|
|
||||||
-----BEGIN AGE ENCRYPTED FILE-----
|
|
||||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB5UXBmdnBHUkU2RVJrd2VS
|
|
||||||
SEQvLzAwVFVEbnUzSFNwVmE1N3JyWDlWZG1zCm81eUppb3BrWVl4ZEFaZGM2a3VN
|
|
||||||
NmxOdE9oeG5kWXd3dmlrbWIvTXZZOU0KLS0tIGFpRFpqZUxVSG5DeVFDQUpDUFJZ
|
|
||||||
R0ozRDZBbWVOTnlEZ0dRNlFxV2hPcDQK+iJpfaG9Wky2CksPTHYu9JYuEqZCqjxk
|
|
||||||
DH+HRODROftEsSwkqBqPtcSGBSPddm1JI2sVMx1xJC81ashhU1Zf6w==
|
|
||||||
-----END AGE ENCRYPTED FILE-----
|
|
||||||
lastmodified: "2025-08-24T07:10:02Z"
|
|
||||||
mac: ENC[AES256_GCM,data:rOWVeryENj8Vqzmv3dX3bADbfo1SuUrcowe5ODx3mPYKkYcjCaBjy8vBa3pGNFhS7jFUMaN6k5XN6aEX7+MfWxXQo0oFbIwXqUkiyIELI262dY2qq2xwzr1XPEcxGLKV0mpiSJQZg6Covoe/KFjDRh/aTHnVe8tT7TNyXNZCGvI=,iv:pbsb0aoBalFUxzBksTtg3fPKPoC9Z76rMp0wlZSb/uo=,tag:8rEyL+hNQmFfOs+gnk9Tgw==,type:str]
|
|
||||||
unencrypted_suffix: _unencrypted
|
|
||||||
version: 3.10.2
|
|
||||||
Reference in New Issue
Block a user