From 624ba2645466d5295cbe9e65be15f8742a95cc47 Mon Sep 17 00:00:00 2001 From: Buliway Date: Sat, 28 Mar 2026 17:03:48 +0300 Subject: [PATCH] Dark theme, new stylix, fix nvim sessions --- flake.lock | 12 ++--- flake.nix | 28 ++++-------- modules/home-manager/terminal/alacritty.nix | 2 +- modules/home-manager/wm/bspwm/bspwm.nix | 5 ++- modules/home-manager/wm/dunst.nix | 12 ++--- modules/nixos/hibernate.nix | 9 ++-- modules/nixos/stylix.nix | 15 +++---- nixos/configuration.nix | 2 +- nixos/packages.nix | 50 ++++++++++++--------- nvim/lua/custom/sessions.lua | 1 + nvim/lua/kickstart/plugins/themes.lua | 4 +- 11 files changed, 71 insertions(+), 69 deletions(-) diff --git a/flake.lock b/flake.lock index 329ad1a..52ab4ca 100644 --- a/flake.lock +++ b/flake.lock @@ -194,11 +194,11 @@ }, "nixpkgs2": { "locked": { - "lastModified": 1771369470, - "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=", + "lastModified": 1774106199, + "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=", "owner": "nixos", "repo": "nixpkgs", - "rev": "0182a361324364ae3f436a63005877674cf45efb", + "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655", "type": "github" }, "original": { @@ -263,11 +263,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1769819994, - "narHash": "sha256-AJB2hcg1OgocLGuVdot9HyCD+Kv+a6znhY2i3XqcZYU=", + "lastModified": 1773792048, + "narHash": "sha256-Oy9PCLG3vtflFBWcJd8c/EB3h5RU7ABAIDWn6JrGf6o=", "owner": "nix-community", "repo": "stylix", - "rev": "8b14679c0e1570b0e137f0f7997717be0fdf2cf2", + "rev": "3f2f9d307fe58c6abe2a16eb9b62c42d53ef5ee1", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 98b9a8f..e0269d1 100644 --- a/flake.nix +++ b/flake.nix @@ -41,30 +41,20 @@ config = { allowUnfree = true; rocmSupport = true; - permittedInsecurePackages = [ - "python-2.7.18.8" - "electron-25.9.0" - ]; - }; - pkgs = import nixpkgs { - inherit system; - inherit config; - }; - pkgs2 = import inputs.nixpkgs2 { - inherit system; - inherit config; - }; - spkgs = import inputs.nixpkgs-stable { - inherit system; - inherit config; + # permittedInsecurePackages = [ + # "python-2.7.18.8" + # "electron-25.9.0" + # ]; }; + pkgs = import nixpkgs { inherit system config; }; + pkgs2 = import inputs.nixpkgs2 { inherit system config; }; + spkgs = import inputs.nixpkgs-stable { inherit system config; }; in { nixosConfigurations = { nixos = nixpkgs.lib.nixosSystem { - specialArgs = { inherit spkgs; inherit pkgs2; inherit inputs; }; - inherit pkgs; - inherit system; + specialArgs = { inherit spkgs pkgs2 inputs; }; + inherit system pkgs; modules = [ ./nixos/configuration.nix inputs.home-manager.nixosModules.default diff --git a/modules/home-manager/terminal/alacritty.nix b/modules/home-manager/terminal/alacritty.nix index 1525a19..9db2f7f 100644 --- a/modules/home-manager/terminal/alacritty.nix +++ b/modules/home-manager/terminal/alacritty.nix @@ -12,4 +12,4 @@ home.packages = with pkgs; [ ueberzugpp # Отображение медиа в терминале ]; -} \ 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 5d7c244..417aff9 100644 --- a/modules/home-manager/wm/bspwm/bspwm.nix +++ b/modules/home-manager/wm/bspwm/bspwm.nix @@ -25,8 +25,8 @@ startupPrograms = [ # "lxqt-policykit-agent" # Заменил на гномовский "sxhkd" - # "feh --bg-fill ~/nixos-private-dots/modules/nixos/nix-glow-gruvbox.jpg" - "feh --bg-fill ~/nixos-private-dots/modules/nixos/nixos4k.png" + "feh --bg-fill ~/nixos-private-dots/modules/nixos/nix-glow-gruvbox.jpg" + # "feh --bg-fill ~/nixos-private-dots/modules/nixos/nixos4k.png" "nm-applet" # Нетворк манагер # "blueman-applet" # Блютуз в трее # "ksnip" @@ -44,6 +44,7 @@ "^2" = workspaces; }; + # xprop | grep -E 'WM_CLASS|WM_NAME' rules = let # Это переменные floating1200x800 = { state = "floating"; diff --git a/modules/home-manager/wm/dunst.nix b/modules/home-manager/wm/dunst.nix index eefe5ce..5038543 100644 --- a/modules/home-manager/wm/dunst.nix +++ b/modules/home-manager/wm/dunst.nix @@ -5,11 +5,11 @@ services.dunst = { enable = true; - iconTheme = { - name = "Gruvbox-Plus-Dark"; # Имя каталога в /usr/share/icons/ - package = pkgs.gruvbox-plus-icons; # Пакет иконок - size = "32x32"; - }; + # iconTheme = { + # name = "Gruvbox-Plus-Dark"; # Имя каталога в /usr/share/icons/ + # package = pkgs.gruvbox-plus-icons; # Пакет иконок + # size = "32x32"; + # }; settings = { global = { @@ -342,4 +342,4 @@ # appname = "some_volume_notifiers" # set_stack_tag = "volume" # -# vim: ft=cfg \ No newline at end of file +# vim: ft=cfg diff --git a/modules/nixos/hibernate.nix b/modules/nixos/hibernate.nix index 4a6fe8c..26a3307 100644 --- a/modules/nixos/hibernate.nix +++ b/modules/nixos/hibernate.nix @@ -15,7 +15,10 @@ resumeDevice = "/dev/disk/by-uuid/0951089a-fd89-4647-9ddb-0e3ff63d7b49"; kernelParams = [ "resume_offset=6799360" ]; }; - - # Не знаю надо ли это. На виртуалке я не могу забутиться в любом случае - # boot.initrd.systemd.enable = true; + # boot.kernel.sysctl = { + # # Частота использования подкачки, от 0 до 100, в стоке 60 + # # Низкое значение заставляет ядро избегать подкачки + # # Я хочу подкачку только для гибернации, софт в RAM надо + # "vm.swappiness" = 0; + # }; } diff --git a/modules/nixos/stylix.nix b/modules/nixos/stylix.nix index 5a608a2..c5eb714 100644 --- a/modules/nixos/stylix.nix +++ b/modules/nixos/stylix.nix @@ -9,16 +9,15 @@ # autoEnable = true; polarity = "light"; # "light" or "either". Если "either", то он сам определяет что будет красивее - # base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-medium.yaml"; # Если хочешь генерить тему из обоев, то удали эту строку - # base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-light-medium.yaml"; # Если хочешь генерить тему из обоев, то удали эту строку - base16Scheme = "${pkgs.base16-schemes}/share/themes/rose-pine-dawn.yaml"; # Если хочешь генерить тему из обоев, то удали эту строку + base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-medium.yaml"; # Если хочешь генерить тему из обоев, то удали эту строку + # base16Scheme = "${pkgs.base16-schemes}/share/themes/rose-pine-dawn.yaml"; # Если хочешь генерить тему из обоев, то удали эту строку # image = config.lib.stylix.pixel "base00"; # Вместо обоев будет заливка фона одним цветом из темы # image = /home/buliway/nixos-private-dots/modules/nixos/nix-glow-gruvbox.jpg; # (не работает) cursor = { package = pkgs.bibata-cursors; - # name = "Bibata-Modern-Ice"; # Dark theme - name = "Bibata-Modern-Classic"; # Light theme + name = "Bibata-Modern-Ice"; # Dark theme + # name = "Bibata-Modern-Classic"; # Light theme size = 32; # default = 32, 24 for FullHD, 48 for 4K }; @@ -61,12 +60,12 @@ name = "NotoSerif Nerd Font"; }; - # sizes = { + sizes = { # applications = 12; - # terminal = 15; + terminal = 15; # desktop = 10; # popups = 10; - # }; + }; }; # opacity = { diff --git a/nixos/configuration.nix b/nixos/configuration.nix index bbb2552..5690e39 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -50,7 +50,7 @@ in { # also pass inputs to home-manager modules useGlobalPkgs = true; useUserPackages = true; - extraSpecialArgs = { inherit spkgs; inherit pkgs2; inherit inputs; }; + extraSpecialArgs = { inherit spkgs pkgs2 inputs; }; users.${username} = ./home.nix; }; diff --git a/nixos/packages.nix b/nixos/packages.nix index f8fd3fe..2006125 100644 --- a/nixos/packages.nix +++ b/nixos/packages.nix @@ -48,13 +48,19 @@ }; # ollama = { # Настройки для amd видеокарт серии rx6000 # enable = true; - # acceleration = "rocm"; + # # acceleration = "rocm"; # Не работает на новых версиях nixos # host = "0.0.0.0"; # port = 11434; # openFirewall = true; - # # package = pkgs2.ollama; + # package = pkgs2.ollama; # rocmOverrideGfx = "10.3.0"; # }; + # open-webui = { # WebUI для ollama + # enable = true; + # package = pkgs2.open-webui; + # port = 11435; # default 8080 + # openFirewall = true; + # }; }; programs = { @@ -77,20 +83,20 @@ libxkbcommon freetype fontconfig - xorg.libX11 - xorg.libXext - xorg.libXrandr - xorg.libXrender - xorg.libXcursor - xorg.libXxf86vm - xorg.libXi - xorg.libxcb - xorg.libXfixes - xorg.xcbutil - xorg.xcbutilkeysyms - xorg.xcbutilwm - xorg.xcbutilimage - xorg.xcbutilrenderutil + libx11 + libxext + libxrandr + libxrender + libxcursor + libxxf86vm + libxi + libxcb + libxfixes + libxcb-util + libxcb-keysyms + libxcb-wm + libxcb-image + libxcb-render-util xcb-util-cursor glib dbus @@ -209,6 +215,7 @@ # Kubernetes k3d # k3s in Docker + k3s kubectl # Kubernetes CLI kubernetes-helm # Package manager for kubernetes @@ -221,7 +228,6 @@ yaml-language-server # YAML LSP taplo # TOML LSP vim-language-server # VimScript LSP - postman # API Development Environment insomnia # For nvim @@ -378,7 +384,7 @@ ## Media ## ########### - pkgs2.strawberry + strawberry obs-studio picard # Массовый редактор метаданных музыки mousai # Опенсорс шазам. Со временем просит платный api @@ -394,7 +400,7 @@ # (pkgs2.discord.override { # withVencord = true; # }) - pkgs2.discord + # pkgs2.discord # pkgs2.vesktop pkgs2.telegram-desktop @@ -431,9 +437,11 @@ ################## obsidian # Заметки + anki # Карточки с вопросами + pomodoro-gtk spkgs.planify # Таски - super-productivity # Таски - pkgs2.ticktick # Таски, proprietary + # super-productivity # Таски + # pkgs2.ticktick # Таски, proprietary ########### ## Icons ## diff --git a/nvim/lua/custom/sessions.lua b/nvim/lua/custom/sessions.lua index d22b5b6..8f2b372 100644 --- a/nvim/lua/custom/sessions.lua +++ b/nvim/lua/custom/sessions.lua @@ -21,6 +21,7 @@ local function session_name() if branch then sha = sha .. '-' .. branch + sha = vim.fn.sha256(sha) -- fix shit branch name end return sha diff --git a/nvim/lua/kickstart/plugins/themes.lua b/nvim/lua/kickstart/plugins/themes.lua index 3a42ab9..60a9895 100644 --- a/nvim/lua/kickstart/plugins/themes.lua +++ b/nvim/lua/kickstart/plugins/themes.lua @@ -44,7 +44,7 @@ return { priority = 1000, init = function() -- 'rose-pine-moon', 'rose-pine-main', 'rose-pine-dawn' - vim.cmd.colorscheme 'rose-pine-dawn' + -- vim.cmd.colorscheme 'rose-pine-dawn' end, }, @@ -103,7 +103,7 @@ return { dim_inactive = false, transparent_mode = false, } - -- vim.cmd.colorscheme 'gruvbox' + vim.cmd.colorscheme 'gruvbox' end, }, {