From 31330e926d27e33a5bc0ada06af0467e9692a829 Mon Sep 17 00:00:00 2001 From: Buliway Date: Mon, 9 Sep 2024 07:12:14 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8=D0=BB=20?= =?UTF-8?q?=D1=80=D0=B5=D0=BF=D1=8B.=20=D0=98=D1=81=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B2=D0=B8=D0=BB=20polybar=20=D0=9A=D1=80=D0=B0=D1=88=D0=B8?= =?UTF-8?q?=D1=82=20=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=20=D1=80=D0=B5=D0=B1?= =?UTF-8?q?=D0=B8=D0=BB=D0=B4=D0=B0=20=D1=81=D0=B8=D1=81=D1=82=D0=B5=D0=BC?= =?UTF-8?q?=D1=8B.=20=D0=A2=D1=83=D0=BF=D0=BE=20=D1=81=D0=B5=D1=80=D1=8B?= =?UTF-8?q?=D0=B9=20=D1=8D=D0=BA=D1=80=D0=B0=D0=BD=20Polybar=20=D0=B7?= =?UTF-8?q?=D0=B0=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=D0=BB=20Thunar=20?= =?UTF-8?q?=D0=B7=D0=B0=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=D0=BB=20btop?= =?UTF-8?q?=20gpu=20=D0=BD=D0=B5=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0?= =?UTF-8?q?=D0=B5=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- flake.lock | 70 +++++++++++++++++++------ modules/home-manager/wm/bspwm/bspwm.nix | 1 + modules/home-manager/wm/polybar.nix | 14 ++--- nixos/packages.nix | 1 + 4 files changed, 64 insertions(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index 7501699..9057408 100644 --- a/flake.lock +++ b/flake.lock @@ -130,6 +130,27 @@ "type": "github" } }, + "flake-utils": { + "inputs": { + "systems": [ + "stylix", + "systems" + ] + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "fromYaml": { "flake": false, "locked": { @@ -170,11 +191,11 @@ ] }, "locked": { - "lastModified": 1723399884, - "narHash": "sha256-97wn0ihhGqfMb8WcUgzzkM/TuAxce2Gd20A8oiruju4=", + "lastModified": 1725831139, + "narHash": "sha256-9syY5nEehCswE8AMcjpUO4T0iX9nrNbzq69Kqcs92L0=", "owner": "nix-community", "repo": "home-manager", - "rev": "086f619dd991a4d355c07837448244029fc2d9ab", + "rev": "8a175a89137fe798b33c476d4dae17dba5fb3fd3", "type": "github" }, "original": { @@ -191,11 +212,11 @@ ] }, "locked": { - "lastModified": 1715930644, - "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=", + "lastModified": 1724435763, + "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", "owner": "nix-community", "repo": "home-manager", - "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d", + "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", "type": "github" }, "original": { @@ -206,11 +227,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1723175592, - "narHash": "sha256-M0xJ3FbDUc4fRZ84dPGx5VvgFsOzds77KiBMW/mMTnI=", + "lastModified": 1725634671, + "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5e0ca22929f3342b19569b21b2f3462f053e497b", + "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", "type": "github" }, "original": { @@ -222,11 +243,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1714912032, - "narHash": "sha256-clkcOIkg8G4xuJh+1onLG4HPMpbtzdLv4rHxFzgsH9c=", + "lastModified": 1725194671, + "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ee4a6e0f566fe5ec79968c57a9c2c3c25f2cf41d", + "rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c", "type": "github" }, "original": { @@ -253,16 +274,18 @@ "base16-tmux": "base16-tmux", "base16-vim": "base16-vim", "flake-compat": "flake-compat", + "flake-utils": "flake-utils", "gnome-shell": "gnome-shell", "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_2", + "systems": "systems" }, "locked": { - "lastModified": 1722946882, - "narHash": "sha256-mxtnMye8gs82tdQbVC+g6v3aPOZlH150f9WyntHIkTg=", + "lastModified": 1725290973, + "narHash": "sha256-+jwXF9KI0HfvDgpsoJGvOdfOGGSKOrID1wQB79zjUbo=", "owner": "danth", "repo": "stylix", - "rev": "5853f1a8bd072f2ebabfc3de3973084353cf6f1e", + "rev": "ef81ad9e85e60420cc83d4642619c14b57139d33", "type": "github" }, "original": { @@ -270,6 +293,21 @@ "repo": "stylix", "type": "github" } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/modules/home-manager/wm/bspwm/bspwm.nix b/modules/home-manager/wm/bspwm/bspwm.nix index 150ebac..a4f3941 100644 --- a/modules/home-manager/wm/bspwm/bspwm.nix +++ b/modules/home-manager/wm/bspwm/bspwm.nix @@ -2,6 +2,7 @@ # xsession.enable = true; # Хз надо ли xsession.windowManager.bspwm = { enable = true; + # alwaysResetDesktops = false; # Как я понял, эти команды выполняются в начале bspwmrc # Ниже настройки для основного монитора. Мб вместе с --primary надо diff --git a/modules/home-manager/wm/polybar.nix b/modules/home-manager/wm/polybar.nix index c53dc8f..58ca564 100644 --- a/modules/home-manager/wm/polybar.nix +++ b/modules/home-manager/wm/polybar.nix @@ -22,15 +22,17 @@ # double-click-right { pkgs, config, ... }: let - rofiTheme = "${config.home.homeDirectory}/.config/rofi/launcher.rasi"; + rofiApps = "${config.home.homeDirectory}/.config/rofi/launcher.rasi"; + rofiPower = "${config.home.homeDirectory}/.config/rofi/power.rasi"; + monitor = "$\{env:MONITOR:\}"; in { # Статус бар внизу - home.packages = with pkgs; [ sxhkd ]; + home.packages = with pkgs; [ polybar ]; xdg.configFile."polybar/config.ini" = { # executable = true; text = '' [bar/bottom] - monitor=$\{env:MONITOR:} + monitor=${monitor} tray-position=right bottom=true @@ -221,7 +223,7 @@ in { # Статус бар внизу font-158=Noto Sans Vithkuqi:size=12;3 font-159=Noto Sans Wancho:size=12;3 font-160=Noto Sans Yi:size=12;3 - font-160=Unifont:style=Regular:size=12;3 + font-161=Unifont:style=Regular:size=12;3 [module/alsa] type=internal/alsa @@ -296,12 +298,12 @@ in { # Статус бар внизу [module/rofi] type=custom/text - click-left=exec rofi -show drun -show-icons -theme ${rofiTheme} + click-left=exec rofi -show drun -show-icons -theme ${rofiApps} label=" " [module/power] type=custom/text - click-left=exec rofi -show powermenu -modi powermenu:${pkgs.rofi-power-menu}/bin/rofi-power-menu -theme ${rofiTheme} + click-left=exec rofi -show powermenu -modi powermenu:${pkgs.rofi-power-menu}/bin/rofi-power-menu -theme ${rofiApps} label=" " [module/time] diff --git a/nixos/packages.nix b/nixos/packages.nix index ae4891a..94c883f 100644 --- a/nixos/packages.nix +++ b/nixos/packages.nix @@ -154,6 +154,7 @@ pass # Менеджер паролей в терминале btop # Монитор ресурсов в терминале rocmPackages.rocm-smi # Чтоб в btop было gpu + # rocmPackages_5.rocm-smi # Старая версия пакета выше. Хз какой надо yt-dlp # Скачивать и смотреть медиа с разных сайтов tasktimer # TUI task timer. Можно несколько таймеров с описанием запустить. В терминал tt timer # A "sleep" with progress. Таймер на пельмени "timer 5m"