AtaraxiaDev/nixos-config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

upgrade system

Browse Source
This commit is contained in:
Dmitriy Kholkin 2023-08-30 18:38:17 +03:00
parent 455787ff9d
commit 403568414f
11 changed files with 157 additions and 268 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

188
flake.lock generated
View File

@ -6,11 +6,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1690857210,
"narHash": "sha256-bErcYz5Inngw7qaKRdywuX5uY62OFl/7izdjtFILhyU=",
"lastModified": 1692553283,
"narHash": "sha256-iKTir40mS+NUzcX9buy+L7xX0XJ2wPxy3VeF0DLnn8M=",
"owner": "ezKEa",
"repo": "aagl-gtk-on-nix",
"rev": "4a27e6b2311df108458dca510a84e1a32fda0791",
"rev": "eed6e941adbb56c7cb67f33452fe4122d0c67426",
"type": "github"
},
"original": {
@ -22,11 +22,11 @@
"arkenfox-userjs": {
"flake": false,
"locked": {
"lastModified": 1690346220,
"narHash": "sha256-knJa1zI27NsKGwpps3MMrG9K7HDGCDnoRfm16pNR/yM=",
"lastModified": 1691983650,
"narHash": "sha256-oA1bIpPc27Kk89n3JGpni7RkcIDRVAsTjUfjRHbKS24=",
"owner": "arkenfox",
"repo": "user.js",
"rev": "4d78abf2bfafbbcb03f8f6d6aaaf7e69b7cfee4e",
"rev": "915f39959c7e077f00477e6ce34a0f9f9e3e7c6b",
"type": "github"
},
"original": {
@ -44,11 +44,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1689457600,
"narHash": "sha256-1XLn2ZZMaqQx+Ys3eel5hQRkgUn3DeHcVb2JT8WYU0A=",
"lastModified": 1692225040,
"narHash": "sha256-jbQNvkgWGioiC6S39dZVyn6us8p/DlEvm5hQKEYkzDU=",
"owner": "zhaofengli",
"repo": "attic",
"rev": "4902d57f5dae8ec660ee9ee14c45c2192f9fe8b1",
"rev": "b43d12082e34bceb26038bdad0438fd68804cfcd",
"type": "github"
},
"original": {
@ -186,11 +186,11 @@
"pre-commit-hooks": "pre-commit-hooks"
},
"locked": {
"lastModified": 1690831896,
"narHash": "sha256-k4Cb2/Yx2kL8TFuVejwEk4R0J+5sxbydAj2IZBKZg7o=",
"lastModified": 1692462990,
"narHash": "sha256-0hzA1DzbBfy6Yw4mb0FovRcP1+64AIRKGMSvaQiMctc=",
"owner": "cachix",
"repo": "devenv",
"rev": "e91205acb792f6a49ea53ab04c04fbc2a85039cd",
"rev": "49ebb9b0a85949f364bacf0088c4142ed451f59e",
"type": "github"
},
"original": {
@ -206,11 +206,11 @@
]
},
"locked": {
"lastModified": 1690739034,
"narHash": "sha256-roW02IaiQ3gnEEDMCDWL5YyN+C4nBf/te6vfL7rG0jk=",
"lastModified": 1692199161,
"narHash": "sha256-GqKApvQ1JCf5DzH/Q+P4nwuHb6MaQGaWTu41lYzveF4=",
"owner": "nix-community",
"repo": "disko",
"rev": "4015740375676402a2ee6adebc3c30ea625b9a94",
"rev": "4eed2457b053c4bbad7d90d2b3a1d539c2c9009c",
"type": "github"
},
"original": {
@ -466,7 +466,7 @@
},
"flake-utils_10": {
"inputs": {
"systems": "systems_5"
"systems": "systems_6"
},
"locked": {
"lastModified": 1681202837,
@ -547,7 +547,7 @@
},
"flake-utils_6": {
"inputs": {
"systems": "systems_2"
"systems": "systems_3"
},
"locked": {
"lastModified": 1689068808,
@ -565,7 +565,7 @@
},
"flake-utils_7": {
"inputs": {
"systems": "systems_3"
"systems": "systems_4"
},
"locked": {
"lastModified": 1689068808,
@ -583,7 +583,7 @@
},
"flake-utils_8": {
"inputs": {
"systems": "systems_4"
"systems": "systems_5"
},
"locked": {
"lastModified": 1681202837,
@ -665,11 +665,11 @@
]
},
"locked": {
"lastModified": 1690846837,
"narHash": "sha256-ZZ8YPOEdZG0zz61U4sfUAx28oEdqLdtG1iWTTH/98uc=",
"lastModified": 1692503956,
"narHash": "sha256-MOA6FKc1YgfGP3ESnjSYfsyJ1BXlwV5pGlY/u5XdJfY=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "4fd794d3df88735dcf9662155d77b08a2e2dde29",
"rev": "958c06303f43cf0625694326b7f7e5475b1a2d5c",
"type": "github"
},
"original": {
@ -682,15 +682,16 @@
"inputs": {
"hyprland-protocols": "hyprland-protocols",
"nixpkgs": "nixpkgs_6",
"systems": "systems_2",
"wlroots": "wlroots",
"xdph": "xdph"
},
"locked": {
"lastModified": 1690728397,
"narHash": "sha256-jq6iXkZDWWOloyr1RoEZUXSZthfm5fRMOTR6plfQ0zE=",
"lastModified": 1692644275,
"narHash": "sha256-OBEagtzFWGeEqw+VAhOXNgqWIPkVSXWJmzfq+3vpQ4k=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "08651736ada39f62b246c44c1d8a81e2787f23d5",
"rev": "41d9b6f0d72947de1b0871795f8d8af32d0e9f98",
"type": "github"
},
"original": {
@ -704,14 +705,18 @@
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1684265364,
"narHash": "sha256-AxNnWbthsuNx73HDQr0eBxrcE3+yfl/WsaXZqUFmkpQ=",
"lastModified": 1691753796,
"narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=",
"owner": "hyprwm",
"repo": "hyprland-protocols",
"rev": "8c279b9fb0f2b031427dc5ef4eab53f2ed835530",
"rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03",
"type": "github"
},
"original": {
@ -727,11 +732,11 @@
]
},
"locked": {
"lastModified": 1690361100,
"narHash": "sha256-e3V2avzF3yY+OBWr5fZ5jTHq6Jm2olnmd95E2jAkyCY=",
"lastModified": 1692480535,
"narHash": "sha256-3Q0Uz/JPW9USHyAmrzRl6KhZLqMYTWkmtL3RA+oAeVY=",
"owner": "hyprwm",
"repo": "hyprpaper",
"rev": "9261356bd74fadbc544bec22c16aec62ebba13bd",
"rev": "5e73eb60552d48d55541c60f9a8da2b666003fe6",
"type": "github"
},
"original": {
@ -895,11 +900,11 @@
]
},
"locked": {
"lastModified": 1689420272,
"narHash": "sha256-n2gIdoXreY1tHfoGZLg3I/aW544DU6hMaJHblrOiFpY=",
"lastModified": 1692077780,
"narHash": "sha256-4BO9p4N4ywIkeAOQ0SpLxOIAZpH7GZWDYFobnL8ENOA=",
"owner": "thiagokokada",
"repo": "nix-alien",
"rev": "7ab7239f3751be944b7cd39095b10585ae688525",
"rev": "95507c65bb91ac9ae4dd55a083f3dc48ea1e9baa",
"type": "github"
},
"original": {
@ -914,11 +919,11 @@
"nixpkgs": "nixpkgs_10"
},
"locked": {
"lastModified": 1690444557,
"narHash": "sha256-jCpEcbdgC1CnCFOXIUnNGgCTMCIHLnMR3oeFLf4FQLo=",
"lastModified": 1691845410,
"narHash": "sha256-dwpqyT2GYkflj8HIFTFCKVRJy4Rqf4egGQUWkovPnvQ=",
"owner": "nix-community",
"repo": "nix-direnv",
"rev": "ed2cb75553b4864e3c931a48e3a2cd43b93152c5",
"rev": "cdc49872a35a574b908cd6170431bdd7bf59ce7a",
"type": "github"
},
"original": {
@ -935,11 +940,11 @@
]
},
"locked": {
"lastModified": 1688874465,
"narHash": "sha256-BUwl+tq40EjkufTZkqf3lWFzxOA/mYBTHz+p5uJtjaY=",
"lastModified": 1691897365,
"narHash": "sha256-jvWIU4ht3YAmF8TDVM2Ps2+Gf4MtNGLL1zEWQZdTrzU=",
"owner": "Mic92",
"repo": "nix-index-database",
"rev": "757114749d4613cf71f3748e780a1be8a67a5d3c",
"rev": "f4d70d098f066a30c7087144063dca179495f7d6",
"type": "github"
},
"original": {
@ -957,11 +962,11 @@
]
},
"locked": {
"lastModified": 1690853837,
"narHash": "sha256-Tt/+WBJ6tCQxZ038fX7TmffcNEN1InRKgeh/fu0FUrs=",
"lastModified": 1692645625,
"narHash": "sha256-a78PfTZhxipHqOnIBRzvYoaohe/gfPj7vruTBKSPDAY=",
"owner": "nix-community",
"repo": "nix-vscode-extensions",
"rev": "acecc7629e0f7ab444f38369f972ba57a5e59e32",
"rev": "7ba103f4172f8e874971c09ce42c87d717153298",
"type": "github"
},
"original": {
@ -1050,11 +1055,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1691006197,
"narHash": "sha256-DbtxVWPt+ZP5W0Usg7jAyTomIM//c3Jtfa59Ht7AV8s=",
"lastModified": 1690789960,
"narHash": "sha256-3K+2HuyGTiJUSZNJxXXvc0qj4xFx1FHC/ItYtEa7/Xs=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "66aedfd010204949cb225cf749be08cb13ce1813",
"rev": "fb942492b7accdee4e6d17f5447091c65897dde4",
"type": "github"
},
"original": {
@ -1114,11 +1119,11 @@
},
"nixpkgs-master": {
"locked": {
"lastModified": 1690858292,
"narHash": "sha256-BtXTL2KdJ084aZB+UuHj+6j/jpAbsKkV06KAeXCJqfU=",
"lastModified": 1692645486,
"narHash": "sha256-pKitIbngaydvDmZA3NaE3ENcx0bVwUp5wkn3JxD1+CQ=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "7cf96f8ebb562afa7bf2f40f0d5d06cb7fe096dd",
"rev": "8bccf2aacd2cff75be189b37fa314144e8bd6c54",
"type": "github"
},
"original": {
@ -1210,11 +1215,11 @@
},
"nixpkgs-stable_3": {
"locked": {
"lastModified": 1690726002,
"narHash": "sha256-cACz6jCJZtsZHGCJAN4vMobxzH5s6FCOTZHMrh/Hu0M=",
"lastModified": 1692525914,
"narHash": "sha256-MUgZ9/9mE/EbEQA6JPdcQHkjoR5fgvaKhpy6UO67uEc=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "391e8db1f06c3f74c2d313a73135515023af3993",
"rev": "475d5ae2c4cb87b904545bdb547af05681198fcc",
"type": "github"
},
"original": {
@ -1226,11 +1231,11 @@
},
"nixpkgs_10": {
"locked": {
"lastModified": 1690327932,
"narHash": "sha256-Fv7PYZxN4eo0K6zXhHG/vOc+e2iuqQ5ywDrh0yeRjP0=",
"lastModified": 1691495139,
"narHash": "sha256-+zZIRTtXlA8gN8HPzczphPnB9L+yYpidBmFxKqWQy+A=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a9b47d85504bdd199e90846622c76aa0bfeabfac",
"rev": "4e6868b1aa3766ab1de169922bb3826143941973",
"type": "github"
},
"original": {
@ -1242,11 +1247,11 @@
},
"nixpkgs_11": {
"locked": {
"lastModified": 1690789960,
"narHash": "sha256-3K+2HuyGTiJUSZNJxXXvc0qj4xFx1FHC/ItYtEa7/Xs=",
"lastModified": 1692447944,
"narHash": "sha256-fkJGNjEmTPvqBs215EQU4r9ivecV5Qge5cF/QDLVn3U=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "fb942492b7accdee4e6d17f5447091c65897dde4",
"rev": "d680ded26da5cf104dd2735a51e88d2d8f487b4d",
"type": "github"
},
"original": {
@ -1274,11 +1279,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1686519857,
"narHash": "sha256-VkBhuq67aXXiCoEmicziuDLUPPjeOTLQoj6OeVai5zM=",
"lastModified": 1691853136,
"narHash": "sha256-wTzDsRV4HN8A2Sl0SVQY0q8ILs90CD43Ha//7gNZE+E=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "6b1b72c0f887a478a5aac355674ff6df0fc44f44",
"rev": "f0451844bbdf545f696f029d1448de4906c7f753",
"type": "github"
},
"original": {
@ -1338,11 +1343,11 @@
},
"nixpkgs_6": {
"locked": {
"lastModified": 1690179384,
"narHash": "sha256-+arbgqFTAtoeKtepW9wCnA0njCOyoiDFyl0Q0SBSOtE=",
"lastModified": 1691654369,
"narHash": "sha256-gSILTEx1jRaJjwZxRlnu3ZwMn1FVNk80qlwiCX8kmpo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "b12803b6d90e2e583429bb79b859ca53c348b39a",
"rev": "ce5e4a6ef2e59d89a971bc434ca8ca222b9c7f5e",
"type": "github"
},
"original": {
@ -1402,11 +1407,11 @@
},
"nur": {
"locked": {
"lastModified": 1691200052,
"narHash": "sha256-H97vtqcBdDchzODvhe+OOJCDAOPRaLDfugs+lqg5N8s=",
"lastModified": 1692642340,
"narHash": "sha256-T/4XWxqZnK7T3/aRwtCT7XoHEAQYLd8LBbGh1W3JT3g=",
"owner": "nix-community",
"repo": "NUR",
"rev": "c5f4362299b53a329748d0e95ade7abd4ec44162",
"rev": "c79a8b5405807c516cda5308fa0599832085e9ae",
"type": "github"
},
"original": {
@ -1583,11 +1588,11 @@
"rycee": {
"flake": false,
"locked": {
"lastModified": 1690846992,
"narHash": "sha256-984kCqfp5yzJRuVjP8878jHG2U2wBNmgEzJ6pzS58oY=",
"lastModified": 1692617867,
"narHash": "sha256-MveWsFLiOl2Wochgqh3FebgPW4CECGIUsVY1jp08rng=",
"owner": "rycee",
"repo": "nur-expressions",
"rev": "dfabae8b63af61b48f5bb8a208a37b1cb1f7c985",
"rev": "b02cfbc05efda5afe857bbdd0a5577ea73986500",
"type": "gitlab"
},
"original": {
@ -1638,16 +1643,16 @@
},
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"lastModified": 1689347949,
"narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"repo": "default-linux",
"rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"repo": "default-linux",
"type": "github"
}
},
@ -1696,6 +1701,21 @@
"type": "github"
}
},
"systems_6": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"utils": {
"locked": {
"lastModified": 1667395993,
@ -1766,18 +1786,18 @@
"flake": false,
"locked": {
"host": "gitlab.freedesktop.org",
"lastModified": 1690165843,
"narHash": "sha256-gv5kjss6REeQG0BmvK2gTx7jHLRdCnP25po6It6I6N8=",
"lastModified": 1691073628,
"narHash": "sha256-LlxE3o3UzRY7APYVLGNKM30DBMcDifCRIQiMVSbYLIc=",
"owner": "wlroots",
"repo": "wlroots",
"rev": "e8d545a9770a2473db32e0a0bfa757b05d2af4f3",
"rev": "c74f89d4f84bfed0284d3908aee5d207698c70c5",
"type": "gitlab"
},
"original": {
"host": "gitlab.freedesktop.org",
"owner": "wlroots",
"repo": "wlroots",
"rev": "e8d545a9770a2473db32e0a0bfa757b05d2af4f3",
"rev": "c74f89d4f84bfed0284d3908aee5d207698c70c5",
"type": "gitlab"
}
},
@ -1790,14 +1810,18 @@
"nixpkgs": [
"hyprland",
"nixpkgs"
],
"systems": [
"hyprland",
"systems"
]
},
"locked": {
"lastModified": 1685385764,
"narHash": "sha256-r+XMyOoRXq+hlfjayb+fyi9kq2JK48TrwuNIAXqlj7U=",
"lastModified": 1691841170,
"narHash": "sha256-RCTm1/MVWYPnReMgyp7tr2ogGYo/pvw38jZaFwemgPU=",
"owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland",
"rev": "4d9ff0c17716936e0b5ca577a39e263633901ed1",
"rev": "57a3a41ba6b358109e4fc25c6a4706b5f7d93c6b",
"type": "github"
},
"original": {

6
flake.nix
View File

@ -16,10 +16,7 @@
inputs.nixpkgs.follows = "nixpkgs";
};
impermanence.url = "github:AtaraxiaSjel/impermanence";
aagl = {
url = "github:ezKEa/aagl-gtk-on-nix";
# inputs.nixpkgs.follows = "nixpkgs";
};
aagl.url = "github:ezKEa/aagl-gtk-on-nix";
arkenfox-userjs = {
url = "github:arkenfox/user.js";
flake = false;
@ -110,7 +107,6 @@
nixosRoles = import ./roles;
sharedPatches = patchesPath [
"gitea-241497.patch"
"ivpn.patch"
"mullvad-exclude-containers.patch"
"vaultwarden.patch"

22
patches/gitea-241497.patch
View File

@ -1,22 +0,0 @@
From 5205c73d9311bcf458ed0fe1f4ce381bf3842b3d Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Thu, 29 Jun 2023 18:26:51 +0200
Subject: [PATCH] nixos/gitea: add WORK_PATH to config
this is in preparation for 1.20, which needs this option set
---
nixos/modules/services/misc/gitea.nix | 1 +
1 file changed, 1 insertion(+)
diff --git a/nixos/modules/services/misc/gitea.nix b/nixos/modules/services/misc/gitea.nix
index 72fad73bae509..7e7ac355edda9 100644
--- a/nixos/modules/services/misc/gitea.nix
+++ b/nixos/modules/services/misc/gitea.nix
@@ -15,6 +15,7 @@ let
APP_NAME = ${cfg.appName}
RUN_USER = ${cfg.user}
RUN_MODE = prod
+ WORK_PATH = ${cfg.stateDir}
${generators.toINI {} cfg.settings}

73
patches/waydroid-1.4.1.patch
View File

@ -1,73 +0,0 @@
From 76a471ef1d2698591298ea712b563ab705e6e7f0 Mon Sep 17 00:00:00 2001
From: Dmitriy Kholkin <ataraxiadev@ataraxiadev.com>
Date: Fri, 3 Mar 2023 02:52:20 +0300
Subject: [PATCH] waydroid: 1.3.4 -> 1.4.0
---
pkgs/os-specific/linux/waydroid/default.nix | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/pkgs/os-specific/linux/waydroid/default.nix b/pkgs/os-specific/linux/waydroid/default.nix
index d01759e8ed6..2cf6e0c47e4 100644
--- a/pkgs/os-specific/linux/waydroid/default.nix
+++ b/pkgs/os-specific/linux/waydroid/default.nix
@@ -11,7 +11,6 @@
, iproute2
, iptables
, util-linux
-, which
, wrapGAppsHook
, xclip
, runtimeShell
@@ -19,14 +18,14 @@
python3Packages.buildPythonApplication rec {
pname = "waydroid";
- version = "1.3.4";
+ version = "1.4.1";
format = "other";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
- sha256 = "sha256-0GBob9BUwiE5cFGdK8AdwsTjTOdc+AIWqUGN/gFfOqI=";
+ sha256 = "sha256-0AkNzMIumvgnVcLKX72E2+Eg54Y9j7tdIYPsroOTLWA=";
};
buildInputs = [
@@ -39,6 +38,7 @@ python3Packages.buildPythonApplication rec {
];
propagatedBuildInputs = with python3Packages; [
+ dbus-python
gbinder-python
pyclip
pygobject3
@@ -63,6 +63,7 @@ python3Packages.buildPythonApplication rec {
wrapPythonProgramsIn $out/lib/waydroid/ "${lib.concatStringsSep " " [
"$out"
+ python3Packages.dbus-python
python3Packages.gbinder-python
python3Packages.pygobject3
python3Packages.pyclip
@@ -70,15 +71,11 @@ python3Packages.buildPythonApplication rec {
kmod
lxc
util-linux
- which
xclip
]}"
substituteInPlace $out/lib/waydroid/tools/helpers/*.py \
--replace '"sh"' '"${runtimeShell}"'
-
- substituteInPlace $out/share/applications/*.desktop \
- --replace "/usr" "$out"
'';
meta = with lib; {
--
2.40.1

13
patches/zen-kernels.patch
View File

@ -1,17 +1,16 @@
diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix
index 9455f88..54cec49 100644
index 7c32a5d..708d613 100644
--- a/pkgs/os-specific/linux/kernel/zen-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix
@@ -11,9 +11,9 @@ let
};
# ./update-zen.py lqx
lqxVariant = {
- version = "6.4.2"; #lqx
- suffix = "lqx1"; #lqx
- sha256 = "14hr88lbwm2pz3knw6nxlahdk4pwwb4ya63mrd7zg7g1x2xhfb59"; #lqx
+ version = "6.3.11"; #lqx
+ suffix = "lqx2"; #lqx
+ sha256 = "0hpzafw2zwy25ss4cwj6mm8pr1nnv680m8bfcal29f7gaxbm96k8"; #lqx
- version = "6.4.7"; #lqx
+ version = "6.3.13"; #lqx
suffix = "lqx1"; #lqx
- sha256 = "055l8l83368858ap1pslxcs76hkms8ik627v7d7wczm9f1vldbln"; #lqx
+ sha256 = "1qxjbwmxlncfg6adrzrzjxnj8g4gcyq3k76i5fwlrfxx2s4hryl5"; #lqx
isLqx = true;
};
zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {

8
profiles/overlay.nix
View File

@ -29,8 +29,8 @@ with lib; {
nix-alien = inputs.nix-alien.packages.${system}.nix-alien;
nix-index-update = inputs.nix-alien.packages.${system}.nix-index-update;
prismlauncher = inputs.prismlauncher.packages.${system}.default;
ripgrep-all = stable.ripgrep-all;
spotify = master.spotify;
waybar = inputs.hyprland.packages.${system}.waybar-hyprland;
wine = prev.wineWowPackages.staging;
youtube-to-mpv = prev.callPackage ./packages/youtube-to-mpv.nix { term = config.defaultApplications.term.cmd; };
yt-dlp = master.yt-dlp;
@ -82,8 +82,8 @@ with lib; {
allowUnfree = true;
android_sdk.accept_license = true;
# vscode-server requires nodejs_16
permittedInsecurePackages = [
"nodejs-16.20.1"
];
# permittedInsecurePackages = [
# "nodejs-16.20.1"
# ];
};
}

2
profiles/servers/vscode-server.nix
View File

@ -1,7 +1,7 @@
{ pkgs, ... }: {
services.vscode-server = {
enable = true;
nodejsPackage = pkgs.nodejs_16;
nodejsPackage = pkgs.nodejs_18;
#installPath = "~/.vscode-server-oss";
};

96
profiles/workspace/hyprland/default.nix
View File

@ -21,48 +21,6 @@ let
${pkgs.grim}/bin/grim -g "$(${pkgs.slurp}/bin/slurp) - | ${pkgs.tesseract5}/bin/tesseract -l eng - - | ${pkgs.wl-clipboard}/bin/wl-copy"
'';
dh-macros = pkgs.writeShellScript "dh-macros" ''
FILE=/tmp/dh-macros-pid
if [[ ! -f "$FILE" ]]; then
YDOTOOL_SOCKET=$XDG_RUNTIME_DIR/.ydotool_socket
echo $$ > $FILE
var=9
while true; do
var=$((var + 1))
if [[ $var -eq 10 ]]; then
ydotool type 1; sleep 0.134;
var=0
fi
ydotool type 2; sleep 0.154;
ydotool type 3; sleep 0.164;
ydotool type 4; sleep 0.134;
done
else
kill -9 $(cat $FILE)
rm -f $FILE
fi
'';
wz-macros = pkgs.writeShellScript "wz-macros" ''
FILE=/tmp/wz-macros-pid
if [[ ! -f "$FILE" ]]; then
YDOTOOL_SOCKET=$XDG_RUNTIME_DIR/.ydotool_socket
echo $$ > $FILE
var=3
while true; do
var=$((var + 1))
if [[ $var -eq 4 ]]; then
ydotool type 2; sleep 0.134;
var=0
fi
ydotool type 1; sleep 0.354;
done
else
kill -9 $(cat $FILE)
rm -f $FILE
fi
'';
hyprpaper-pkg = inputs.hyprpaper.packages.${pkgs.hostPlatform.system}.hyprpaper;
in with config.deviceSpecific; with lib; {
imports = [ inputs.hyprland.nixosModules.default ];
@ -82,32 +40,20 @@ in with config.deviceSpecific; with lib; {
ipc = off
'';
programs.zsh.loginExtra = let
initScript = pkgs.writeShellScriptBin "wrappedHypr" ''
# export SDL_VIDEODRIVER=wayland
export QT_QPA_PLATFORM=wayland
export QT_WAYLAND_DISABLE_WINDOWDECORATION=1
# export XDG_CURRENT_DESKTOP=sway
#export _JAVA_AWT_WM_NONPARENTING=1
# export XCURSOR_SIZE=${toString thm.cursorSize}
exec Hyprland 2> /tmp/hyprland.debug.log
'';
in lib.mkAfter ''
programs.zsh.loginExtra = lib.mkAfter ''
[[ "$(tty)" == /dev/tty1 ]] && {
pass unlock
exec ${initScript}/bin/wrappedHypr
exec Hyprland 2> /tmp/hyprland.debug.log
}
'';
wayland.windowManager.hyprland = {
enable = true;
xwayland.enable = true;
xwayland.hidpi = false;
disableAutoreload = false;
nvidiaPatches = false;
systemdIntegration = true;
enableNvidiaPatches = false;
recommendedEnvironment = true;
systemdIntegration = true;
xwayland.enable = true;
extraConfig = let
modifier = "SUPER";
script = name: content: "${pkgs.writeScript name content}";
@ -140,16 +86,18 @@ in with config.deviceSpecific; with lib; {
active_opacity=0.92
inactive_opacity=0.75
fullscreen_opacity=1.0
blur=true
blur_size=2
blur_passes=3
blur_ignore_opacity=true
drop_shadow=true
shadow_range=12
# shadow_render_power=int # (1 - 4), in what power to render the falloff (more power, the faster the falloff)
shadow_ignore_window=true
col.shadow=0xAA${thm.base08-hex}
shadow_offset=0 0
blur {
enabled=true
size=2
passes=3
ignore_opacity=true
}
}
animations {
enabled=true
@ -303,9 +251,6 @@ in with config.deviceSpecific; with lib; {
bind=${modifier}ALT,t,movetoworkspace,name:Messengers
bind=${modifier}ALT,g,movetoworkspace,name:Games
bind=${modifier}ALT,Cyrillic_E,movetoworkspace,name:Messengers
bind=${modifier}CTRL,c,exec,${dh-macros}
bind=${modifier}CTRL,x,exec,${wz-macros}
'' ''
windowrulev2=workspace name:Steam silent,class:^(steam)$
windowrulev2=workspace name:Music silent,title:^(Spotify)$
@ -329,8 +274,25 @@ in with config.deviceSpecific; with lib; {
windowrulev2=tile,class:^(.*winbox64.exe)$
windowrule=opaque,.*jellyfin.*
'' ''
env=GDK_BACKEND=wayland,x11
env=QT_QPA_PLATFORM=wayland;xcb
env=SDL_VIDEODRIVER=wayland
env=CLUTTER_BACKEND=wayland
env=XDG_CURRENT_DESKTOP=Hyprland
env=XDG_SESSION_TYPE=wayland
env=QT_AUTO_SCREEN_SCALE_FACTOR=1
env=QT_WAYLAND_DISABLE_WINDOWDECORATION=1
env=QT_QPA_PLATFORMTHEME=qt5ct
''
# Temp fix crash on startup
# See https://github.com/microsoft/vscode/issues/184124
''
windowrulev2=float,class:^(code-url-handler)$
windowrulev2=float,class:^(Element)$
''
###
''
exec=${importGsettings}
# exec-once=swayidle -w timeout 600 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on'
exec-once=${hyprpaper-pkg}/bin/hyprpaper

12
profiles/workspace/kde/default.nix
View File

@ -7,12 +7,12 @@ with config.lib.base16.theme; {
qt.enable = false;
environment.sessionVariables = {
QT_XFT = "true";
QT_SELECT = "5";
KDE_SESSION_VERSION = "5";
QT_SCALE_FACTOR = "1";
QT_AUTO_SCREEN_SCALE_FACTOR = "0";
QT_QPA_PLATFORMTHEME = "qt5ct";
# QT_XFT = "true";
# QT_SELECT = "5";
# KDE_SESSION_VERSION = "5";
# QT_SCALE_FACTOR = "1";
# QT_AUTO_SCREEN_SCALE_FACTOR = "0";
# QT_QPA_PLATFORMTHEME = "qt5ct";
KDEDIRS =
"/run/current-system/sw:/run/current-system/sw/share/kservices5:/run/current-system/sw/share/kservicetypes5:/run/current-system/sw/share/kxmlgui5";
};

2
profiles/workspace/waybar/default.nix
View File

@ -2,7 +2,7 @@
with config.deviceSpecific; {
home-manager.users.${config.mainuser}.programs.waybar = {
enable = true;
# package = inputs.nixpkgs-wayland.packages.${pkgs.hostPlatform.system}.waybar;
package = pkgs.waybar-hyprland;
settings = {
mainBar = {
layer = "top";

3
profiles/workspace/zsh/default.nix
View File

@ -4,6 +4,9 @@
environment.sessionVariables.SHELL = "${pkgs.zsh}/bin/zsh";
home-manager.users.${config.mainuser} = {
home.sessionVariables.SHELL = "${pkgs.zsh}/bin/zsh";
home.file.".profile".text = ''
. "${config.home.profileDirectory}/etc/profile.d/hm-session-vars.sh"
'';
programs = {
zsh = {
enable = true;