From af19222d90774000206dd0a7f32494e88ee0f9df Mon Sep 17 00:00:00 2001 From: Sweetbread Date: Fri, 20 Sep 2024 14:37:59 +0300 Subject: [PATCH] pkgs: Move packages to home-manager --- home-manager/users/sweetbread/modules/alacritty.nix | 4 +++- home-manager/users/sweetbread/modules/bundle.nix | 1 - home-manager/users/sweetbread/modules/htop.nix | 8 -------- home-manager/users/sweetbread/modules/qt.nix | 9 --------- home-manager/users/sweetbread/modules/wms/hyprland.nix | 8 ++++++++ home-manager/users/sweetbread/modules/wms/mako.nix | 3 ++- nixos/packages.nix | 5 ----- 7 files changed, 13 insertions(+), 25 deletions(-) delete mode 100644 home-manager/users/sweetbread/modules/htop.nix diff --git a/home-manager/users/sweetbread/modules/alacritty.nix b/home-manager/users/sweetbread/modules/alacritty.nix index fee9d21..cb28738 100644 --- a/home-manager/users/sweetbread/modules/alacritty.nix +++ b/home-manager/users/sweetbread/modules/alacritty.nix @@ -1,4 +1,6 @@ -{ lib, ... }: { +{ lib, pkgs, ... }: { + home.packages = [ pkgs.alacritty ]; + programs.alacritty = { enable = true; settings = { diff --git a/home-manager/users/sweetbread/modules/bundle.nix b/home-manager/users/sweetbread/modules/bundle.nix index c2f8c0e..4c83b14 100644 --- a/home-manager/users/sweetbread/modules/bundle.nix +++ b/home-manager/users/sweetbread/modules/bundle.nix @@ -1,7 +1,6 @@ { imports = [ ./git.nix - ./htop.nix ./alacritty.nix ./qt.nix ./sops.nix diff --git a/home-manager/users/sweetbread/modules/htop.nix b/home-manager/users/sweetbread/modules/htop.nix deleted file mode 100644 index a781214..0000000 --- a/home-manager/users/sweetbread/modules/htop.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ - programs.htop = { - enable = true; - settings = { - tree_view = 1; - }; - }; -} diff --git a/home-manager/users/sweetbread/modules/qt.nix b/home-manager/users/sweetbread/modules/qt.nix index 795b2d3..792c144 100644 --- a/home-manager/users/sweetbread/modules/qt.nix +++ b/home-manager/users/sweetbread/modules/qt.nix @@ -4,13 +4,4 @@ platformTheme = "qtct"; style.name = "kvantum"; }; - - # xdg.configFile = { - # "Kvantum/kvantum.kvconfig".text = '' - # [General] - # theme=GraphiteNordDark - # ''; - # - # "Kvantum/GraphiteNord".source = "${pkgs.graphite-kde-theme}/share/Kvantum/GraphiteNord"; - # }; } diff --git a/home-manager/users/sweetbread/modules/wms/hyprland.nix b/home-manager/users/sweetbread/modules/wms/hyprland.nix index 4b651ea..b9f8f9a 100644 --- a/home-manager/users/sweetbread/modules/wms/hyprland.nix +++ b/home-manager/users/sweetbread/modules/wms/hyprland.nix @@ -1,4 +1,12 @@ { pkgs, lib, config, ... }: { + home.packages = with pkgs; [ + swww + alacritty + waybar + pamixer + wofi + ]; + wayland.windowManager.hyprland = let colors = config.lib.stylix.colors; diff --git a/home-manager/users/sweetbread/modules/wms/mako.nix b/home-manager/users/sweetbread/modules/wms/mako.nix index 5ab5fda..a714bd3 100644 --- a/home-manager/users/sweetbread/modules/wms/mako.nix +++ b/home-manager/users/sweetbread/modules/wms/mako.nix @@ -1,7 +1,8 @@ -{ config, ... }: +{ config, pkgs, ... }: let colors = config.lib.stylix.colors; in { + home.packages = [ pkgs.mako ]; xdg.configFile."mako/config".text = '' background-color=#${colors.base00} text-color=#${colors.base05} diff --git a/nixos/packages.nix b/nixos/packages.nix index fc471cc..137fa44 100644 --- a/nixos/packages.nix +++ b/nixos/packages.nix @@ -9,7 +9,6 @@ google-chrome inputs.ayugram-desktop.packages.${pkgs.system}.default vesktop - alacritty obs-studio mpv kdenlive # Video editor @@ -37,7 +36,6 @@ tree wget git - fastfetch btop nix-index unzip @@ -50,7 +48,6 @@ ntfs3g yt-dlp brightnessctl - swww openssl lazygit bluez @@ -70,8 +67,6 @@ # GUI utils feh imv - wofi - mako gromit-mpx notify-desktop