marc/samfelag
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix rofi, eww and gpg

Browse Source
This commit is contained in:
marc
2024-11-05 21:52:07 +01:00
parent e4bf731436
commit 6ba393d433
9 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/eww/scripts/get-active-workspace.sh
View File

@@ -2,5 +2,5 @@
hyprctl monitors -j | jq '.[] | select(.focused) | .activeWorkspace.id' hyprctl monitors -j | jq '.[] | select(.focused) | .activeWorkspace.id'
socat -u UNIX-CONNECT:/tmp/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock - | socat -u UNIX-CONNECT:$XDG_RUNTIME_DIR/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock - |
stdbuf -o0 awk -F '>>|,' -e '/^workspace>>/ {print $2}' -e '/^focusedmon>>/ {print $3}' stdbuf -o0 awk -F '>>|,' -e '/^workspace>>/ {print $2}' -e '/^focusedmon>>/ {print $3}'

2
config/eww/scripts/get-workspaces.sh
View File

@@ -6,6 +6,6 @@ spaces (){
} }
spaces spaces
socat -u UNIX-CONNECT:/tmp/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock - | while read -r line; do socat -u UNIX-CONNECT:$XDG_RUNTIME_DIR/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock - | while read -r line; do
spaces spaces
done done

2
config/rofi/menus/bluetooth/bluetooth.rasi
View File

@@ -4,7 +4,7 @@
* *
**/ **/
@import "../../theme.rasi" @import "~/.config/rofi/theme.rasi"
/*****----- Configuration -----*****/ /*****----- Configuration -----*****/
configuration { configuration {

2
config/rofi/menus/launcher/launcher.rasi
View File

@@ -4,7 +4,7 @@
* *
**/ **/
@import "../../theme.rasi" @import "~/.config/rofi/theme.rasi"
/*****----- Configuration -----*****/ /*****----- Configuration -----*****/
configuration { configuration {

2
config/rofi/menus/pass/pass.rasi
View File

@@ -4,7 +4,7 @@
* *
**/ **/
@import "../../theme.rasi" @import "~/.config/rofi/theme.rasi"
/*****----- Configuration -----*****/ /*****----- Configuration -----*****/
configuration { configuration {

2
config/rofi/menus/powermenu/powermenu.rasi
View File

@@ -4,7 +4,7 @@
* *
**/ **/
@import "../../theme.rasi" @import "~/.config/rofi/theme.rasi"
/*****----- Configuration -----*****/ /*****----- Configuration -----*****/
configuration { configuration {

2
config/rofi/menus/wifi/wifi.rasi
View File

@@ -4,7 +4,7 @@
* *
**/ **/
@import "../../theme.rasi" @import "~/.config/rofi/theme.rasi"
/*****----- Configuration -----*****/ /*****----- Configuration -----*****/
configuration { configuration {

9
modules/desktop/rofi.nix
View File

@@ -10,9 +10,12 @@ in
enable = lib.mkEnableOption "rofi"; enable = lib.mkEnableOption "rofi";
}; };
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs;
rofi if hyprCfg.enable then [
]; rofi-wayland
] else [
rofi
];
hm.xdg.configFile."rofi/menus".source = ../../config/rofi/menus; hm.xdg.configFile."rofi/menus".source = ../../config/rofi/menus;
hm.xdg.configFile."rofi/nix.png".source = nix-colors-lib.nixWallpaperFromScheme { hm.xdg.configFile."rofi/nix.png".source = nix-colors-lib.nixWallpaperFromScheme {

2
modules/system/gpg.nix
View File

@@ -11,7 +11,7 @@ in
programs.gnupg.agent = { programs.gnupg.agent = {
enable = true; enable = true;
enableSSHSupport = true; enableSSHSupport = true;
pinentryPackage = pkgs.pinentry-rofi; pinentryPackage = pkgs.pinentry-qt;
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
pinentry pinentry