Update system
This commit is contained in:
Generated
+1
@@ -1170,3 +1170,4 @@
|
|||||||
"root": "root",
|
"root": "root",
|
||||||
"version": 7
|
"version": 7
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -19,8 +19,8 @@
|
|||||||
environment.etc = {
|
environment.etc = {
|
||||||
"v2raya/ru_geoip.dat".source = pkgs.fetchurl {
|
"v2raya/ru_geoip.dat".source = pkgs.fetchurl {
|
||||||
name = "geoip.dat";
|
name = "geoip.dat";
|
||||||
url = "https://github.com/runetfreedom/russia-blocked-geoip/releases/download/202602271541/geoip.dat";
|
url = "https://github.com/runetfreedom/russia-blocked-geoip/releases/download/202603040949/geoip.dat";
|
||||||
hash = "sha256-j+Cjq8OeZFWTyb+QvXTbWDoLaVHPcqQLNSc5Y+p5c/8=";
|
hash = "sha256-TmWQqoC26+vrJ2xaRrIiPM2kp9xhrw9h9H8yjq4CA7U=";
|
||||||
};
|
};
|
||||||
|
|
||||||
"v2raya/bolt.db".source = config.sops.secrets.vpn_bolt.path;
|
"v2raya/bolt.db".source = config.sops.secrets.vpn_bolt.path;
|
||||||
|
|||||||
@@ -0,0 +1,40 @@
|
|||||||
|
{ pkgs, inputs, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
# Важно: портал должен быть собран под тот же Hyprland, что и сам Hyprland
|
||||||
|
# (есть отдельная опция именно для этого).
|
||||||
|
programs.hyprland = {
|
||||||
|
package = inputs.hyprland.packages.${pkgs.system}.hyprland;
|
||||||
|
portalPackage = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland;
|
||||||
|
};
|
||||||
|
|
||||||
|
xdg.portal = {
|
||||||
|
enable = true;
|
||||||
|
|
||||||
|
# Делает так, что xdg-open идёт через портал (часто полезно для sandbox/FHS/wrappers).
|
||||||
|
# Опция есть в NixOS как xdg.portal.xdgOpenUsePortal :contentReference[oaicite:2]{index=2}
|
||||||
|
xdgOpenUsePortal = true;
|
||||||
|
|
||||||
|
# Два бэкенда: Hyprland (композитор-специфичное) + GTK (интеграция/диалоги/OpenURI)
|
||||||
|
extraPortals = [
|
||||||
|
inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland
|
||||||
|
pkgs.xdg-desktop-portal-gtk
|
||||||
|
];
|
||||||
|
|
||||||
|
# Роутинг интерфейсов по portals.conf(5):
|
||||||
|
# xdg-desktop-portal выбирает конфиг по XDG_CURRENT_DESKTOP (с lower-case) :contentReference[oaicite:3]{index=3}
|
||||||
|
config = {
|
||||||
|
common = {
|
||||||
|
default = [ "gtk" ];
|
||||||
|
"org.freedesktop.impl.portal.FileChooser" = [ "gtk" ];
|
||||||
|
"org.freedesktop.impl.portal.ScreenCast" = [ "hyprland" ];
|
||||||
|
"org.freedesktop.impl.portal.Screenshot" = [ "hyprland" ];
|
||||||
|
"org.freedesktop.impl.portal.GlobalShortcuts" = [ "hyprland" ];
|
||||||
|
};
|
||||||
|
|
||||||
|
# Если XDG_CURRENT_DESKTOP=Hyprland присутствует — предпочитаем Hyprland,
|
||||||
|
# но оставляем gtk как fallback для интерфейсов, которых нет у hyprland-портала.
|
||||||
|
hyprland.default = [ "hyprland" "gtk" ];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -16,7 +16,6 @@
|
|||||||
|
|
||||||
./user/packages/art.nix
|
./user/packages/art.nix
|
||||||
./user/packages/desktop.nix
|
./user/packages/desktop.nix
|
||||||
./user/packages/coding.nix
|
|
||||||
./user/packages/utils.nix
|
./user/packages/utils.nix
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +0,0 @@
|
|||||||
{ pkgs, ... }: {
|
|
||||||
home.packages = with pkgs; [
|
|
||||||
jetbrains.idea-oss
|
|
||||||
android-studio
|
|
||||||
];
|
|
||||||
}
|
|
||||||
@@ -4,6 +4,7 @@
|
|||||||
vesktop
|
vesktop
|
||||||
obs-studio
|
obs-studio
|
||||||
mpv
|
mpv
|
||||||
|
imhex
|
||||||
obsidian
|
obsidian
|
||||||
qbittorrent
|
qbittorrent
|
||||||
thunderbird
|
thunderbird
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
{ config, pkgs, ... }: {
|
{ config, osConfig, pkgs, lib, ... }: {
|
||||||
home.packages = [ pkgs.nh ];
|
home.packages = [ pkgs.nh ];
|
||||||
|
|
||||||
programs = {
|
programs = {
|
||||||
zoxide.enable = true;
|
zoxide.enable = true;
|
||||||
fzf.enable = true;
|
fzf.enable = true;
|
||||||
@@ -62,11 +63,12 @@
|
|||||||
cd = "z";
|
cd = "z";
|
||||||
lg = "lazygit";
|
lg = "lazygit";
|
||||||
s = "nix-shell . --run zsh";
|
s = "nix-shell . --run zsh";
|
||||||
|
} // lib.optionalAttrs osConfig.boot.loader.grub.useOSProber {
|
||||||
|
win = "sudo grub-reboot 2; sudo reboot";
|
||||||
};
|
};
|
||||||
|
|
||||||
initContent = ''
|
initContent = /*bash*/ ''
|
||||||
eval "$(zoxide init zsh)"
|
eval "$(zoxide init zsh)"
|
||||||
eval "$(nh completions zsh)"
|
|
||||||
source "$(fzf-share)/key-bindings.zsh"
|
source "$(fzf-share)/key-bindings.zsh"
|
||||||
source "$(fzf-share)/completion.zsh"
|
source "$(fzf-share)/completion.zsh"
|
||||||
'';
|
'';
|
||||||
|
|||||||
+1
-2
@@ -2,11 +2,10 @@
|
|||||||
imports = [
|
imports = [
|
||||||
../../modules/user/packages/cs_utils.nix
|
../../modules/user/packages/cs_utils.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
disabledModules = [
|
disabledModules = [
|
||||||
../../modules/user/packages/art.nix
|
../../modules/user/packages/art.nix
|
||||||
../../modules/user/packages/coding.nix
|
|
||||||
];
|
];
|
||||||
|
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
nautilus
|
nautilus
|
||||||
python3
|
python3
|
||||||
|
|||||||
@@ -4,7 +4,9 @@
|
|||||||
];
|
];
|
||||||
programs.hyprlock.enable = true;
|
programs.hyprlock.enable = true;
|
||||||
home.packages = with pkgs; [
|
home.packages = with pkgs; [
|
||||||
|
android-studio
|
||||||
vivaldi
|
vivaldi
|
||||||
|
weechat
|
||||||
];
|
];
|
||||||
|
|
||||||
xdg.mimeApps = {
|
xdg.mimeApps = {
|
||||||
|
|||||||
Reference in New Issue
Block a user