From cb05fc79fa92de70f22c9214f946ed087b071904 Mon Sep 17 00:00:00 2001 From: Buliway Date: Mon, 7 Oct 2024 16:41:38 +0300 Subject: [PATCH] =?UTF-8?q?=D0=B7=D0=B0=D0=BA=D0=BE=D0=BC=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D1=82=D0=B8=D0=BB=20=D0=BB=D0=B8=D1=88=D0=BD=D0=B5=D0=B5?= =?UTF-8?q?=20=D1=87=D1=82=D0=BE=D0=B1=20=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE=20?= =?UTF-8?q?=D0=B1=D1=8B=D0=BB=D0=BE=20=D1=81=D1=82=D0=B0=D0=B2=D0=B8=D1=82?= =?UTF-8?q?=D1=8C=20=D1=81=D0=B8=D1=81=D1=82=D0=B5=D0=BC=D1=83=20=D1=81=20?= =?UTF-8?q?=D0=BC=D0=B8=D0=BD=D0=B8=D0=BC=D1=83=D0=BC=20=D0=B8=D0=B7=D0=BC?= =?UTF-8?q?=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../home-manager => archive}/browsers/chromium.nix | 0 .../home-manager => archive}/browsers/firefox.nix | 0 .../home-manager => archive}/browsers/librewolf.nix | 0 modules/home-manager/bundle.nix | 8 ++------ modules/home-manager/wm/bspwm/bspwm.nix | 11 ++++++----- modules/nixos/bundle.nix | 6 +++--- modules/nixos/hardware.nix | 10 +++++----- modules/nixos/virtualisation.nix | 9 ++++++--- modules/nixos/xserver.nix | 4 ++-- nixos/configuration.nix | 8 ++++---- 10 files changed, 28 insertions(+), 28 deletions(-) rename {modules/home-manager => archive}/browsers/chromium.nix (100%) rename {modules/home-manager => archive}/browsers/firefox.nix (100%) rename {modules/home-manager => archive}/browsers/librewolf.nix (100%) diff --git a/modules/home-manager/browsers/chromium.nix b/archive/browsers/chromium.nix similarity index 100% rename from modules/home-manager/browsers/chromium.nix rename to archive/browsers/chromium.nix diff --git a/modules/home-manager/browsers/firefox.nix b/archive/browsers/firefox.nix similarity index 100% rename from modules/home-manager/browsers/firefox.nix rename to archive/browsers/firefox.nix diff --git a/modules/home-manager/browsers/librewolf.nix b/archive/browsers/librewolf.nix similarity index 100% rename from modules/home-manager/browsers/librewolf.nix rename to archive/browsers/librewolf.nix diff --git a/modules/home-manager/bundle.nix b/modules/home-manager/bundle.nix index 7fbcd2c..fe93546 100644 --- a/modules/home-manager/bundle.nix +++ b/modules/home-manager/bundle.nix @@ -1,13 +1,9 @@ { imports = [ - # ./browsers/chromium.nix - # ./browsers/firefox.nix - # ./browsers/librewolf.nix ./browsers/lynx.nix ./ranger/ranger.nix - ./gui/vscode.nix ./imv/imv.nix @@ -30,6 +26,6 @@ ./wm/sxhkd.nix ./mangohud.nix - ./symlinks.nix +# ./symlinks.nix ]; -} \ No newline at end of file +} diff --git a/modules/home-manager/wm/bspwm/bspwm.nix b/modules/home-manager/wm/bspwm/bspwm.nix index 3508845..8282f93 100644 --- a/modules/home-manager/wm/bspwm/bspwm.nix +++ b/modules/home-manager/wm/bspwm/bspwm.nix @@ -7,10 +7,10 @@ # Как я понял, эти команды выполняются в начале bspwmrc # Ниже настройки для основного монитора. Мб вместе с --primary надо # И настройки для второго (правого) монитора - extraConfigEarly = '' - xrandr --output DisplayPort-2 --mode 1920x1080 --rate 165 - xrandr --output HDMI-A-0 --mode 1920x1080 --rate 100 --right-of DisplayPort-2 - ''; + # extraConfigEarly = '' + # xrandr --output DisplayPort-2 --mode 1920x1080 --rate 165 + # xrandr --output HDMI-A-0 --mode 1920x1080 --rate 100 --right-of DisplayPort-2 + # ''; # Эти команды выполняются в конце bspwmrc extraConfig = '' @@ -27,6 +27,7 @@ # "nekoray" # "obsidian" # "planify" + # "spice-vdagent" # Для виртуалки ]; monitors = let @@ -126,4 +127,4 @@ pointer_action3 = "resize_corner"; }; }; -} \ No newline at end of file +} diff --git a/modules/nixos/bundle.nix b/modules/nixos/bundle.nix index c93a781..0182089 100644 --- a/modules/nixos/bundle.nix +++ b/modules/nixos/bundle.nix @@ -1,9 +1,9 @@ { imports = [ # ./env.nix # Мб не надо, ибо редачу через home.nix? - ./filesystems.nix +# ./filesystems.nix ./hardware.nix - ./hibernate.nix +# ./hibernate.nix ./locale.nix ./network.nix ./sound.nix @@ -11,4 +11,4 @@ ./virtualisation.nix ./xserver.nix ]; -} \ No newline at end of file +} diff --git a/modules/nixos/hardware.nix b/modules/nixos/hardware.nix index bfd0d73..cf0560a 100644 --- a/modules/nixos/hardware.nix +++ b/modules/nixos/hardware.nix @@ -4,15 +4,15 @@ { pkgs, ... }: { hardware = { # Параметры для 24.05 и unstable могут сильно отличаться - amdgpu = { - opencl.enable = true; # # Enable OpenCL support using ROCM runtime library. +# amdgpu = { +# opencl.enable = true; # # Enable OpenCL support using ROCM runtime library. # amdvlk = { # Гавно лаганое, лучше radv юзать (radeon vulkan) # enable = true; # Enable AMDVLK Vulkan driver. # support32Bit.enable = true; # Enable 32-bit driver support. # supportExperimental.enable = true; # Enable Experimental features support. # # settings = {}; # Runtime settings for AMDVLK to be configured /etc/amd/amdVulkanSettings.cfg. # }; - }; +# }; graphics = { # hardware.opengl переименован в hardware.graphics в unstable ветке enable = true; @@ -51,7 +51,7 @@ # "L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}" # ]; - boot.initrd.kernelModules = [ "amdgpu" ]; # Мб не обязательно +# boot.initrd.kernelModules = [ "amdgpu" ]; # Мб не обязательно # Для AMD существует два драйвера Vulkan # Один официальный от AMD - amdvlk @@ -60,4 +60,4 @@ # В некоторых играх лучше работает radv, в некоторых amdvlk # Штука ниже не обязательна для работы radv, но я сохранил # environment.variables.AMD_VULKAN_ICD = "RADV"; -} \ No newline at end of file +} diff --git a/modules/nixos/virtualisation.nix b/modules/nixos/virtualisation.nix index 409600b..2bfabce 100644 --- a/modules/nixos/virtualisation.nix +++ b/modules/nixos/virtualisation.nix @@ -45,10 +45,13 @@ # services = { # openssh.enable = true; # Потом удали. Это ставится на виртуалку, чтоб к ней конект по ssh работал. - # qemuGuest.enable = true; # Time syncing and scripting # spice-vdagentd.enable = true; # Clipboard sharing + # # Ниже я не включаю # spice-webdavd.enable = true; # VirtFS alternative for directory sharing - # qemuGuest.package = pkgs.qemu_full; # Time syncing and scripting + # qemuGuest = { + # enable = true; # Time syncing and scripting + # package = pkgs.qemu_full; # Time syncing and scripting + # }; # }; -} \ No newline at end of file +} diff --git a/modules/nixos/xserver.nix b/modules/nixos/xserver.nix index 5f414d8..cc8edb0 100644 --- a/modules/nixos/xserver.nix +++ b/modules/nixos/xserver.nix @@ -49,7 +49,7 @@ # https://discourse.nixos.org/t/amd-gpu-optimal-settings/27648/3 # videoDrivers = [ "nvidia" ]; # https://nixos.wiki/wiki/Nvidia - videoDrivers = [ "amdgpu" ]; # https://nixos.wiki/wiki/AMD_GPU - deviceSection = ''Option "TearFree" "True"''; +# videoDrivers = [ "amdgpu" ]; # https://nixos.wiki/wiki/AMD_GPU +# deviceSection = ''Option "TearFree" "True"''; }; } diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 17aadcb..0eccf39 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -16,10 +16,10 @@ in { # Список сервисов, которые не надо ребутать после rebuild switch # Мне это надо, потому что некоторые сервисы кладут систему - systemd.services = { - "accounts-daemon".restartIfChanged = false; - # "home-manager-buliway".restartIfChanged = false; - }; + # systemd.services = { + # "accounts-daemon".restartIfChanged = false; + # "home-manager-buliway".restartIfChanged = false; + # }; boot = { kernelPackages = pkgs.linuxPackages_latest; # Ядро линуха, ласт версия