From 283f9ad213bedcdbab8c143f524220c4c0064261 Mon Sep 17 00:00:00 2001 From: Corwin Perren Date: Fri, 7 Nov 2025 14:55:22 -0800 Subject: [PATCH] Re-enabled nvtop, nopasswd for nvtop, properly enable kitty with remote control, streamdeck now uses alltop, alltop desktop entry, j4-dmenu-desktop as wrapper for bemenu so that desktop entries show, fixed desktop entry location --- modules/application-groups/system-utilities.nix | 2 +- modules/system/hyprland.nix | 3 ++- modules/system/security.nix | 12 +++++++++++- users/caperren/caperren.nix | 15 ++++++++++----- .../.local/share/applications/alltop.desktop | 7 +++++++ .../share/{ => applications}/glava.desktop | 0 .../share/{ => applications}/phonerdp.desktop | 2 +- .../{ => applications}/spotify-player.desktop | 0 .../.local/share/jetbrains-toolbox.desktop | 7 ------- .../dotfiles/hyprland/hyprland-common.conf | 2 +- .../dotfiles/streamdeck/.streamdeck_ui.json | 10 +++++----- .../dotfiles/streamdeck/icons/btop-logo.png | Bin 0 -> 2859 bytes 12 files changed, 38 insertions(+), 22 deletions(-) create mode 100644 users/caperren/dotfiles/.local/share/applications/alltop.desktop rename users/caperren/dotfiles/.local/share/{ => applications}/glava.desktop (100%) rename users/caperren/dotfiles/.local/share/{ => applications}/phonerdp.desktop (55%) rename users/caperren/dotfiles/.local/share/{ => applications}/spotify-player.desktop (100%) delete mode 100644 users/caperren/dotfiles/.local/share/jetbrains-toolbox.desktop create mode 100644 users/caperren/dotfiles/streamdeck/icons/btop-logo.png 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 0000000000000000000000000000000000000000..871317ecb0fff6d632128b5e5ef5467f519dfb5c GIT binary patch literal 2859 zcmb`JeK^y58^Bl8GZaebxa1`q?@Jwrilx*ctJF0$^Aa&8l+oB`vx&SsU12AZl9#9B zjHhOiHLMvA9ZhA(%ZQ<_Va=F_8E1s&*HO>)bY16IUi{5NNB{@ndihXoKCy1>Ov363ICUfKZD)?uP||_BwrB8w$nlCV=w0_@9vR zJ{WX7KIBR`2#?1@B4eVlsF2uj25N%IEB(#Es9qu}R z6Pkc~cQdrJMab*+^R+ck_KX;9$AkssUXJuFo9U1jq47B0r~+xs*BUBx=L~zZ;Z|c) zDp;#&oT+r%?=KGvR6wpa%^O>^?M$|OyRZs}f(#=HAm^8UcbFL!3P1F_%rwZ$V)%LZ z)J@BGii(O}5H~l5dV$m4scS66tt=^cl+Fh}6>u6{((DM!`RM#g+hI{rVQn*g!E_dQ-qtOQTMgyRMyInC!2N}wiB~Z;#P$1%G1|v#4Hu- zU*{*Cho+sGC1%@Cxc@&A2BbX;E>MXjh(w|XfshEO$M@bbG3E10u^%4bop(2^Q z@MgwnVyEw;z(huX{Fn)n{Pu%V9!Vq~ls?6<@I=kw_d}T!zZ7=ePkGUC;G^ zc!{ixr6eApQ4hTYoIa4enp9YPhwxsir?1~LIXSuQWc&v;M5%N!S>`Yj6%K7l$)-}> zx|QrWQN{)Gi(GB+GhIYZWmOf%@g6_FQvAMrTA_f!BKJuTXoe;v{AjOxgCmnJ+KR4i zuQc>Ke}3g?(~577(*0dN4u%PX@{ZU+AmwbT+epGF?LU_2T8e|J2KZ?8)vpp} zc(>hvJBv6n<>Ey&ia?lL1_SjBAkfwzx+uPcZ^~*6emP_V*m2j_5>Eu|x*^F4xEA9Gv*?hU~1Y_}aSK zT6i>-Gn3@d#hH<;y%7(*diAP!n#iSeE_9F+^EemCx4Y#W*+2Vz5_!g1a~3lo*wKevngmQ zd{{5?&}|K!Eg>hOzL7Nm<^N%n&Ef0EKkMy1OPqXAQDbC=4-DC`UQed+&3$xV5^jpc zVwLQ2F=$SO)F;Z(0<*DH3sdb3Tf6r)j~_pFbafTxp-T71{bI?>cCY@&D>NG2JvJ65 zK+Rix!lv3h&B#9>fP+)cjbr^fU+?*B;=;P6uMs;2r*VQG3?KAsr2lOE`)F$@5f$qo z-J4U4Vfjn)JAAo9epJG~s?m#@ zFW31gjdV14fS`v%pWpmW>w{l3%irHx&sYk*cI{eZSlF+gI=hln`y!$MH4+K5CNm$+ z2J=9Gbq#0CApyy|#Pu#Du)gaf*#C|A6t>eE`1^yapL1aml2iHUQ4sJamzrQvLL)w9$3# z)LV+Gt*1fu^C7uhUKI|!$PKb;$W7f$N6=~c3`Qjn+zR;gr-A#6$}5Xzx%zM-rcR8} zzwrbA{{6cgYF%BO%QB1xx1l7Sm_^X@0fwu1NwJMM7burk6~M*WZ-v;?ZowZq8bl`X zq~25Yn*_ZR6L<>3>chjjJR^3`G_*sq)YWy#M$gt7N*Kw=%yb#b_Anb}Vb&?K+z2jI<4xuj=0eud41R--afQc_3@6~ z*x$eS&O;_ER2e>FlMf8@7sM>#HoN^-VYJ+i66ig}PWI;xaXYPRlW$cJpO_XHo4!sx zpbD?>E{63*u`GFz{J9m2do!oCpl29}o`C`6XJ~zqT}K%RI*ZF)i4nmUZsYQe{XYZK`}Fhz21lZx(Gyc`ZO1KPeArX{RmZ#<@r%J zu*cNbXP2Ftar5Ay|DaIVPTbN4Z6>NJh|oT%qLO!2$TU}NiA`r^MzIPNVAXRr%9=^t pCMM}lVc|=n>f1w~Zep{^YR(e#J1&L|z(p72^^^CpNA4F={{!

jVG* literal 0 HcmV?d00001