lot of updates. Fix Amnezia.
This commit is contained in:
@@ -46,7 +46,7 @@
|
|||||||
# TODO: make it universal
|
# TODO: make it universal
|
||||||
home.username = "krosh";
|
home.username = "krosh";
|
||||||
home.homeDirectory = "/home/krosh";
|
home.homeDirectory = "/home/krosh";
|
||||||
home.stateVersion = "25.05";
|
home.stateVersion = "25.11";
|
||||||
programs.home-manager.enable = true;
|
programs.home-manager.enable = true;
|
||||||
|
|
||||||
home.enableNixpkgsReleaseCheck = false;
|
home.enableNixpkgsReleaseCheck = false;
|
||||||
|
|||||||
@@ -17,14 +17,6 @@
|
|||||||
./hypridle.nix # done
|
./hypridle.nix # done
|
||||||
];
|
];
|
||||||
home.packages = with pkgs; [
|
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.writeScriptBin "wallpaper" (''
|
||||||
#!${pkgs.python311}/bin/python3
|
#!${pkgs.python311}/bin/python3
|
||||||
'' + (builtins.readFile ./scripts/wallpaper/wallpaper.py)))
|
'' + (builtins.readFile ./scripts/wallpaper/wallpaper.py)))
|
||||||
@@ -74,8 +66,8 @@
|
|||||||
submap = "global";
|
submap = "global";
|
||||||
debug = { disable_logs = false; };
|
debug = { disable_logs = false; };
|
||||||
|
|
||||||
monitor = [
|
monitor = lib.mkForce [
|
||||||
"eDP-1,preferred,auto,auto"
|
"eDP-1,preferred,auto,1.333333"
|
||||||
"HDMI-A-1,preferred,auto-left,auto"
|
"HDMI-A-1,preferred,auto-left,auto"
|
||||||
"HDMI-A-2,preferred,auto-left,auto"
|
"HDMI-A-2,preferred,auto-left,auto"
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -2,7 +2,8 @@
|
|||||||
|
|
||||||
{
|
{
|
||||||
services.hypridle = let
|
services.hypridle = let
|
||||||
lock_cmd = "hyprlock --grace 10";
|
# lock_cmd = "hyprlock --grace 10";
|
||||||
|
lock_cmd = "exit";
|
||||||
suspend_cmd = "systemctl suspend || loginctl suspend";
|
suspend_cmd = "systemctl suspend || loginctl suspend";
|
||||||
in {
|
in {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|||||||
@@ -80,7 +80,11 @@
|
|||||||
''
|
''
|
||||||
${super}, Return, exec, ~/.config/hypr/scripts/launch_first_available.sh "kitty" "foot" "alacritty" "wezterm" "konsole" "kgx" "uxterm" "xterm"
|
${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"''
|
${super}, E, exec, ~/.config/hypr/scripts/launch_first_available.sh "nemo" "dolphin" "nautilus" "thunar" "kitty -1 zsh -c yazi"''
|
||||||
''
|
''
|
||||||
|
|||||||
@@ -24,6 +24,7 @@
|
|||||||
pass
|
pass
|
||||||
gtypist
|
gtypist
|
||||||
# yubikey-manager-qt
|
# yubikey-manager-qt
|
||||||
|
# paprefs
|
||||||
];
|
];
|
||||||
|
|
||||||
services.syncthing = { enable = true; };
|
services.syncthing = { enable = true; };
|
||||||
|
|||||||
@@ -91,7 +91,7 @@
|
|||||||
amnezia = ''
|
amnezia = ''
|
||||||
(pgrep -x ".AmneziaVPN-ser" > /dev/null 2>&1 || sudo AmneziaVPN-service > /dev/null 2>&1 &) &
|
(pgrep -x ".AmneziaVPN-ser" > /dev/null 2>&1 || sudo AmneziaVPN-service > /dev/null 2>&1 &) &
|
||||||
AmneziaVPN > /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";
|
cnfg = "cd nixos-config && code . && exit";
|
||||||
x = "select_command";
|
x = "select_command";
|
||||||
u = "update_git_config";
|
u = "update_git_config";
|
||||||
|
|||||||
@@ -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 ];
|
||||||
|
}
|
||||||
+7
-21
@@ -1,6 +1,11 @@
|
|||||||
{ config, pkgs, lib, ... }:
|
{ config, pkgs, lib, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
|
imports = [ ./amnezia.nix ];
|
||||||
|
zramSwap.enable = true;
|
||||||
|
services.btrfs.autoScrub.enable = true;
|
||||||
|
services.btrfs.autoScrub.interval = "weekly";
|
||||||
|
|
||||||
# networkmanagerapplet and nm-applet
|
# networkmanagerapplet and nm-applet
|
||||||
|
|
||||||
virtualisation.virtualbox.host.enable = true;
|
virtualisation.virtualbox.host.enable = true;
|
||||||
@@ -53,7 +58,7 @@
|
|||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
kitty
|
kitty
|
||||||
amnezia-vpn
|
# amnezia-vpn
|
||||||
powertop
|
powertop
|
||||||
system76-scheduler
|
system76-scheduler
|
||||||
tlp
|
tlp
|
||||||
@@ -70,25 +75,6 @@
|
|||||||
|
|
||||||
# TODO: Добавить настройку вентиляторов
|
# 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 = {
|
programs.neovim = {
|
||||||
enable = true;
|
enable = true;
|
||||||
defaultEditor = true;
|
defaultEditor = true;
|
||||||
@@ -142,7 +128,7 @@
|
|||||||
|
|
||||||
consoleLogLevel = 3;
|
consoleLogLevel = 3;
|
||||||
initrd.verbose = false;
|
initrd.verbose = false;
|
||||||
kernelModules = [ "tun" ]; # check if tun really needed
|
# kernelModules = [ "tun" ]; # check if tun really needed
|
||||||
kernelPackages = pkgs.linuxPackages_latest;
|
kernelPackages = pkgs.linuxPackages_latest;
|
||||||
kernelParams = [
|
kernelParams = [
|
||||||
"quiet"
|
"quiet"
|
||||||
|
|||||||
Reference in New Issue
Block a user