diff --git a/dotfiles/home-manager/desktop/apps/systeminfo.nix b/dotfiles/home-manager/desktop/apps/systeminfo.nix deleted file mode 100644 index b9fcbda2..00000000 --- a/dotfiles/home-manager/desktop/apps/systeminfo.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ pkgs, ... }: { - # services.flatpak.packages = [ - # "io.missioncenter.MissionCenter/x86_64/stable" - # ]; - home.packages = with pkgs; [ - amdgpu_top - mission-center - ]; - - programs.btop = { - enable = true; - package = pkgs.btop-rocm; - settings = { - color_theme = "stylix"; - theme_background = true; - update_ms = 500; - }; - }; - - xdg.desktopEntries = { - btop = { - exec = "${pkgs.kitty}/bin/kitty --override initial_window_width=800 --override initial_window_height=480 --override remember_window_size=no btop"; - icon = "utilities-system-monitor"; - name = "btop"; - categories = [ "Utility" "System" ]; - type = "Application"; - }; - }; -} diff --git a/dotfiles/home-manager/desktop/apps/terminal.nix b/dotfiles/home-manager/desktop/apps/terminal.nix index 232ca035..dd912b95 100644 --- a/dotfiles/home-manager/desktop/apps/terminal.nix +++ b/dotfiles/home-manager/desktop/apps/terminal.nix @@ -9,16 +9,16 @@ fzf-git-sh wl-clipboard jq + amdgpu_top + mission-center nethogs ( writeShellApplication { name = "kitty-popup"; - runtimeInputs = [ - kitty - ]; + runtimeInputs = []; text = '' #!/bin/bash - ${pkgs.kitty}/bin/kitty \ + kitty \ --override initial_window_width=1280 \ --override initial_window_height=720 \ --override remember_window_size=no \ @@ -26,40 +26,6 @@ "$@" ''; } ) - ( writeShellApplication { - name = "nethogs"; - runtimeInputs = [ - kitty - nethogs - ]; - text = '' - #!/bin/bash - - ${pkgs.kitty}/bin/kitty \ - --override initial_window_width=1280 \ - --override initial_window_height=720 \ - --override remember_window_size=no \ - --class kitty-popup \ - ${pkgs.nethogs}/bin/nethogs - ''; - } ) - ( writeShellApplication { - name = "btop"; - runtimeInputs = [ - kitty - btop - ]; - text = '' - #!/bin/bash - - ${pkgs.kitty}/bin/kitty \ - --override initial_window_width=1280 \ - --override initial_window_height=720 \ - --override remember_window_size=no \ - --class kitty-popup \ - ${pkgs.btop}/bin/btop - ''; - } ) ]; @@ -163,4 +129,31 @@ package = pkgs-unstable.fzf; }; + + programs.btop = { + enable = true; + package = pkgs.btop-rocm; + settings = { + color_theme = "stylix"; + theme_background = true; + update_ms = 500; + }; + }; + + xdg.desktopEntries = { + btop = { + exec = "kitty-popup btop"; + icon = "utilities-system-monitor"; + name = "btop"; + categories = [ "Utility" "System" ]; + type = "Application"; + }; + nethogs = { + exec = "kitty-popup nethogs"; + icon = "utilities-system-monitor"; + name = "btop"; + categories = [ "Utility" "System" ]; + type = "Application"; + }; + }; } diff --git a/dotfiles/home-manager/desktop/home.nix b/dotfiles/home-manager/desktop/home.nix index 8d71355d..e3d4290f 100644 --- a/dotfiles/home-manager/desktop/home.nix +++ b/dotfiles/home-manager/desktop/home.nix @@ -1,7 +1,7 @@ { vars, ... }: { imports = [ - ./configuration/stylix.nix + #./configuration/stylix.nix ./configuration/git.nix ./configuration/keys.nix ./configuration/defaultApps.nix @@ -18,7 +18,6 @@ ./apps/multimedia.nix ./apps/obsidian.nix ./apps/spotify.nix - ./apps/systeminfo.nix ./apps/password-manager.nix ./apps/email.nix ./apps/emulators.nix