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

update system

Browse Source
This commit is contained in:
Dmitriy Kholkin 2023-04-08 22:47:50 +03:00
parent 6172dda5e7
commit 64e35cb2f7
7 changed files with 225 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
flake.lock generated
View File

@ -3,11 +3,11 @@
"arkenfox-userjs": {
"flake": false,
"locked": {
"lastModified": 1679224600,
"narHash": "sha256-O4QPDKSDbSuM68vIqQQuQoi1x5ifygFYairaEXGXxKA=",
"lastModified": 1680151825,
"narHash": "sha256-EutseXvFnDkYq95GWiGrTFqI4fqybvsPQlVV0Wy5tFU=",
"owner": "arkenfox",
"repo": "user.js",
"rev": "bdaa2867b923669361a8527065e919c839668599",
"rev": "c84c419544cbbe4442190cc6325b926b519d8db5",
"type": "github"
},
"original": {
@ -335,11 +335,11 @@
"utils": "utils"
},
"locked": {
"lastModified": 1679786039,
"narHash": "sha256-VNjswu0Q4bZOkWNuc0+dHvRdjUCj+MnDlRfw/Q0R3vI=",
"lastModified": 1680667162,
"narHash": "sha256-2vgxK4j42y73S3XB2cThz1dSEyK9J9tfu4mhuEfAw68=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "cf662b6c98a0da81e06066fff0ecf9cbd4627727",
"rev": "440faf5ae472657ef2d8cc7756d77b6ab0ace68d",
"type": "github"
},
"original": {
@ -356,11 +356,11 @@
"xdph": "xdph"
},
"locked": {
"lastModified": 1679792424,
"narHash": "sha256-EFXGWV13DcTO/6jaLf/zoAFOsQMCMPE8YMeXpSeUjNY=",
"lastModified": 1680964754,
"narHash": "sha256-cjCjECP+Sv6GyiPqiVsfm/KEMLHcM8wI1krWGfdL5vM=",
"owner": "hyprwm",
"repo": "Hyprland",
"rev": "3343aac6bf6aa601cb882859edf63a6cb59bb774",
"rev": "86852cdc78b833ae405b6161f639424787a825e4",
"type": "github"
},
"original": {
@ -397,11 +397,11 @@
]
},
"locked": {
"lastModified": 1678893556,
"narHash": "sha256-FHhBetkV/S7M9BMpbCzUWX/P5E7tGE4mZIpj/2m0K2M=",
"lastModified": 1680695861,
"narHash": "sha256-LqvhYx1Gu+rlkF4pA1NYZzwRQwz3FeWBqXqmQq86m8o=",
"owner": "hyprwm",
"repo": "hyprpaper",
"rev": "61961973cfd10853b32c7f904cdb88f9ab6d84dd",
"rev": "9182de9ffc8c76fbf24d16dec0ea7a9430597a06",
"type": "github"
},
"original": {
@ -486,11 +486,11 @@
"nixpkgs-regression": "nixpkgs-regression"
},
"locked": {
"lastModified": 1679663238,
"narHash": "sha256-YfcEwIY5wo60Pmn7FkEfUcmoEqtQslyX8Le1Mi6L/vA=",
"lastModified": 1680965869,
"narHash": "sha256-EoMxtojx8LRJ3bwHs6/XyadYA4+nZlvmEKoa18NojFI=",
"owner": "nixos",
"repo": "nix",
"rev": "e00abd3f566b16bb107d513925cf33b40cca35f4",
"rev": "8f0ec323ea0cb4791ca8edfe122b0d7523acfc80",
"type": "github"
},
"original": {
@ -509,11 +509,11 @@
]
},
"locked": {
"lastModified": 1679007364,
"narHash": "sha256-q7QLU2tIfAr8NTk6bBPAA3oG8UktHvimYbcO+NUCcbE=",
"lastModified": 1680874836,
"narHash": "sha256-0ImFqYVPPOK9EP16tYOiCUloNTidvjkSUCfPzX3fTNI=",
"owner": "thiagokokada",
"repo": "nix-alien",
"rev": "eea485724b4c7cab98076dd30b081196eb25abdb",
"rev": "58597a3d2f6c0cd11e68cbb057ac6178ce6a4325",
"type": "github"
},
"original": {
@ -528,11 +528,11 @@
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1678952047,
"narHash": "sha256-AkCPj4/GghWTmtamdCTKUeu+61iZkcVUkGetbcpKNx4=",
"lastModified": 1680521329,
"narHash": "sha256-5VyvmDW3lJhAY/fGjuLFDwdXfI9mrQrtkF7zZ0mDdA8=",
"owner": "nix-community",
"repo": "nix-direnv",
"rev": "17e2f04c4aaaac509a4b77c66cea42281ed64615",
"rev": "2068621f3c90a28ac10f7bb5622ccd15620cf2cc",
"type": "github"
},
"original": {
@ -571,11 +571,11 @@
]
},
"locked": {
"lastModified": 1679793477,
"narHash": "sha256-yFXzazCPsTGIlCx5K7MMAki6LO6420uSIOBAveKHs7k=",
"lastModified": 1680916106,
"narHash": "sha256-0PtHiiUV9KJmOg3LWQ8sNxt5u/xqpRkyLjFQL93JjEk=",
"owner": "nix-community",
"repo": "nix-vscode-extensions",
"rev": "e48d195cc011edfde6cbe9b0ba4746842a434e8f",
"rev": "05438bb4ea58711a5a42158552e91d040130fb48",
"type": "github"
},
"original": {
@ -586,11 +586,11 @@
},
"nixlib": {
"locked": {
"lastModified": 1679187309,
"narHash": "sha256-H8udmkg5wppL11d/05MMzOMryiYvc403axjDNZy1/TQ=",
"lastModified": 1680397293,
"narHash": "sha256-wBpJ73+tJ8fZSWb4tzNbAVahC4HSo2QG3nICDy4ExBQ=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "44214417fe4595438b31bdb9469be92536a61455",
"rev": "b18d328214ca3c627d3cc3f51fd9d1397fdbcd7a",
"type": "github"
},
"original": {
@ -607,11 +607,11 @@
]
},
"locked": {
"lastModified": 1679464055,
"narHash": "sha256-RiZpwkbm1GeKRqrTtGGsEDieJyplMSRG1bQzOZgY378=",
"lastModified": 1680764424,
"narHash": "sha256-2tNAE9zWbAK3JvQnhlnB1uzHzhwbA9zF6A17CoTjnbk=",
"owner": "nix-community",
"repo": "nixos-generators",
"rev": "d5cd198c80ee62a801a078ad991c99c0175971cf",
"rev": "15ae4065acbf414989a8677097804326fe7c0532",
"type": "github"
},
"original": {
@ -653,11 +653,11 @@
},
"nixpkgs-master": {
"locked": {
"lastModified": 1679866589,
"narHash": "sha256-igT2Idxfz8VcpXzYLa6kjMXrJCWDn1w3VfCUSqeC0MM=",
"lastModified": 1680964190,
"narHash": "sha256-gJkzOHS76KA8QKVwIr+2K3F4eoXbU+EDeDT1YaPuGIA=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "64ccc2dccc16cbc7f8a955fe9812a72efbbdfecf",
"rev": "3bf7fcf117e8e3d9106fa425157773134a67545a",
"type": "github"
},
"original": {
@ -701,11 +701,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1679172431,
"narHash": "sha256-XEh5gIt5otaUbEAPUY5DILUTyWe1goAyeqQtmwaFPyI=",
"lastModified": 1680669251,
"narHash": "sha256-AVNE+0u4HlI3v96KCXE9risH7NKqj0QDLLfSckYXIbA=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1603d11595a232205f03d46e635d919d1e1ec5b9",
"rev": "9c8ff8b426a8b07b9e0a131ac3218740dc85ba1e",
"type": "github"
},
"original": {
@ -733,11 +733,11 @@
},
"nixpkgs_4": {
"locked": {
"lastModified": 1678875422,
"narHash": "sha256-T3o6NcQPwXjxJMn2shz86Chch4ljXgZn746c2caGxd8=",
"lastModified": 1679793451,
"narHash": "sha256-JafTtgMDATE8dZOImBhWMA9RCn9AP8FVOpN+9K/tTlg=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "126f49a01de5b7e35a43fd43f891ecf6d3a51459",
"rev": "0cd51a933d91078775b300cf0f29aa3495231aa2",
"type": "github"
},
"original": {
@ -749,11 +749,11 @@
},
"nixpkgs_5": {
"locked": {
"lastModified": 1679705136,
"narHash": "sha256-MDlZUR7wJ3PlPtqwwoGQr3euNOe0vdSSteVVOef7tBY=",
"lastModified": 1680758185,
"narHash": "sha256-sCVWwfnk7zEX8Z+OItiH+pcSklrlsLZ4TJTtnxAYREw=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "8f40f2f90b9c9032d1b824442cfbbe0dbabd0dbd",
"rev": "0e19daa510e47a40e06257e205965f3b96ce0ac9",
"type": "github"
},
"original": {
@ -781,11 +781,11 @@
},
"nur": {
"locked": {
"lastModified": 1679863610,
"narHash": "sha256-XeBBouFuQ5pgp0C6C7ZEu5ZAGeYQ/cVDSQQIUWFDlOA=",
"lastModified": 1680932643,
"narHash": "sha256-vHkZJnPfA788UQ0zsfj4P09pVqBsn4niMp5qhN3ue28=",
"owner": "nix-community",
"repo": "NUR",
"rev": "c921aa621201227946ba88caf73757864f1b22d7",
"rev": "c468956d1604fb0182d24448a1cb45ab948bf4ca",
"type": "github"
},
"original": {
@ -831,11 +831,11 @@
"pre-commit-hooks": "pre-commit-hooks"
},
"locked": {
"lastModified": 1679794178,
"narHash": "sha256-R4eYiH5+6jiBZpJ+dR3NsvrJrmYxypDYfYdi6u9hi7M=",
"lastModified": 1680938755,
"narHash": "sha256-VmC1mVK9uoCIL04udK35RIl65dYHw6ufXSPX7AHH2YU=",
"owner": "AtaraxiaSjel",
"repo": "PrismLauncher",
"rev": "7e1010f80dcb3e54f8e77ca80fbf2b89b8f6f987",
"rev": "56c206f2a8e93cc3ce99fd80404bb8790f6245eb",
"type": "github"
},
"original": {
@ -896,11 +896,11 @@
"rycee": {
"flake": false,
"locked": {
"lastModified": 1679757179,
"narHash": "sha256-7ztq5VWSyQcRHHXu6OkvZTUnD7e2m1UfrnxgCv9lClo=",
"lastModified": 1680869241,
"narHash": "sha256-ZuI6yKkIbfD5Ptd0t9REphmLPdeenDYJOoblDFsV4Nc=",
"owner": "rycee",
"repo": "nur-expressions",
"rev": "37fc1f4c3004bcc7c9da02c0a2b32ba1e2d84ee4",
"rev": "3039fe7935fee324e0d267a6b34e975d32ff95b2",
"type": "gitlab"
},
"original": {
@ -935,11 +935,11 @@
},
"utils": {
"locked": {
"lastModified": 1676283394,
"narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
"lastModified": 1678901627,
"narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
"rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",
"type": "github"
},
"original": {
@ -1002,11 +1002,11 @@
"flake": false,
"locked": {
"host": "gitlab.freedesktop.org",
"lastModified": 1679340088,
"narHash": "sha256-/1KiYoBivDj8HC/eVK2Tr2WYkVdKJxq2Lb0tQs0qqJo=",
"lastModified": 1680810405,
"narHash": "sha256-LmI/4Yp/pOOoI4RxLRx9I90NBsiqdRLVOfbATKlgpkg=",
"owner": "wlroots",
"repo": "wlroots",
"rev": "1d64e12391a638201c679e71d4e22bb45e5faa8e",
"rev": "7abda952d0000b72d240fe1d41457b9288f0b6e5",
"type": "gitlab"
},
"original": {

1
flake.nix
View File

@ -99,6 +99,7 @@
"ydotoold.patch"
"gitea-208605.patch"
"waydroid-1.4.0.patch"
"bitwarden-pr224092.patch"
];
channelsConfig = { allowUnfree = true; };
channels.unstable.input = nixpkgs;

47
patches/bitwarden-pr224092.patch Normal file
View File

@ -0,0 +1,47 @@
From e22e3f4c62340456ab84d285422ff87f10591524 Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Fri, 31 Mar 2023 12:00:17 -0400
Subject: [PATCH] bitwarden: 2023.2.0 -> 2023.3.2
Additionally, remove unused `rec`.
---
pkgs/tools/security/bitwarden/default.nix | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix
index 3cbf1c46e640b..b7434491ba995 100644
--- a/pkgs/tools/security/bitwarden/default.nix
+++ b/pkgs/tools/security/bitwarden/default.nix
@@ -24,19 +24,19 @@ let
buildNpmPackage' = buildNpmPackage.override { nodejs = nodejs-16_x; };
- version = "2023.2.0";
+ version = "2023.3.2";
src = fetchFromGitHub {
owner = "bitwarden";
repo = "clients";
rev = "desktop-v${version}";
- sha256 = "/k2r+TikxVGlz8cnOq5zF3oUYw4zj31vDAD7OQFQlC4=";
+ sha256 = "sha256-KQDM7XDUA+yRv8y1K//rMCs4J36df42RVsiAXazJeYQ=";
};
- desktop-native = rustPlatform.buildRustPackage rec {
+ desktop-native = rustPlatform.buildRustPackage {
pname = "bitwarden-desktop-native";
inherit src version;
sourceRoot = "source/apps/desktop/desktop_native";
- cargoSha256 = "sha256-zLftfmWYYUAaMvIT21qhVsHzxnNdQhFBH0fRBwVduAc=";
+ cargoSha256 = "sha256-XsAmVYWPPnY0cgBzpO2aWx/fh85fKr8kMO98cDMzOKk=";
patchFlags = [ "-p4" ];
@@ -91,7 +91,7 @@ buildNpmPackage' {
npmBuildFlags = [
"--workspace apps/desktop"
];
- npmDepsHash = "sha256-aFjN1S0+lhHjK3VSYfx0F5X8wSJwRRr6zQpPGt2VpxE=";
+ npmDepsHash = "sha256-RmkTWhakZstCCMLQ3iJ8KD5Yt5ZafXc8NDgncJMLaxs=";
ELECTRON_SKIP_BINARY_DOWNLOAD = "1";

80
patches/vaultwarden.patch Normal file
View File

@ -0,0 +1,80 @@
diff --git a/nixos/modules/services/security/vaultwarden/default.nix b/nixos/modules/services/security/vaultwarden/default.nix
index aaa3f5507f7..d6a72f74370 100644
--- a/nixos/modules/services/security/vaultwarden/default.nix
+++ b/nixos/modules/services/security/vaultwarden/default.nix
@@ -25,7 +25,7 @@ let
configEnv = concatMapAttrs (name: value: optionalAttrs (value != null) {
${nameToEnvVar name} = if isBool value then boolToString value else toString value;
}) cfg.config;
- in { DATA_FOLDER = "/var/lib/bitwarden_rs"; } // optionalAttrs (!(configEnv ? WEB_VAULT_ENABLED) || configEnv.WEB_VAULT_ENABLED == "true") {
+ in { DATA_FOLDER = cfg.stateDir; } // optionalAttrs (!(configEnv ? WEB_VAULT_ENABLED) || configEnv.WEB_VAULT_ENABLED == "true") {
WEB_VAULT_FOLDER = "${cfg.webVaultPackage}/share/vaultwarden/vault";
} // configEnv;
@@ -57,6 +57,16 @@ in {
'';
};
+ stateDir = mkOption {
+ type = str;
+ default = "/var/lib/bitwarden_rs";
+ description = ''
+ The directury in which vaultwarden will keep its state. If left as the default value
+ this directory will automatically be created before the vaultwarden server starts, otherwise
+ the sysadmin is responsible for ensuring the directory exists with appropriate ownership and permissions.
+ '';
+ };
+
config = mkOption {
type = attrsOf (nullOr (oneOf [ bool int str ]));
default = {};
@@ -184,21 +194,25 @@ in {
aliases = [ "bitwarden_rs.service" ];
after = [ "network.target" ];
path = with pkgs; [ openssl ];
- serviceConfig = {
- User = user;
- Group = group;
- EnvironmentFile = [ configFile ] ++ optional (cfg.environmentFile != null) cfg.environmentFile;
- ExecStart = "${vaultwarden}/bin/vaultwarden";
- LimitNOFILE = "1048576";
- PrivateTmp = "true";
- PrivateDevices = "true";
- ProtectHome = "true";
- ProtectSystem = "strict";
- AmbientCapabilities = "CAP_NET_BIND_SERVICE";
- StateDirectory = "bitwarden_rs";
- StateDirectoryMode = "0700";
- Restart = "always";
- };
+ serviceConfig = mkMerge [
+ (mkIf (cfg.stateDir == "/var/lib/bitwarden_rs") {
+ StateDirectory = "bitwarden_rs";
+ StateDirectoryMode = "0700";
+ })
+ {
+ User = user;
+ Group = group;
+ EnvironmentFile = [ configFile ] ++ optional (cfg.environmentFile != null) cfg.environmentFile;
+ ExecStart = "${vaultwarden}/bin/vaultwarden";
+ LimitNOFILE = "1048576";
+ PrivateTmp = "true";
+ PrivateDevices = "true";
+ ProtectHome = "true";
+ ProtectSystem = "strict";
+ AmbientCapabilities = "CAP_NET_BIND_SERVICE";
+ Restart = "always";
+ }
+ ];
wantedBy = [ "multi-user.target" ];
};
@@ -206,7 +220,7 @@ in {
aliases = [ "backup-bitwarden_rs.service" ];
description = "Backup vaultwarden";
environment = {
- DATA_FOLDER = "/var/lib/bitwarden_rs";
+ DATA_FOLDER = cfg.stateDir;
BACKUP_FOLDER = cfg.backupDir;
};
path = with pkgs; [ sqlite ];

4
patches/zen-kernels.patch
View File

@ -6,10 +6,10 @@ index 1464bd4..ad21483 100644
};
# ./update-zen.py lqx
lqxVariant = {
- version = "6.2.7"; #lqx
- version = "6.2.9"; #lqx
+ version = "6.1.18"; #lqx
suffix = "lqx1"; #lqx
- sha256 = "0dk79cglqrbsmlz9vimd714km5v717r1066r4bas20r3gi0zlzhi"; #lqx
- sha256 = "1rw85gallk7r15adrvi8597zwkib2qsq9ir2lg7v2ivk85mivbq9"; #lqx
+ sha256 = "1gyjy01ys74apa65abgvxcj0y51vf5ixampyj3jd8lxzn4vvkih6"; #lqx
isLqx = true;
};

2
profiles/applications/packages.nix
View File

@ -61,7 +61,7 @@ with config.deviceSpecific; {
# foliate
jellyfin-media-player
joplin-desktop
libreoffice
# libreoffice
obs-studio
pinta
qbittorrent

101
profiles/sound/pipewire.nix
View File

@ -6,70 +6,43 @@
alsa.enable = true;
alsa.support32Bit = true;
pulse.enable = true;
# jack.enable = true;
config.pipewire-pulse = {
"context.modules" = [
{
"name" = "libpipewire-module-rtkit";
"args" = {};
"flags" = [
"ifexists"
"nofail"
];
}
{
"name" = "libpipewire-module-protocol-native";
}
{
"name" = "libpipewire-module-client-node";
}
{
"name" = "libpipewire-module-adapter";
}
{
"name" = "libpipewire-module-metadata";
}
{
"name" = "libpipewire-module-protocol-pulse";
"args" = {
"server.address" = [
"unix:native"
"tcp:127.0.0.1:8888" # IPv4 on a single address
];
"vm.overrides" = {
"pulse.min.quantum" = "1024/48000";
};
};
}
];
};
media-session.config.bluez-monitor.rules = [
{
# Matches all cards
matches = [ { "device.name" = "~bluez_card.*"; } ];
actions = {
"update-props" = {
"bluez5.reconnect-profiles" = [ "hfp_hf" "hsp_hs" "a2dp_sink" ];
"bluez5.hw-volume" = [ "hfp_ag" "hsp_ag" "a2dp_source" "a2dp_sink" ];
# mSBC is not expected to work on all headset + adapter combinations.
"bluez5.msbc-support" = true;
# SBC-XQ is not expected to work on all headset + adapter combinations.
"bluez5.sbc-xq-support" = true;
};
};
}
{
matches = [
# Matches all sources
{ "node.name" = "~bluez_input.*"; }
# Matches all outputs
{ "node.name" = "~bluez_output.*"; }
];
actions = {
"node.pause-on-idle" = false;
};
}
];
# TODO: create drop-in files in /etc/pipewire/pipewire.conf.d/
# config.pipewire-pulse = {
# "context.modules" = [
# {
# "name" = "libpipewire-module-rtkit";
# "args" = {};
# "flags" = [
# "ifexists"
# "nofail"
# ];
# }
# {
# "name" = "libpipewire-module-protocol-native";
# }
# {
# "name" = "libpipewire-module-client-node";
# }
# {
# "name" = "libpipewire-module-adapter";
# }
# {
# "name" = "libpipewire-module-metadata";
# }
# {
# "name" = "libpipewire-module-protocol-pulse";
# "args" = {
# "server.address" = [
# "unix:native"
# "tcp:127.0.0.1:8888" # IPv4 on a single address
# ];
# "vm.overrides" = {
# "pulse.min.quantum" = "1024/48000";
# };
# };
# }
# ];
# };
};
environment.etc = {