From 732f6f89a5791e67827aa2b6ef3505c9ca0941e1 Mon Sep 17 00:00:00 2001 From: Krosh Date: Wed, 10 Dec 2025 13:01:37 +0300 Subject: [PATCH] lot of updates. Fix Amnezia. --- home-manager/home.nix | 2 +- home-manager/modules/hypr/hypr.nix | 12 ++------ home-manager/modules/hypr/hypridle.nix | 3 +- .../modules/hypr/hyprland/keybinds.nix | 6 +++- home-manager/modules/programs.nix | 1 + home-manager/modules/zsh/zsh.nix | 2 +- nixos/amnezia.nix | 21 ++++++++++++++ nixos/custom.nix | 28 +++++-------------- 8 files changed, 40 insertions(+), 35 deletions(-) create mode 100644 nixos/amnezia.nix diff --git a/home-manager/home.nix b/home-manager/home.nix index b34eed4..a7af4e1 100755 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -46,7 +46,7 @@ # TODO: make it universal home.username = "krosh"; home.homeDirectory = "/home/krosh"; - home.stateVersion = "25.05"; + home.stateVersion = "25.11"; programs.home-manager.enable = true; home.enableNixpkgsReleaseCheck = false; diff --git a/home-manager/modules/hypr/hypr.nix b/home-manager/modules/hypr/hypr.nix index 6ed183d..d794024 100644 --- a/home-manager/modules/hypr/hypr.nix +++ b/home-manager/modules/hypr/hypr.nix @@ -17,14 +17,6 @@ ./hypridle.nix # done ]; home.packages = with pkgs; [ - # (writeShellScriptBin "next_wallpaper" - # (builtins.readFile ./scripts/wallpaper/next_wallpaper.sh)) - # (writeShellScriptBin "move_wallpaper" - # (builtins.readFile ./scripts/wallpaper/move_wallpaper.sh)) - # (writeShellScriptBin "fetch_wallpaper" - # (builtins.readFile ./scripts/wallpaper/fetch_wallpaper.sh)) - # (writeShellScriptBin "wallpaper" - # (builtins.readFile ./scripts/wallpaper/wallpaper.py)) (pkgs.writeScriptBin "wallpaper" ('' #!${pkgs.python311}/bin/python3 '' + (builtins.readFile ./scripts/wallpaper/wallpaper.py))) @@ -74,8 +66,8 @@ submap = "global"; debug = { disable_logs = false; }; - monitor = [ - "eDP-1,preferred,auto,auto" + monitor = lib.mkForce [ + "eDP-1,preferred,auto,1.333333" "HDMI-A-1,preferred,auto-left,auto" "HDMI-A-2,preferred,auto-left,auto" ]; diff --git a/home-manager/modules/hypr/hypridle.nix b/home-manager/modules/hypr/hypridle.nix index cb00e94..acbb3ec 100644 --- a/home-manager/modules/hypr/hypridle.nix +++ b/home-manager/modules/hypr/hypridle.nix @@ -2,7 +2,8 @@ { services.hypridle = let - lock_cmd = "hyprlock --grace 10"; + # lock_cmd = "hyprlock --grace 10"; + lock_cmd = "exit"; suspend_cmd = "systemctl suspend || loginctl suspend"; in { enable = true; diff --git a/home-manager/modules/hypr/hyprland/keybinds.nix b/home-manager/modules/hypr/hyprland/keybinds.nix index 50e732c..a4361a6 100644 --- a/home-manager/modules/hypr/hyprland/keybinds.nix +++ b/home-manager/modules/hypr/hyprland/keybinds.nix @@ -80,7 +80,11 @@ '' ${super}, Return, exec, ~/.config/hypr/scripts/launch_first_available.sh "kitty" "foot" "alacritty" "wezterm" "konsole" "kgx" "uxterm" "xterm" '' - "${super}, T, exec, telegram-desktop" + + '' + RCtrl, Return, exec, ~/.config/hypr/scripts/launch_first_available.sh "kitty" "foot" "alacritty" "wezterm" "konsole" "kgx" "uxterm" "xterm" + '' + "${super}, T, exec, Telegram" '' ${super}, E, exec, ~/.config/hypr/scripts/launch_first_available.sh "nemo" "dolphin" "nautilus" "thunar" "kitty -1 zsh -c yazi"'' '' diff --git a/home-manager/modules/programs.nix b/home-manager/modules/programs.nix index f739717..23a7536 100644 --- a/home-manager/modules/programs.nix +++ b/home-manager/modules/programs.nix @@ -24,6 +24,7 @@ pass gtypist # yubikey-manager-qt + # paprefs ]; services.syncthing = { enable = true; }; diff --git a/home-manager/modules/zsh/zsh.nix b/home-manager/modules/zsh/zsh.nix index fea85f6..254aedf 100644 --- a/home-manager/modules/zsh/zsh.nix +++ b/home-manager/modules/zsh/zsh.nix @@ -91,7 +91,7 @@ amnezia = '' (pgrep -x ".AmneziaVPN-ser" > /dev/null 2>&1 || sudo AmneziaVPN-service > /dev/null 2>&1 &) & AmneziaVPN > /dev/null 2>&1 & - ''; # TODO: start system with serviceps://github.com/dylanaraps/pywal/wiki/Customization + ''; # TODO: start system with service cnfg = "cd nixos-config && code . && exit"; x = "select_command"; u = "update_git_config"; diff --git a/nixos/amnezia.nix b/nixos/amnezia.nix new file mode 100644 index 0000000..351e5a7 --- /dev/null +++ b/nixos/amnezia.nix @@ -0,0 +1,21 @@ +{ config, lib, pkgs, ... }: + +let package = pkgs.amnezia-vpn; +in { + environment.systemPackages = [ package ]; + + services.dbus.packages = [ package ]; + + services.resolved.enable = true; + + systemd = { + packages = [ package ]; + + services."AmneziaVPN" = { + wantedBy = [ "multi-user.target" ]; + path = with pkgs; [ procps iproute2 sudo ]; + }; + }; + + meta.maintainers = with lib.maintainers; [ sund3RRR ]; +} diff --git a/nixos/custom.nix b/nixos/custom.nix index 113451d..a15cf51 100644 --- a/nixos/custom.nix +++ b/nixos/custom.nix @@ -1,6 +1,11 @@ { config, pkgs, lib, ... }: { + imports = [ ./amnezia.nix ]; + zramSwap.enable = true; + services.btrfs.autoScrub.enable = true; + services.btrfs.autoScrub.interval = "weekly"; + # networkmanagerapplet and nm-applet virtualisation.virtualbox.host.enable = true; @@ -53,7 +58,7 @@ nixpkgs.config.allowUnfree = true; environment.systemPackages = with pkgs; [ kitty - amnezia-vpn + # amnezia-vpn powertop system76-scheduler tlp @@ -70,25 +75,6 @@ # TODO: Добавить настройку вентиляторов - security.sudo.extraRules = [{ - users = [ "ALL" ]; - commands = [{ - command = "/run/current-system/sw/bin/AmneziaVPN-service"; - options = [ "NOPASSWD" ]; - }]; - }]; # TODO: fix amnezia-service loading on startup - - # systemd.services.amnezia-vpn-service = { - # description = "Amnezia VPN Service"; - # after = [ "network-online.target" ]; - # wantedBy = [ "multi-user.target" ]; - # serviceConfig = { - # ExecStart = "${pkgs.amnezia-vpn}/bin/AmneziaVPN-service"; - # Restart = "on-failure"; - # User = "root"; - # }; - # }; - programs.neovim = { enable = true; defaultEditor = true; @@ -142,7 +128,7 @@ consoleLogLevel = 3; initrd.verbose = false; - kernelModules = [ "tun" ]; # check if tun really needed + # kernelModules = [ "tun" ]; # check if tun really needed kernelPackages = pkgs.linuxPackages_latest; kernelParams = [ "quiet"