This commit is contained in:
2026-01-15 20:39:10 +03:00
parent b051d3d55f
commit 5755610075
22 changed files with 643 additions and 572 deletions
+1
View File
@@ -95,6 +95,7 @@ let
throttled.enable = true; throttled.enable = true;
journald = { journald = {
extraConfig = '' extraConfig = ''
SystemMaxUse=512M SystemMaxUse=512M
''; '';
}; };
+1
View File
@@ -43,6 +43,7 @@ let
earlyoom.enable = true; earlyoom.enable = true;
journald = { journald = {
extraConfig = '' extraConfig = ''
SystemMaxUse=512M SystemMaxUse=512M
''; '';
}; };
+1
View File
@@ -24,6 +24,7 @@ let
services = { services = {
journald = { journald = {
extraConfig = '' extraConfig = ''
SystemMaxUse=512M SystemMaxUse=512M
''; '';
}; };
+4
View File
@@ -41,6 +41,10 @@
# url = "github:nix-community/NUR"; # url = "github:nix-community/NUR";
# inputs.nixpkgs.follows = "nixpkgs"; # inputs.nixpkgs.follows = "nixpkgs";
# }; # };
noctalia = {
url = "github:noctalia-dev/noctalia-shell";
inputs.nixpkgs.follows = "nixpkgs";
};
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; # flake:home-manager url = "github:nix-community/home-manager"; # flake:home-manager
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
+66
View File
@@ -0,0 +1,66 @@
{
config,
pkgs,
...
}:
{
imports = [
inputs.noctalia.homeModules.default
];
programs.noctalia-shell = {
enable = true;
settings = {
# configure noctalia here
bar = {
density = "compact";
position = "right";
showCapsule = false;
widgets = {
left = [
{
id = "ControlCenter";
useDistroLogo = true;
}
{
id = "WiFi";
}
{
id = "Bluetooth";
}
];
center = [
{
hideUnoccupied = false;
id = "Workspace";
labelMode = "none";
}
];
right = [
{
alwaysShowPercentage = false;
id = "Battery";
warningThreshold = 30;
}
{
formatHorizontal = "HH:mm";
formatVertical = "HH mm";
id = "Clock";
useMonospacedFont = true;
usePrimaryColor = true;
}
];
};
};
colorSchemes.predefinedScheme = "Monochrome";
general = {
avatarImage = "/home/drfoobar/.face";
radiusRatio = 0.2;
};
location = {
monthBeforeDay = true;
name = "Marseille, France";
};
};
# this may also be a string or a path to a JSON file.
};
}
+2
View File
@@ -33,6 +33,7 @@ in
./modules/plasma-manager.nix ./modules/plasma-manager.nix
# ./modules/external.nix # ./modules/external.nix
./modules/external-mini-laptop.nix ./modules/external-mini-laptop.nix
./modules/noctalia.nix
]; ];
xdg = { xdg = {
enable = true; enable = true;
@@ -63,6 +64,7 @@ in
}; };
home.activation = { home.activation = {
yaziSync = '' yaziSync = ''
${pkgs.rsync}/bin/rsync -Lrv "${config.home.homeDirectory}/.config/yazi/" "${xlib.dirs.user-storage}/yazi/" ${pkgs.rsync}/bin/rsync -Lrv "${config.home.homeDirectory}/.config/yazi/" "${xlib.dirs.user-storage}/yazi/"
''; '';
}; };
+1
View File
@@ -40,6 +40,7 @@ in
}; };
home.activation = { home.activation = {
yaziSync = '' yaziSync = ''
${pkgs.rsync}/bin/rsync -Lrv --no-A --no-X "${config.home.homeDirectory}/.config/yazi/" "${xlib.dirs.storage}/yazi/" ${pkgs.rsync}/bin/rsync -Lrv --no-A --no-X "${config.home.homeDirectory}/.config/yazi/" "${xlib.dirs.storage}/yazi/"
''; '';
}; };
+1
View File
@@ -43,6 +43,7 @@ in
}; };
home.activation = { home.activation = {
yaziSync = '' yaziSync = ''
${pkgs.rsync}/bin/rsync -Lrv "${config.home.homeDirectory}/.config/yazi/" "${xlib.dirs.wsl-storage}/yazi/" ${pkgs.rsync}/bin/rsync -Lrv "${config.home.homeDirectory}/.config/yazi/" "${xlib.dirs.wsl-storage}/yazi/"
''; '';
}; };
+1
View File
@@ -5,6 +5,7 @@
imports = [ imports = [
# ./kde.nix # ./kde.nix
./gnome.nix ./gnome.nix
./noctalia.nix
#./xfce.nix #./xfce.nix
#./deepin.nix #./deepin.nix
]; ];
-38
View File
@@ -1,38 +0,0 @@
{
config,
lib,
pkgs,
...
}:
{
# qt = {
# enable = true;
# style = "breeze";
# platformTheme = "kde6"; # kde6
# };
environment.plasma6.excludePackages = with pkgs; [
kdePackages.plasma-browser-integration
kdePackages.elisa
kdePackages.ksshaskpass
kdePackages.kwallet
kdePackages.kwallet-pam
kdePackages.kwalletmanager
# libsForQt5.kwallet
# libsForQt5.kwallet-pam # error
# libsForQt5.kwalletmanager
];
services = {
displayManager = {
sddm = {
enable = true;
theme = "WhiteSur-light";
wayland = {
enable = true;
compositor = "kwin";
};
};
};
desktopManager.plasma6.enable = true;
};
programs.partition-manager.enable = true;
}
+12
View File
@@ -0,0 +1,12 @@
{
config,
lib,
pkgs,
...
}:
{
environment.systemPackages = with pkgs; [
inputs.noctalia.packages.${pkgs.stdenv.hostPlatform.system}.default
# ... maybe other stuff
];
}
+1
View File
@@ -93,6 +93,7 @@ in
nano = { nano = {
enable = true; enable = true;
nanorc = '' nanorc = ''
set nowrap set nowrap
set tabstospaces set tabstospaces
set tabsize 2 set tabsize 2
+1
View File
@@ -38,6 +38,7 @@
polkit = { polkit = {
enable = true; enable = true;
extraConfig = '' extraConfig = ''
polkit.addRule(function(action, subject) { polkit.addRule(function(action, subject) {
if (subject.isInGroup("wheel")){ // for sudo if (subject.isInGroup("wheel")){ // for sudo
return polkit.Result.YES; return polkit.Result.YES;
+1
View File
@@ -19,6 +19,7 @@
theme = "robbyrussell"; theme = "robbyrussell";
}; };
shellInit = '' shellInit = ''
beet-n() { beet-n() {
echo "$*" | aichat -cer beets echo "$*" | aichat -cer beets
} }
+1
View File
@@ -153,6 +153,7 @@ in
]; ];
requires = [ "coolwsd.service" ]; requires = [ "coolwsd.service" ];
script = '' script = ''
${occ}/bin/nextcloud-occ config:app:set richdocuments wopi_url --value ${lib.escapeShellArg wopi_url} ${occ}/bin/nextcloud-occ config:app:set richdocuments wopi_url --value ${lib.escapeShellArg wopi_url}
${occ}/bin/nextcloud-occ config:app:set richdocuments public_wopi_url --value ${lib.escapeShellArg public_wopi_url} ${occ}/bin/nextcloud-occ config:app:set richdocuments public_wopi_url --value ${lib.escapeShellArg public_wopi_url}
${occ}/bin/nextcloud-occ config:app:set richdocuments wopi_allowlist --value ${lib.escapeShellArg wopi_allowlist} ${occ}/bin/nextcloud-occ config:app:set richdocuments wopi_allowlist --value ${lib.escapeShellArg wopi_allowlist}
+2
View File
@@ -13,6 +13,7 @@
description = "Backup data using rsync"; description = "Backup data using rsync";
requisite = [ "mnt-archive.mount" ]; # hard-code requisite = [ "mnt-archive.mount" ]; # hard-code
script = '' script = ''
${pkgs.rsync}/bin/rsync -rtv --delete ${xlib.dirs.services-folder}/ ${xlib.dirs.archive-drive}/Services/ ${pkgs.rsync}/bin/rsync -rtv --delete ${xlib.dirs.services-folder}/ ${xlib.dirs.archive-drive}/Services/
''; '';
serviceConfig = { serviceConfig = {
@@ -28,6 +29,7 @@
description = "Backup data using rsync"; description = "Backup data using rsync";
requisite = [ "mnt-mobile.mount" ]; # hard-code requisite = [ "mnt-mobile.mount" ]; # hard-code
script = '' script = ''
${pkgs.rsync}/bin/rsync -rtv --delete ${xlib.dirs.server-home}/Music/ ${xlib.dirs.mobile-drive}/Music/ ${pkgs.rsync}/bin/rsync -rtv --delete ${xlib.dirs.server-home}/Music/ ${xlib.dirs.mobile-drive}/Music/
${pkgs.rsync}/bin/rsync -rtv --delete "${xlib.dirs.server-home}/Hosts/epral/Neo Backup/" "${xlib.dirs.mobile-drive}/Neo Backup/" ${pkgs.rsync}/bin/rsync -rtv --delete "${xlib.dirs.server-home}/Hosts/epral/Neo Backup/" "${xlib.dirs.mobile-drive}/Neo Backup/"
''; '';
+3
View File
@@ -36,15 +36,18 @@
WorkingDirectory = "${xlib.dirs.user-services}/zapret"; WorkingDirectory = "${xlib.dirs.user-services}/zapret";
User = "root"; User = "root";
ExecStart = '' ExecStart = ''
/run/current-system/sw/bin/bash ${xlib.dirs.user-services}/zapret/main_script.sh -nointeractive /run/current-system/sw/bin/bash ${xlib.dirs.user-services}/zapret/main_script.sh -nointeractive
''; '';
ExecStop = '' ExecStop = ''
/run/current-system/sw/bin/bash ${xlib.dirs.user-services}/zapret/stop_and_clean_nft.sh /run/current-system/sw/bin/bash ${xlib.dirs.user-services}/zapret/stop_and_clean_nft.sh
''; '';
# ExecStopPost = '' # ExecStopPost = ''
# /run/current-system/sw/bin/echo "Сервис завершён" # /run/current-system/sw/bin/echo "Сервис завершён"
# ''; # '';
PIDFile = '' PIDFile = ''
/run/zapret_discord_youtube.pid /run/zapret_discord_youtube.pid
''; '';
# Restart = "on-failure"; # Restart = "on-failure";
+1
View File
@@ -64,6 +64,7 @@
TimeoutSec = 300; TimeoutSec = 300;
}; };
script = '' script = ''
cd /mnt/containers/3x-ui cd /mnt/containers/3x-ui
podman build -t compose2nix/3xui_app -f ./Dockerfile . podman build -t compose2nix/3xui_app -f ./Dockerfile .
''; '';
+9
View File
@@ -24,6 +24,7 @@ in
root = "${inputs.zeroq-credentials.services.xray.subs}"; root = "${inputs.zeroq-credentials.services.xray.subs}";
locations."/" = { locations."/" = {
extraConfig = '' extraConfig = ''
auth_basic "Restricted"; auth_basic "Restricted";
auth_basic_user_file /etc/nginx/pubray; auth_basic_user_file /etc/nginx/pubray;
@@ -40,6 +41,7 @@ in
proxyWebsockets = true; proxyWebsockets = true;
}; };
extraConfig = '' extraConfig = ''
client_max_body_size 5G; client_max_body_size 5G;
''; '';
}; };
@@ -73,6 +75,7 @@ in
proxyWebsockets = true; proxyWebsockets = true;
}; };
extraConfig = '' extraConfig = ''
client_max_body_size 5G; client_max_body_size 5G;
''; '';
}; };
@@ -86,6 +89,7 @@ in
}; };
}; };
extraConfig = '' extraConfig = ''
client_max_body_size 5G; client_max_body_size 5G;
proxy_set_header X-Forwarded-Proto $scheme; proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Real-IP $remote_addr;
@@ -100,6 +104,7 @@ in
proxyWebsockets = true; proxyWebsockets = true;
}; };
extraConfig = '' extraConfig = ''
client_max_body_size 5G; client_max_body_size 5G;
''; '';
}; };
@@ -117,6 +122,7 @@ in
}; };
}; };
extraConfig = '' extraConfig = ''
client_max_body_size 5G; client_max_body_size 5G;
''; '';
}; };
@@ -128,6 +134,7 @@ in
proxyWebsockets = true; proxyWebsockets = true;
}; };
extraConfig = '' extraConfig = ''
client_max_body_size 5G; client_max_body_size 5G;
''; '';
}; };
@@ -139,6 +146,7 @@ in
proxyWebsockets = true; proxyWebsockets = true;
}; };
extraConfig = '' extraConfig = ''
client_max_body_size 5G; client_max_body_size 5G;
''; '';
}; };
@@ -150,6 +158,7 @@ in
proxyWebsockets = true; proxyWebsockets = true;
}; };
extraConfig = '' extraConfig = ''
client_max_body_size 5G; client_max_body_size 5G;
''; '';
}; };