From 848a1be8d37bb0540a58aaed19315e6cc1375cf5 Mon Sep 17 00:00:00 2001 From: Emmet Date: Fri, 17 May 2024 20:54:47 -0500 Subject: [PATCH 1/3] Added matrix (fluffychat) --- profiles/work/home.nix | 1 + user/wm/hyprland/hyprland.nix | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/profiles/work/home.nix b/profiles/work/home.nix index 8950288..93508ad 100644 --- a/profiles/work/home.nix +++ b/profiles/work/home.nix @@ -58,6 +58,7 @@ protonmail-bridge texliveSmall numbat + fluffychat wine bottles diff --git a/user/wm/hyprland/hyprland.nix b/user/wm/hyprland/hyprland.nix index 9e5e890..9a6e4c7 100644 --- a/user/wm/hyprland/hyprland.nix +++ b/user/wm/hyprland/hyprland.nix @@ -200,6 +200,7 @@ bind=SUPER,N,exec,pypr toggle numbat && hyprctl dispatch bringactivetotop bind=SUPER,M,exec,pypr toggle musikcube && hyprctl dispatch bringactivetotop bind=SUPER,B,exec,pypr toggle btm && hyprctl dispatch bringactivetotop + bind=SUPER,D,exec,pypr toggle matrix && hyprctl dispatch bringactivetotop bind=SUPER,code:172,exec,pypr toggle pavucontrol && hyprctl dispatch bringactivetotop $scratchpadsize = size 80% 85% @@ -209,6 +210,11 @@ windowrulev2 = workspace special silent,$scratchpad windowrulev2 = center,$scratchpad + windowrulev2 = float,class:^(fluffychat)$ + windowrulev2 = size 85% 90%,class:^(fluffychat)$ + windowrulev2 = workspace special silent,class:^(fluffychat)$ + windowrulev2 = center,class:^(fluffychat)$ + $savetodisk = title:^(Save to Disk)$ windowrulev2 = float,$savetodisk windowrulev2 = size 70% 75%,$savetodisk @@ -232,6 +238,7 @@ windowrulev2 = opacity 0.80,title:ORUI windowrulev2 = opacity 1.0,class:^(org.qutebrowser.qutebrowser),fullscreen:1 + windowrulev2 = opacity 0.90,class:^(fluffychat)$ windowrulev2 = opacity 1.0,class:^(Brave-browser),fullscreen:1 windowrulev2 = opacity 1.0,class:^(librewolf),fullscreen:1 windowrulev2 = opacity 0.80,title:^(LibreWolf)$ @@ -608,6 +615,10 @@ command = "alacritty --class scratchpad -e btm" margin = 50 + [scratchpads.matrix] + command = "fluffychat" + margin = 50 + [scratchpads.pavucontrol] command = "pavucontrol" margin = 50 From a3b39ee8e16af30f005a3319c926a5f2e49b96af Mon Sep 17 00:00:00 2001 From: Emmet Date: Fri, 17 May 2024 20:55:15 -0500 Subject: [PATCH 2/3] nwg-dock improvements --- user/wm/hyprland/hyprland.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/user/wm/hyprland/hyprland.nix b/user/wm/hyprland/hyprland.nix index 9a6e4c7..abaacb9 100644 --- a/user/wm/hyprland/hyprland.nix +++ b/user/wm/hyprland/hyprland.nix @@ -43,7 +43,6 @@ exec-once = GOMAXPROCS=1 syncthing --no-browser exec-once = protonmail-bridge --noninteractive exec-once = waybar - exec-once = nwg-dock-hyprland -r -f -x -i 64 -nolauncher -a start -ml 8 -mr 8 -mb 8 && nwg-dock-hyprland exec-once = emacs --daemon exec-once = hypridle @@ -110,7 +109,7 @@ bind=SUPERSHIFT,T,exec,screenshot-ocr bind=CTRLALT,Delete,exec,hyprctl kill bind=SUPERSHIFT,K,exec,hyprctl kill - bind=SUPER,SUPER_L,exec,nwg-dock-hyprland + bind=SUPER,W,exec,nwg-dock-wrapper bind = SUPER,R,pass,^(com\.obsproject\.Studio)$ bind = SUPERSHIFT,R,pass,^(com\.obsproject\.Studio)$ @@ -397,6 +396,15 @@ tesseract $imgname $txtname; wl-copy -n < $txtfname '') + (pkgs.writeScriptBin "nwg-dock-wrapper" '' + #!/bin/sh + if pgrep -x ".nwg-dock-hyprl" > /dev/null + then + nwg-dock-hyprland + else + nwg-dock-hyprland -f -x -i 64 -nolauncher -a start -ml 8 -mr 8 -mb 8 + fi + '') (pkgs.writeScriptBin "sct" '' #!/bin/sh killall wlsunset &> /dev/null; From 56b9ea7e1aa438e8b517041ce5b694b68153ebbc Mon Sep 17 00:00:00 2001 From: Emmet Date: Sat, 18 May 2024 08:31:18 -0500 Subject: [PATCH 3/3] Updated system --- flake.lock | 60 +++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/flake.lock b/flake.lock index 3fc5168..e9c0969 100644 --- a/flake.lock +++ b/flake.lock @@ -117,11 +117,11 @@ "blocklist-hosts": { "flake": false, "locked": { - "lastModified": 1714790410, - "narHash": "sha256-urPjJa/pxAP8Q79Ec8xzuIoOb/H4Efm8qvDPlqWIF7M=", + "lastModified": 1715555757, + "narHash": "sha256-kkM/Wqr+yQvj0d5F0W5J2hgHz0BAXPxKYbHNdnO8hmY=", "owner": "StevenBlack", "repo": "hosts", - "rev": "ee48544926f3b132b190b89a32ba04fc014e2702", + "rev": "dac298c4ae897b3e2607b41952d8b3a0449ca2ef", "type": "github" }, "original": { @@ -182,11 +182,11 @@ "eaf-browser": { "flake": false, "locked": { - "lastModified": 1708834925, - "narHash": "sha256-lfFkz55aG5DhU6p6p/pLCE8UKe9281C8Znwc4HTyY8c=", + "lastModified": 1715466525, + "narHash": "sha256-jcCn16lXqcq1UcekekJiTfRBjjgaY0Hkz69ycElSzuA=", "owner": "emacs-eaf", "repo": "eaf-browser", - "rev": "26a88c4d0e106b8ac7ae29e62fef42c636fbe8a6", + "rev": "9761f7bd22aa69f144a0a032643b0834dde6cb60", "type": "github" }, "original": { @@ -469,11 +469,11 @@ ] }, "locked": { - "lastModified": 1714043624, - "narHash": "sha256-Xn2r0Jv95TswvPlvamCC46wwNo8ALjRCMBJbGykdhcM=", + "lastModified": 1715381426, + "narHash": "sha256-wPuqrAQGdv3ISs74nJfGb+Yprm23U/rFpcHFFNWgM94=", "owner": "nix-community", "repo": "home-manager", - "rev": "86853e31dc1b62c6eeed11c667e8cdd0285d4411", + "rev": "ab5542e9dbd13d0100f8baae2bc2d68af901f4b4", "type": "github" }, "original": { @@ -490,11 +490,11 @@ ] }, "locked": { - "lastModified": 1715337997, - "narHash": "sha256-ve562FlHVa7xhLfkFc1ihg1kuuq55IMfkxAgBQcFUY0=", + "lastModified": 1715930644, + "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=", "owner": "nix-community", "repo": "home-manager", - "rev": "4855bfb6ce20225a1b0e2aae2379da909ab38350", + "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d", "type": "github" }, "original": { @@ -592,11 +592,11 @@ ] }, "locked": { - "lastModified": 1715172513, - "narHash": "sha256-TjQ74AGpEgNx/+sM0VKnPAOlYEG22FUJ9+RwDDP/hoA=", + "lastModified": 1715722806, + "narHash": "sha256-KrSLG2H3KGELxTFdiBhv8U6D53Q3UsJsQO+KgEabsNA=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "dcbdc9a08d1df753d6799bab823486f1fff5b8e6", + "rev": "c28d1011f4868c1a1ee80b10d9ee79900686df82", "type": "github" }, "original": { @@ -617,11 +617,11 @@ ] }, "locked": { - "lastModified": 1714869498, - "narHash": "sha256-vbLVOWvQqo4n1yvkg/Q70VTlPbMmTiCQfNTgcWDCfJM=", + "lastModified": 1691753796, + "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "e06482e0e611130cd1929f75e8c1cf679e57d161", + "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03", "type": "github" }, "original": { @@ -792,11 +792,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1715218190, - "narHash": "sha256-R98WOBHkk8wIi103JUVQF3ei3oui4HvoZcz9tYOAwlk=", + "lastModified": 1715668745, + "narHash": "sha256-xp62OkRkbUDNUc6VSqH02jB0FbOS+MsfMb7wL1RJOfA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9a9960b98418f8c385f52de3b09a63f9c561427a", + "rev": "9ddcaffecdf098822d944d4147dd8da30b4e6843", "type": "github" }, "original": { @@ -807,11 +807,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1715266358, - "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", + "lastModified": 1715787315, + "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f1010e0469db743d14519a1efd37e23f8513d714", + "rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5", "type": "github" }, "original": { @@ -1143,11 +1143,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1715307487, - "narHash": "sha256-yuDAys3JuJmhQUQGMMsl3BDQNZUYZDw0eA71OVh9FeY=", + "lastModified": 1715998563, + "narHash": "sha256-krjs9VkDoRrYNQVyCTXUGUfAJziCk0Fkki1ZnnmNgjk=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ec7a7caf50877bc32988c82653d6b3e6952a8c3f", + "rev": "4731829dec4859921bfc0e1548478207d6c9c8fa", "type": "github" }, "original": { @@ -1187,11 +1187,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1715258460, - "narHash": "sha256-zIrOcHX5iMc4/Z5TSOzSSdRlE4JzFAIlUGPO6f+ck1M=", + "lastModified": 1715516559, + "narHash": "sha256-xzUwP85yIYvVSKHY2MutzAt5/ZQwUzlhL5/Gfh7jySc=", "owner": "danth", "repo": "stylix", - "rev": "197526923a2929b223bab3e36d3aa240f5f84870", + "rev": "b5f4ca49df372c3d26ce04b1554fb02a0107cc8d", "type": "github" }, "original": {