diff --git a/modules/application-groups/system-utilities.nix b/modules/application-groups/system-utilities.nix index a360d1e..150bda3 100644 --- a/modules/application-groups/system-utilities.nix +++ b/modules/application-groups/system-utilities.nix @@ -40,7 +40,7 @@ networkmanager networkmanagerapplet nmap - # nvtopPackages.full # <- Build failure: https://github.com/nixos/nixpkgs/issues/456928 + nvtopPackages.full openrgb-with-all-plugins pciutils rofi-bluetooth diff --git a/modules/system/hyprland.nix b/modules/system/hyprland.nix index 9c0bd18..94b552d 100644 --- a/modules/system/hyprland.nix +++ b/modules/system/hyprland.nix @@ -25,6 +25,7 @@ environment.systemPackages = with pkgs; [ arandr + bemenu dunst grim hyprpaper @@ -39,7 +40,7 @@ swayimg wl-clipboard wlogout - bemenu + ]; } diff --git a/modules/system/security.nix b/modules/system/security.nix index e2a0caf..c3dcd7b 100644 --- a/modules/system/security.nix +++ b/modules/system/security.nix @@ -4,6 +4,7 @@ enable = true; extraRules = [ { + groups = [ "wheel" ]; commands = [ { command = "${pkgs.systemd}/bin/reboot"; @@ -14,7 +15,16 @@ options = [ "NOPASSWD" ]; } ]; - groups = [ "wheel" ]; + } + { + users = [ "caperren" ]; + commands = [ + { + command = "${pkgs.nvtopPackages.full}/bin/nvtop"; + options = [ "NOPASSWD" "SETENV" ]; + } + ]; + } ]; }; diff --git a/users/caperren/caperren.nix b/users/caperren/caperren.nix index 61b8671..d6ce167 100644 --- a/users/caperren/caperren.nix +++ b/users/caperren/caperren.nix @@ -43,7 +43,11 @@ in programs.bemenu.enable = true; programs.kitty = { + enable = true; font.name = "JetBrains Mono"; + settings = { + allow_remote_control = true; + }; }; # Assets/scripts @@ -74,11 +78,12 @@ in home.file.".config/wlogout/layout".source = ./dotfiles/wlogout/layout; # Desktop entry files so bemenu can find them - home.file.".local/share/glava.desktop".source = ./dotfiles/.local/share/glava.desktop; - home.file.".local/share/jetbrains-toolbox.desktop".source = - ./dotfiles/.local/share/jetbrains-toolbox.desktop; - home.file.".local/share/spotify-player.desktop".source = - ./dotfiles/.local/share/spotify-player.desktop; + home.file.".local/share/applications/alltop.desktop".source = + ./dotfiles/.local/share/applications/alltop.desktop; + home.file.".local/share/applications/glava.desktop".source = + ./dotfiles/.local/share/applications/glava.desktop; + home.file.".local/share/applications/spotify-player.desktop".source = + ./dotfiles/.local/share/applications/spotify-player.desktop; # Custom bash aliases home.shellAliases = { diff --git a/users/caperren/dotfiles/.local/share/applications/alltop.desktop b/users/caperren/dotfiles/.local/share/applications/alltop.desktop new file mode 100644 index 0000000..a42d532 --- /dev/null +++ b/users/caperren/dotfiles/.local/share/applications/alltop.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Type=Application +Name=All Top +Exec=bash -c "kitty --single-instance --detach bash -c 'kitten @ launch --type=window --title btop btop ; kitten @ launch --type=window --title nvtop nvtop'" +Icon=alltop +Terminal=false +Categories=Utilities; \ No newline at end of file diff --git a/users/caperren/dotfiles/.local/share/glava.desktop b/users/caperren/dotfiles/.local/share/applications/glava.desktop similarity index 100% rename from users/caperren/dotfiles/.local/share/glava.desktop rename to users/caperren/dotfiles/.local/share/applications/glava.desktop diff --git a/users/caperren/dotfiles/.local/share/phonerdp.desktop b/users/caperren/dotfiles/.local/share/applications/phonerdp.desktop similarity index 55% rename from users/caperren/dotfiles/.local/share/phonerdp.desktop rename to users/caperren/dotfiles/.local/share/applications/phonerdp.desktop index 5c74e6b..c080c84 100644 --- a/users/caperren/dotfiles/.local/share/phonerdp.desktop +++ b/users/caperren/dotfiles/.local/share/applications/phonerdp.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application Name=Phone RDP -Exec=bash -c "phonerdp" +Exec=bash -c "scrcpy --no-audio --orientation=0 --turn-screen-off --fullscreen" Icon=phonerdp Terminal=false Categories=Utilities; \ No newline at end of file diff --git a/users/caperren/dotfiles/.local/share/spotify-player.desktop b/users/caperren/dotfiles/.local/share/applications/spotify-player.desktop similarity index 100% rename from users/caperren/dotfiles/.local/share/spotify-player.desktop rename to users/caperren/dotfiles/.local/share/applications/spotify-player.desktop diff --git a/users/caperren/dotfiles/.local/share/jetbrains-toolbox.desktop b/users/caperren/dotfiles/.local/share/jetbrains-toolbox.desktop deleted file mode 100644 index 80792a8..0000000 --- a/users/caperren/dotfiles/.local/share/jetbrains-toolbox.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[Desktop Entry] -Type=Application -Name=JetBrains Toolbox -Exec=jetbrains-toolbox -Icon=jetbrains-toolbox -Terminal=false -Categories=Development;IDE; \ No newline at end of file diff --git a/users/caperren/dotfiles/hyprland/hyprland-common.conf b/users/caperren/dotfiles/hyprland/hyprland-common.conf index fa1030e..8f97c0d 100644 --- a/users/caperren/dotfiles/hyprland/hyprland-common.conf +++ b/users/caperren/dotfiles/hyprland/hyprland-common.conf @@ -4,7 +4,7 @@ monitor=,preferred,auto,1 # Set programs that you use $terminal = kitty $fileManager = thunar -$menu = bemenu-run --line-height 22 --hf "##10AC25" --ff "##10AC25" --tf "##10AC25" +$menu = j4-dmenu-desktop --dmenu='bemenu --ignorecase --line-height 22 --hf "##10AC25" --ff "##10AC25" --tf "##10AC25"' --term='kitty' # Some default env vars env = XCURSOR_SIZE,24 diff --git a/users/caperren/dotfiles/streamdeck/.streamdeck_ui.json b/users/caperren/dotfiles/streamdeck/.streamdeck_ui.json index ddd0b80..e12a2fe 100644 --- a/users/caperren/dotfiles/streamdeck/.streamdeck_ui.json +++ b/users/caperren/dotfiles/streamdeck/.streamdeck_ui.json @@ -176,14 +176,14 @@ "states": { "0": { "text": "", - "icon": "/home/caperren/.config/streamdeck-ui/icons/glances-logo.png", + "icon": "/home/caperren/.config/streamdeck-ui/icons/btop-logo.png", "keys": "", "write": "", - "command": "kitty -e glances", + "command": "bash -c \"kitty --single-instance --detach bash -c 'kitten @ launch --type=window --title btop btop ; kitten @ launch --type=window --title nvtop nvtop'\"", "brightness_change": 0, "switch_page": 0, "switch_state": 0, - "text_vertical_align": "middle", + "text_vertical_align": "top", "text_horizontal_align": "", "font": "", "font_color": "", @@ -582,7 +582,7 @@ "write": "", "command": "kitty -e bash -i -c nrs", "brightness_change": 0, - "switch_page": 0, + "switch_page": 1, "switch_state": 0, "text_vertical_align": "middle", "text_horizontal_align": "", @@ -603,7 +603,7 @@ "write": "", "command": "kitty -e bash -i -c nus", "brightness_change": 0, - "switch_page": 0, + "switch_page": 1, "switch_state": 0, "text_vertical_align": "middle", "text_horizontal_align": "", diff --git a/users/caperren/dotfiles/streamdeck/icons/btop-logo.png b/users/caperren/dotfiles/streamdeck/icons/btop-logo.png new file mode 100644 index 0000000..871317e Binary files /dev/null and b/users/caperren/dotfiles/streamdeck/icons/btop-logo.png differ