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

update

Browse Source
This commit is contained in:
Dmitriy Kholkin 2022-10-06 00:42:09 +03:00
parent fdd59b1335
commit 64fe6d4297
8 changed files with 153 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
flake.lock generated
View File

@ -3,11 +3,11 @@
"arkenfox-userjs": {
"flake": false,
"locked": {
"lastModified": 1662893183,
"narHash": "sha256-NyP/kJlV1Ai7os3gMqukKMdRSQ78GAjPCJkZDZtDdeo=",
"lastModified": 1664904885,
"narHash": "sha256-XUjX+Tno3EU/3IXR/WCn4M5gVR+sKjCzpKcV31dqzWA=",
"owner": "arkenfox",
"repo": "user.js",
"rev": "3f09afdee07c5aea33f6dc4194e1425d6400a0d7",
"rev": "db04bc44f2982ae8e39f10d056bc7cfe7804d4fd",
"type": "github"
},
"original": {
@ -225,11 +225,11 @@
"utils": "utils_2"
},
"locked": {
"lastModified": 1663932797,
"narHash": "sha256-IH8ZBW99W2k7wKLS+Sat9HiKX1TPZjFTnsPizK5crok=",
"lastModified": 1664983332,
"narHash": "sha256-KyQvgFRwk3qW3Qr+lO5UDqfpST/HaCJY1yB7wPgPUqo=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "de3758e31a3a1bc79d569f5deb5dac39791bf9b6",
"rev": "1a8e35d2e53ed2ccd9818fad9c9478d56c655661",
"type": "github"
},
"original": {
@ -246,11 +246,11 @@
"wlroots": "wlroots"
},
"locked": {
"lastModified": 1663953535,
"narHash": "sha256-bGIIXSdEpkw1XWuOeJZtF4f8/EEo1HghNAQPaY+EKCg=",
"lastModified": 1665003520,
"narHash": "sha256-CIEXnmwTjf8AkfhFcGaGZHzFTvNyLe2ucG0DoM5wVmY=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "959557ecc35ed8708facf979f5b255b80885a50a",
"rev": "32e8eda40a93f9c4a304faa54a3996087eae86e4",
"type": "github"
},
"original": {
@ -265,11 +265,11 @@
"nixpkgs-lib": "nixpkgs-lib"
},
"locked": {
"lastModified": 1663503058,
"narHash": "sha256-wagaFmv4qvsMO9A4kqGgfxsaRu71IecB9oKjDMss8u0=",
"lastModified": 1664712710,
"narHash": "sha256-TScFRDUO7vuHhPpMe1GNjHD+ciF0qgFWYGc0YM+HAds=",
"owner": "nix-community",
"repo": "lib-aggregate",
"rev": "05a081a254f4bc7ca026a6ebdcf9864170208bc3",
"rev": "9b3defbae219e67143f89db6a3540ebaf3cf017a",
"type": "github"
},
"original": {
@ -339,11 +339,11 @@
"nixpkgs-regression": "nixpkgs-regression"
},
"locked": {
"lastModified": 1663761049,
"narHash": "sha256-E/D8+fYvI+s6XlLIDkRlDD5T9tf6ZHsoZAw/jU+pDsw=",
"lastModified": 1664984742,
"narHash": "sha256-3w98t0PHcHfh/gp4be0z5R964zn3j5q26XO79hPjttE=",
"owner": "nixos",
"repo": "nix",
"rev": "f704c2720f136a6bb73a2e91d4a85e0e9a42ff6f",
"rev": "ac0fb38e8a5a25a84fa17704bd31b453211263eb",
"type": "github"
},
"original": {
@ -361,11 +361,11 @@
"poetry2nix": "poetry2nix"
},
"locked": {
"lastModified": 1663228762,
"narHash": "sha256-bWDz4dsjP90hDmf+7v8qeYzGbdLdzvCCjCt0kVW6HaE=",
"lastModified": 1664886387,
"narHash": "sha256-LKlJ2loqIh9awGIYaxvBhfo1iW0ZlGZ85aertBR5ybU=",
"owner": "thiagokokada",
"repo": "nix-alien",
"rev": "c70016ff920795f84115bf3774fb55355e0be2b1",
"rev": "1de0f90f84b439cf2a500240533a5b48a15c269f",
"type": "github"
},
"original": {
@ -442,11 +442,11 @@
},
"nixpkgs-lib": {
"locked": {
"lastModified": 1663463003,
"narHash": "sha256-X2k3WagXicaNiBswEJz3PqznEtovp1fKbuAMUMOHzeg=",
"lastModified": 1664673153,
"narHash": "sha256-Cx2eBUEXt8Q0L+0MSiajhpuVkwDf/4zbP8J0zLQAMNQ=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "30286fa7fb374fa3ffc80ac35eb7fadf572ae357",
"rev": "31f704cbbdb277df25ad2642876c485bc0d8f883",
"type": "github"
},
"original": {
@ -457,11 +457,11 @@
},
"nixpkgs-master": {
"locked": {
"lastModified": 1663957247,
"narHash": "sha256-LKzVntuuwkXGezUnxTTYG5NlxYUTFFmMPe/EshDQAgc=",
"lastModified": 1665003280,
"narHash": "sha256-kza2EvBETstEUZs2EPqL8tWF1XSWX/diED1caL2ZNk4=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "05914af3e0b0a358abf23bb4d80853acc4861b07",
"rev": "796e6bb38bd8acc00184a67be5d5eaf59812eb2b",
"type": "github"
},
"original": {
@ -489,11 +489,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1663855239,
"narHash": "sha256-A2B7rlFKmBikRwz/cmayWcTAhyIOdp2whjVCDGhg9Xw=",
"lastModified": 1664883812,
"narHash": "sha256-wqBAcVRBxls2nVaNeQaOy9SRg/bvEUiD26TQDprIg8U=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "bcc68429a50c4ac051920c72c60e417202c19d79",
"rev": "fe76645aaf2fac3baaa2813fd0089930689c53b5",
"type": "github"
},
"original": {
@ -513,11 +513,11 @@
]
},
"locked": {
"lastModified": 1663957741,
"narHash": "sha256-iAV7vaPsPIbJ4+dShe9VNdjOeIcMlMKtlnqpSvC9iz0=",
"lastModified": 1664999658,
"narHash": "sha256-FEDnLPk/pBTOx3dFIBuJ8xjRGLB4MtdzwwT2fp4mP5c=",
"owner": "nix-community",
"repo": "nixpkgs-wayland",
"rev": "007dde17cf749db8e78cb9f2e74c562483b06e60",
"rev": "5c9b30992d1a39c2f5f0f2669d2107dff67eebc7",
"type": "github"
},
"original": {
@ -544,11 +544,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1663850217,
"narHash": "sha256-tp9nXo1/IdN/xN9m06ryy0QUAEfoN6K56ObM/1QTAjc=",
"lastModified": 1664780719,
"narHash": "sha256-Oxe6la5dSqRfJogjtY4sRzJjDDqvroJIVkcGEOT87MA=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "ae1dc133ea5f1538d035af41e5ddbc2ebcb67b90",
"rev": "fd54651f5ffb4a36e8463e0c327a78442b26cbe7",
"type": "github"
},
"original": {
@ -560,11 +560,11 @@
},
"nur": {
"locked": {
"lastModified": 1663955967,
"narHash": "sha256-Ohl1Cnf6Dv9QmZNq5grMV1fV4srTtHIO6wwtTsQFshw=",
"lastModified": 1664994467,
"narHash": "sha256-WMAg7hrdHcOWLqMiYFV566MjuQuGX5kuEcnPd41+Cdw=",
"owner": "nix-community",
"repo": "NUR",
"rev": "bc25b7916941f381a0a1a3b2a8659422f2d7aab1",
"rev": "607d05cc17a65461cfb82790c96c48df7e885710",
"type": "github"
},
"original": {
@ -624,11 +624,11 @@
"qbittorrent-ee": {
"flake": false,
"locked": {
"lastModified": 1663656922,
"narHash": "sha256-ktYOkbTWhNwBiw3bwW4xWlWJpXvexDeVkqK/FuYEhYc=",
"lastModified": 1664604308,
"narHash": "sha256-O638UnZLtA4L4IsrGt+Psoe2k4oDEwcrM1xJa8NejbM=",
"owner": "c0re100",
"repo": "qBittorrent-Enhanced-Edition",
"rev": "325910487c6e5c92f7a11e7476a68c2b1dd86c06",
"rev": "26addb643ce6c8affcc197d1f4290d6f092b5a58",
"type": "github"
},
"original": {
@ -683,11 +683,11 @@
"rycee": {
"flake": false,
"locked": {
"lastModified": 1663933333,
"narHash": "sha256-h4m8WDfnR0OrdAbMagzAPA7ENBJ+0WL33mtb3EeIcFI=",
"lastModified": 1664942562,
"narHash": "sha256-GoGzecK50Eqn8WxaTnVQkvTWX3IuLkB1JEPomBMpL8o=",
"owner": "rycee",
"repo": "nur-expressions",
"rev": "4c461713bc88c297fae426b0fb63a0d459e869fb",
"rev": "15ea39924432ec1eb29cf12e1174ab4993d33116",
"type": "gitlab"
},
"original": {
@ -788,11 +788,11 @@
"flake": false,
"locked": {
"host": "gitlab.freedesktop.org",
"lastModified": 1663507239,
"narHash": "sha256-LISZtkPVe8lQ2N8YwVe+KxCkXWLP9mdw6Q2kG93wE8A=",
"lastModified": 1664816798,
"narHash": "sha256-oLJyFT1Fc4UNNaDSN+EYUAWL4CufCBpuS5AV4Z4XANo=",
"owner": "wlroots",
"repo": "wlroots",
"rev": "2ad25b1460400e66ea26bd6489b04072be7d9dbb",
"rev": "50cc1ef4d3791d86854dd83c15fff17e5ea1a5b6",
"type": "gitlab"
},
"original": {

9
flake.nix
View File

@ -124,6 +124,7 @@
if [[ -z $1 ]]; then
echo "Usage: $(basename $0) {switch|boot|test}"
elif [[ $1 = "iso" ]]; then
shift
nix build .#nixosConfigurations.Flakes-ISO.config.system.build.isoImage "$@"
else
arg=$1; shift;
@ -149,7 +150,7 @@
packages = {
Wayland-VM = nixos-generators.nixosGenerate {
system = builtins.readFile (./machines/Wayland-VM/system);
modules = [ (import (./machines/Wayland-VM)) ];
modules = [ (import (./machines/Wayland-VM)) { device = "Wayland-VM"; } ];
specialArgs = { inherit inputs; };
format = "vm";
};
@ -159,6 +160,12 @@
specialArgs = { inherit inputs; };
format = "vm";
};
Flakes-ISO = nixos-generators.nixosGenerate {
system = builtins.readFile (./machines/Flakes-ISO/system);
modules = [ (import (./machines/Flakes-ISO)) ];
specialArgs = { inherit inputs; };
format = "install-iso";
};
};
};

1
machines/AMD-Workstation/default.nix
View File

@ -32,6 +32,5 @@
home-manager.users.alukard.home.packages = lib.mkIf config.deviceSpecific.enableVirtualisation [
inputs.nixos-generators.packages.${pkgs.system}.nixos-generators
inputs.miniguest.packages.${pkgs.system}.miniguest
];
}

62
patches/update-zfs.patch Normal file
View File

@ -0,0 +1,62 @@
From 5bae92a7155b885619cbab9d3ddae91aa59e91cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 4 Oct 2022 14:18:13 +0200
Subject: [PATCH] =?UTF-8?q?zfs:=202.1.5=20=E2=86=92=202.1.6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pkgs/os-specific/linux/zfs/default.nix | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index 5e92e63553d0c..080a198b0f408 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -16,7 +16,7 @@
, enablePython ? true
# for determining the latest compatible linuxPackages
-, linuxPackages_5_15 ? pkgs.linuxKernel.packages.linux_5_15
+, linuxPackages_5_19 ? pkgs.linuxKernel.packages.linux_5_19
}:
let
@@ -216,28 +216,28 @@ in {
# to be adapted
zfsStable = common {
# check the release notes for compatible kernels
- kernelCompatible = kernel.kernelOlder "5.19";
- latestCompatibleLinuxPackages = linuxPackages_5_15;
+ kernelCompatible = kernel.kernelOlder "5.20";
+ latestCompatibleLinuxPackages = linuxPackages_5_19;
# this package should point to the latest release.
- version = "2.1.5";
+ version = "2.1.6";
- sha256 = "sha256-a9rmuPO8R8UfxdHvwjfFuYRGn97a1MPmLZRvr3l0swE=";
+ sha256 = "sha256-gd5WlNtnoSiVj4sKUGf0WhR7Z1GPebwu3Z1mkNsoC/I=";
};
zfsUnstable = common {
# check the release notes for compatible kernels
- kernelCompatible = kernel.kernelOlder "5.19";
- latestCompatibleLinuxPackages = linuxPackages_5_15;
+ kernelCompatible = kernel.kernelOlder "5.20";
+ latestCompatibleLinuxPackages = linuxPackages_5_19;
# this package should point to a version / git revision compatible with the latest kernel release
# IMPORTANT: Always use a tagged release candidate or commits from the
# zfs-<version>-staging branch, because this is tested by the OpenZFS
# maintainers.
- version = "2.1.5";
+ version = "2.1.6";
# rev = "0000000000000000000000000000000000000000";
- sha256 = "sha256-a9rmuPO8R8UfxdHvwjfFuYRGn97a1MPmLZRvr3l0swE=";
+ sha256 = "sha256-gd5WlNtnoSiVj4sKUGf0WhR7Z1GPebwu3Z1mkNsoC/I=";
isUnstable = true;
};

1
profiles/applications/packages.nix
View File

@ -49,6 +49,7 @@ with config.deviceSpecific; {
# gui
bitwarden
deadbeef
discord
feh
foliate

26
profiles/applications/vscode/extensions.nix
View File

@ -56,14 +56,14 @@
{
name = "dart-code";
publisher = "Dart-Code";
version = "3.49.20220916";
sha256 = "03fl6l8nbsnrsccjgk2bpnca8w96z77axl3c6ph5l04zj7pj0q72";
version = "3.51.20221003";
sha256 = "0vkb10gjk87fdc33s2yhwphb0q8jbl5sgpg1k7svbcpbakcn3kp6";
}
{
name = "flutter";
publisher = "Dart-Code";
version = "3.48.0";
sha256 = "102dda4l4m11f116ysz05smfficcazh58y2skd5cjp483yfjgyvb";
version = "3.51.20221003";
sha256 = "1whplxis4zgr0q42dzn49hrm2ylfhrpkqmfs1r9xvcbhvs97wl9k";
}
{
name = "wal-theme";
@ -98,8 +98,8 @@
{
name = "vscode-pull-request-github";
publisher = "GitHub";
version = "0.51.2022092209";
sha256 = "1g19qlnb8ffh932qk6sb5j1gcm6vl1i9j0c59k58g3ldsl3wj5i6";
version = "0.53.2022100514";
sha256 = "0wlp1xba4hb0pbz9zxawfgixswwmws8yidfz61kxq450lb1sq59k";
}
{
name = "vscode-env";
@ -131,23 +131,17 @@
version = "1.30.0";
sha256 = "000zhgzijf3h6abhv4p3cz99ykj6489wfn81j0s691prr8q9lxxh";
}
{
name = "vscode-docker";
publisher = "ms-azuretools";
version = "1.22.1";
sha256 = "1ix363fjxi9g450rs3ghx44z3hppvasf0xpzgha93m90djd7ai52";
}
{
name = "remote-ssh";
publisher = "ms-vscode-remote";
version = "0.87.2022090715";
sha256 = "02qr68q5fc5kfs2qwjnfmapr6x5b1lbbrs3bks783svlnqdgbr76";
version = "0.87.2022092915";
sha256 = "1bviy4xh8bff3gky08ilya073390pyyizkdsg7rzmlwcza9dq9i5";
}
{
name = "remote-ssh-edit";
publisher = "ms-vscode-remote";
version = "0.80.0";
sha256 = "0zgrd2909xpr3416cji0ha3yl6gl2ry2f38bvx4lsjfmgik0ic6s";
version = "0.84.0";
sha256 = "0rw2klz1f4sy1xzwg4bilcm2sjk0lxdfh9ly3f4kbl8a5xccfy6z";
}
];
}

38
profiles/sound/easyeffects/HE4XX.json
View File

@ -2,11 +2,13 @@
"output": {
"blocklist": [],
"equalizer": {
"balance": 0.0,
"bypass": false,
"input-gain": 0.0,
"left": {
"band0": {
"frequency": 22.0,
"gain": 2.6,
"gain": 3.0,
"mode": "APO (DR)",
"mute": false,
"q": 0.5,
@ -16,7 +18,7 @@
},
"band1": {
"frequency": 237.0,
"gain": 0.0,
"gain": 2.0,
"mode": "APO (DR)",
"mute": false,
"q": 0.9200000166893005,
@ -108,10 +110,12 @@
"mode": "IIR",
"num-bands": 10,
"output-gain": 0.0,
"pitch-left": 0.0,
"pitch-right": 0.0,
"right": {
"band0": {
"frequency": 22.0,
"gain": 2.6,
"gain": 3.0,
"mode": "APO (DR)",
"mute": false,
"q": 0.5,
@ -121,7 +125,7 @@
},
"band1": {
"frequency": 237.0,
"gain": 0.0,
"gain": 2.0,
"mode": "APO (DR)",
"mute": false,
"q": 0.9200000166893005,
@ -213,15 +217,24 @@
"split-channels": false
},
"limiter": {
"asc": false,
"asc-level": 0.5,
"auto-level": false,
"input-gain": -4.0,
"limit": 0.0,
"alr": false,
"alr-attack": 5.0,
"alr-knee": 0.0,
"alr-release": 50.0,
"attack": 5.0,
"bypass": false,
"dithering": "None",
"external-sidechain": false,
"gain-boost": true,
"input-gain": 0.0,
"lookahead": 5.0,
"output-gain": 0.0,
"oversampling": 1,
"release": 50.0
"mode": "Herm Thin",
"output-gain": -3.0,
"oversampling": "None",
"release": 5.0,
"sidechain-preamp": 0.0,
"stereo-link": 100.0,
"threshold": 0.0
},
"plugins_order": [
"limiter",
@ -231,6 +244,7 @@
"stereo_tools": {
"balance-in": 0.0,
"balance-out": -0.28,
"bypass": false,
"delay": 0.0,
"input-gain": 0.0,
"middle-level": 0.0,

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

@ -272,6 +272,7 @@ in with config.deviceSpecific; with lib; {
''}
windowrule=center,Waydroid
windowrule=opaque,Waydroid
windowrule=opaque,qemu
windowrule=opaque,steam_app.*
windowrule=float,steam_app.*