diff --git a/flake.lock b/flake.lock index 21fa455..7d4f4ea 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1759761710, - "narHash": "sha256-6ZG7VZZsbg39gtziGSvCJKurhIahIuiCn+W6TGB5kOU=", + "lastModified": 1759843719, + "narHash": "sha256-uDCZabbZYy7i5OBF+zORWzbEQsmcq1sdvFVA/94jGDg=", "owner": "nix-community", "repo": "home-manager", - "rev": "929535c3082afdf0b18afec5ea1ef14d7689ff1c", + "rev": "5443ca20ed5c5da327de37a09910dc1c66fc3712", "type": "github" }, "original": { diff --git a/hosts/fenixpc/default.nix b/hosts/fenixpc/default.nix index 7588704..db17800 100644 --- a/hosts/fenixpc/default.nix +++ b/hosts/fenixpc/default.nix @@ -34,7 +34,7 @@ in }; }; - systemd.oomd.extraConfig.DefaultMemoryPressureLimit = "15%"; + systemd.oomd.settings.OOM.DefaultMemoryPressureLimit = "15%"; services = { printing.ricoh.enable = true; diff --git a/nix.nix b/nix.nix index fdd7101..70f13fc 100644 --- a/nix.nix +++ b/nix.nix @@ -25,6 +25,7 @@ "nix-command" "flakes" ]; + download-buffer-size = 524288000; log-lines = 30; min-free = mkDefault "${toString (5 * 1024 * 1024 * 1024)}"; max-free = mkDefault "${toString (10 * 1024 * 1024 * 1024)}"; diff --git a/roles/default.nix b/roles/default.nix index 870aa0f..faf91aa 100644 --- a/roles/default.nix +++ b/roles/default.nix @@ -10,7 +10,7 @@ enable = true; enableUserSlices = lib.mkDefault true; enableSystemSlice = lib.mkDefault true; - extraConfig = { + settings.OOM = { DefaultMemoryPressureDurationSec = lib.mkDefault "20s"; DefaultMemoryPressureLimit = lib.mkDefault "50%"; }; diff --git a/roles/desktop.nix b/roles/desktop.nix index ba6b3a9..9cd9f12 100644 --- a/roles/desktop.nix +++ b/roles/desktop.nix @@ -169,7 +169,7 @@ in mpv ffmpeg yt-dlp - avidemux + # avidemux krita krita-plugin-gmic inkscape diff --git a/specialisations/gnome.nix b/specialisations/gnome.nix deleted file mode 100644 index 31ada4e..0000000 --- a/specialisations/gnome.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ pkgs, lib, ... }: -{ - specialisation.gnome.configuration = { - system.nixos.tags = [ "gnome" ]; - services = { - displayManager = { - defaultSession = lib.mkForce "gnome"; - sddm.enable = lib.mkForce false; - - gdm = { - enable = true; - wayland = true; - autoSuspend = true; - banner = '' - Оставь надежду - Всяк сюда входящий - ''; - }; - }; - desktopManager = { - plasma6.enable = lib.mkForce false; - gnome.enable = true; - }; - - hardware.bolt.enable = true; - gnome = { - core-os-services.enable = true; - gnome-keyring.enable = true; - gnome-settings-daemon.enable = true; - core-shell.enable = true; - }; - }; - - programs.evolution = { - enable = true; - plugins = [ pkgs.evolution-ews ]; - }; - - environment = { - variables = { - XCURSOR_THEME = "Adwaita"; - }; - gnome.excludePackages = with pkgs; [ - geary - epiphany - gnome-calendar - ]; - }; - - xdg.portal = { - config.common = { - default = lib.mkForce [ - "gnome" - ]; - }; - extraPortals = lib.mkForce [ - pkgs.xdg-desktop-portal-gnome - ]; - }; - }; -}