From 7903b452ff4d9cd17334321344e08ae9eedbc398 Mon Sep 17 00:00:00 2001 From: OCbwoy3 Date: Wed, 2 Apr 2025 09:29:10 +0300 Subject: [PATCH] bring back shimejis --- config/dunst/dunstrc | 18 ++--- config/hypr/config/display.conf | 21 +++--- flake.lock | 106 +++++++++++++++--------------- hosts/default/apps/wl-shimeji.nix | 29 ++++++++ hosts/default/packages.nix | 3 +- modules/nixos/nvidia.nix | 1 - scripts/dev/notif-test.sh | 2 +- 7 files changed, 101 insertions(+), 79 deletions(-) create mode 100644 hosts/default/apps/wl-shimeji.nix diff --git a/config/dunst/dunstrc b/config/dunst/dunstrc index b057046..4dc401c 100644 --- a/config/dunst/dunstrc +++ b/config/dunst/dunstrc @@ -9,12 +9,11 @@ height = (0,300) origin = top-right scale = 0 - offset = 30x30 + offset = (30,30) indicate_hidden = yes shrink = no transparency = 30 - notification_height = 0 separator_height = 1 padding = 8 horizontal_padding = 8 @@ -30,13 +29,13 @@ ### Progressbar ### progress_bar = true - progress_bar_color = "#ff00ff" + # progress_bar_color = "#ff00ff" progress_bar_height = 10 progress_bar_frame_width = 1 progress_bar_min_width = 150 progress_bar_max_width = 300 - progress_bar_corner_radius = 10 - icon_corner_radius = 0 + progress_bar_corner_radius = 5 + icon_corner_radius = 4 ### Text ### @@ -73,11 +72,8 @@ always_run_script = true title = Dunst class = Dunst - startup_notification = true - verbosity = mesg corner_radius = 8 - force_xinerama = false mouse_left_click = "do_action, open_url, close_current" @@ -87,12 +83,6 @@ [experimental] per_monitor_dpi = false -[shortcuts] - close = ctrl+space - close_all = ctrl+shift+space - history = ctrl+grave - context = ctrl+shift+period - [urgency_low] background = "#1e1e2e" frame_color = "#b4befe" diff --git a/config/hypr/config/display.conf b/config/hypr/config/display.conf index a621fb7..9d4a8c8 100644 --- a/config/hypr/config/display.conf +++ b/config/hypr/config/display.conf @@ -86,15 +86,18 @@ layerrule = animation slide right, notifications layerrule = dimaround, wofi # Window Rules -windowrule=float, .blueman-manager-wrapped -windowrule=size 900 500, .blueman-manager-wrapped -windowrule=center, .blueman-manager-wrapped -windowrule=float, org.pulseaudio.pavucontrol -windowrule=size 900 500, org.pulseaudio.pavucontrol -windowrule=center, org.pulseaudio.pavucontrol -windowrule=float, nm-connection-editor -windowrule=size 900 500, nm-connection-editor -windowrule=center, nm-connection-editor +windowrulev2 = float,class:^(blueman-manager-wrapped)$ +windowrulev2 = size 900 500,class:^(blueman-manager-wrapped)$ +windowrulev2 = center,class:^(blueman-manager-wrapped)$ + +windowrulev2 = float,class:^(org.pulseaudio.pavucontrol)$ +windowrulev2 = size 900 500,class:^(org.pulseaudio.pavucontrol)$ +windowrulev2 = center,class:^(org.pulseaudio.pavucontrol)$ + +windowrulev2 = float,class:^(nm-connection-editor)$ +windowrulev2 = size 900 500,class:^(nm-connection-editor)$ +windowrulev2 = center,class:^(nm-connection-editor)$ + # windowrulev2 = immediate, class:^(sober)$ # windowrulev2 = fullscreen,title:^(Sober)$ diff --git a/flake.lock b/flake.lock index c687e86..deda222 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1741282631, - "narHash": "sha256-jZE1CmQ53uN1Gq4FjaLFzSSjDqzL0pG4mdRbjBqSmho=", + "lastModified": 1742213273, + "narHash": "sha256-0l0vDb4anfsBu1rOs94bC73Hub+xEivgBAo6QXl2MmU=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "81498562d0f53e613d30368bb5b076784fa86f80", + "rev": "484b732195cc53f4536ce4bd59a5c6402b1e7ccf", "type": "github" }, "original": { @@ -38,11 +38,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1741860468, - "narHash": "sha256-ArG3mnjHmcal5ny72VZvCqHchz9RsWiUBCRSGS0FXlA=", + "lastModified": 1743414153, + "narHash": "sha256-bFIXz7SvLlSNR4M3vYPYS1CpEN9vTUiH01R4iR/BDmA=", "owner": "catppuccin", "repo": "nix", - "rev": "50abeb976eb85fe6695a2888ec4c274675563c15", + "rev": "2f52f9ead26f80d7b391cedcbb3eb309bd83fff4", "type": "github" }, "original": { @@ -108,14 +108,14 @@ "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-unstable": "nixpkgs-unstable", "zig": "zig", - "zig2nix": "zig2nix" + "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1741886369, - "narHash": "sha256-PupKttqs+AQYQnyQuQKBLTiBTs1DtQB5J2LrTi6qBO0=", + "lastModified": 1743191728, + "narHash": "sha256-LrQd2IkfcmHdBh+pwPEPXzcosBerIEFzz/DbVNzBqig=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "73c7943fff38f679a9a434457b5089bc5722411d", + "rev": "1067cd3d8a061eb5b23bc1a4c46ca10af4481941", "type": "github" }, "original": { @@ -153,11 +153,11 @@ ] }, "locked": { - "lastModified": 1741879521, - "narHash": "sha256-GylyCwdUe2Kd69bC8txEX+A3H/DXBZl2a+GcmTcJw/g=", + "lastModified": 1743438213, + "narHash": "sha256-ZZDN+0v1r4I1xkQWlt8euOJv5S4EvElUCZMrDjTCEsY=", "owner": "nix-community", "repo": "home-manager", - "rev": "1b0efe3d335f452595512c7b275e5dddfbfb28a5", + "rev": "ccd7df836e1f42ea84806760f25b77b586370259", "type": "github" }, "original": { @@ -182,11 +182,11 @@ ] }, "locked": { - "lastModified": 1738664950, - "narHash": "sha256-xIeGNM+iivwVHkv9tHwOqoUP5dDrtees34bbFKKMZYs=", + "lastModified": 1742215578, + "narHash": "sha256-zfs71PXVVPEe56WEyNi2TJQPs0wabU4WAlq0XV7GcdE=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "7c6d165e1eb9045a996551eb9f121b6d1b30adc3", + "rev": "2fd36421c21aa87e2fe3bee11067540ae612f719", "type": "github" }, "original": { @@ -240,11 +240,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1741788549, - "narHash": "sha256-Ot/AuQGw5KJwHjyTMHWmyaduNkcE58bOCmyitZ4VxEQ=", + "lastModified": 1743437607, + "narHash": "sha256-EEUFIq/btzh8RZ/dv69PXvC5c7ythmCYlDOzH7vriAk=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "e86d3a14e46d19d8a47f8ceb6410546715d45f10", + "rev": "4c987b20e28362410d0c9f9a37bafd6f128b0a2c", "type": "github" }, "original": { @@ -462,11 +462,11 @@ ] }, "locked": { - "lastModified": 1741123584, - "narHash": "sha256-mprerMlucqtirmbx6L3VoFnF2bGYc2WSUCj7tuc6xTQ=", + "lastModified": 1741534688, + "narHash": "sha256-EV3945SnjOCuRVbGRghsWx/9D89FyshnSO1Q6/TuQ14=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "6b0154b183f9539097f13af9b5da78ca24da6df2", + "rev": "dd1f720cbc2dbb3c71167c9598045dd3261d27b3", "type": "github" }, "original": { @@ -572,11 +572,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1741246872, - "narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=", + "lastModified": 1742889210, + "narHash": "sha256-hw63HnwnqU3ZQfsMclLhMvOezpM7RSB0dMAtD5/sOiw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "10069ef4cf863633f57238f179a0297de84bd8d3", + "rev": "698214a32beb4f4c8e3942372c694f40848b360d", "type": "github" }, "original": { @@ -588,11 +588,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1738255539, - "narHash": "sha256-hP2eOqhIO/OILW+3moNWO4GtdJFYCqAe9yJZgvlCoDQ=", + "lastModified": 1741992157, + "narHash": "sha256-nlIfTsTrMSksEJc1f7YexXiPVuzD1gOfeN1ggwZyUoc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c3511a3b53b482aa7547c9d1626fd7310c1de1c5", + "rev": "da4b122f63095ca1199bd4d526f9e26426697689", "type": "github" }, "original": { @@ -604,11 +604,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1741708242, - "narHash": "sha256-cNRqdQD4sZpN7JLqxVOze4+WsWTmv2DGH0wNCOVwrWc=", + "lastModified": 1741865919, + "narHash": "sha256-4thdbnP6dlbdq+qZWTsm4ffAwoS8Tiq1YResB+RP6WE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b62d2a95c72fb068aecd374a7262b37ed92df82b", + "rev": "573c650e8a14b2faa0041645ab18aed7e60f0c9a", "type": "github" }, "original": { @@ -620,11 +620,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1741246872, - "narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=", + "lastModified": 1742669843, + "narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "10069ef4cf863633f57238f179a0297de84bd8d3", + "rev": "1e5b653dff12029333a6546c11e108ede13052eb", "type": "github" }, "original": { @@ -652,11 +652,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1741851582, - "narHash": "sha256-cPfs8qMccim2RBgtKGF+x9IBCduRvd/N5F4nYpU0TVE=", + "lastModified": 1743315132, + "narHash": "sha256-6hl6L/tRnwubHcA4pfUUtk542wn2Om+D4UnDhlDW9BE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6607cf789e541e7873d40d3a8f7815ea92204f32", + "rev": "52faf482a3889b7619003c0daec593a1912fddc1", "type": "github" }, "original": { @@ -676,11 +676,11 @@ ] }, "locked": { - "lastModified": 1741379162, - "narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=", + "lastModified": 1742649964, + "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc", + "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82", "type": "github" }, "original": { @@ -773,11 +773,11 @@ ] }, "locked": { - "lastModified": 1737634991, - "narHash": "sha256-dBAnb7Kbnier30cA7AgxVSxxARmxKZ1vHZT33THSIr8=", + "lastModified": 1741934139, + "narHash": "sha256-ZhTcTH9FoeAtbPfWGrhkH7RjLJZ7GeF18nygLAMR+WE=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "e09dfe2726c8008f983e45a0aa1a3b7416aaeb8a", + "rev": "150b0b6f52bb422a1b232a53698606fe0320dde0", "type": "github" }, "original": { @@ -801,11 +801,11 @@ ] }, "locked": { - "lastModified": 1741702955, - "narHash": "sha256-Emk3VnNByigCBlBN34IH2cMrsUqIhdex02uw9TSDsN0=", + "lastModified": 1741825901, + "narHash": "sha256-aeopo+aXg5I2IksOPFN79usw7AeimH1+tjfuMzJHFdk=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "1152ce759114a94134081270affd970ae1b957ed", + "rev": "0b14285e283f5a747f372fb2931835dd937c4383", "type": "github" }, "original": { @@ -814,7 +814,7 @@ "type": "github" } }, - "zig2nix": { + "zon2nix": { "inputs": { "flake-utils": [ "ghostty", @@ -826,17 +826,17 @@ ] }, "locked": { - "lastModified": 1741816255, - "narHash": "sha256-SJQMnm1vwXy8Td2qp/omjybn+4xZ/MDdZHeK6aa2nb0=", + "lastModified": 1742104771, + "narHash": "sha256-LhidlyEA9MP8jGe1rEnyjGFCzLLgCdDpYeWggibayr0=", "owner": "jcollie", - "repo": "zig2nix", - "rev": "c2a24405298373123e12ca81805e436da648aaf5", + "repo": "zon2nix", + "rev": "56c159be489cc6c0e73c3930bd908ddc6fe89613", "type": "github" }, "original": { "owner": "jcollie", - "ref": "c2a24405298373123e12ca81805e436da648aaf5", - "repo": "zig2nix", + "ref": "56c159be489cc6c0e73c3930bd908ddc6fe89613", + "repo": "zon2nix", "type": "github" } } diff --git a/hosts/default/apps/wl-shimeji.nix b/hosts/default/apps/wl-shimeji.nix new file mode 100644 index 0000000..628173d --- /dev/null +++ b/hosts/default/apps/wl-shimeji.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, fetchgit, pkg-config, wayland, wayland-protocols, wlr-protocols, wayland-scanner, libspng, pkgs }: + +stdenv.mkDerivation rec { + pname = "wl_shimeji"; + version = "1.0.0"; # Change to the appropriate version + + src = fetchgit { + url = "https://github.com/CluelessCatBurger/wl_shimeji.git"; + rev = "392a83d5658f283ace77b0c839d5a201cebc8784"; # Change to the appropriate commit + sha256 = "sha256-T7sWuKOsc0vEfkcGbRXLHit24db97crEhYadOMq4MDM="; # Put the correct sha256 hash + fetchSubmodules = true; + }; + + nativeBuildInputs = [ pkg-config wayland wayland-protocols wlr-protocols libspng wayland-scanner ]; + + buildInputs = [ ]; + + installPhase = '' + make install PREFIX=$out + find $out -type f -exec sed -i 's|#!/bin/python3|#!${pkgs.python3}/bin/python3|' {} + + ''; + + meta = with lib; { + description = "Shimeji reimplementation for Wayland in C"; + homepage = "https://github.com/CluelessCatBurger/wl_shimeji"; + license = licenses.gpl2; + maintainers = with maintainers; [ ]; + }; +} diff --git a/hosts/default/packages.nix b/hosts/default/packages.nix index c67139b..2f53571 100644 --- a/hosts/default/packages.nix +++ b/hosts/default/packages.nix @@ -28,13 +28,14 @@ "$@" '') (writeShellScriptBin "regretevator" ''xdg-open roblox://placeId=4972273297'') + (writeShellScriptBin "fix-gtk" ''${inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland}/bin/hyprctl dispatch exec "${pkgs.xdg-desktop-portal-gtk}/libexec/xdg-desktop-portal-gtk -r"'') + (callPackage ./apps/wl-shimeji.nix {}) catppuccin-gtk catppuccin catppuccin-qt5ct catppuccin-catwalk catppuccin-whiskers libxkbcommon - nvidia-video-sdk ffmpeg-full gnupg nix-direnv diff --git a/modules/nixos/nvidia.nix b/modules/nixos/nvidia.nix index f749eb4..a00b06a 100644 --- a/modules/nixos/nvidia.nix +++ b/modules/nixos/nvidia.nix @@ -35,7 +35,6 @@ intel-vaapi-driver libvdpau-va-gl vulkan-validation-layers - nvidia-video-sdk ]; }; diff --git a/scripts/dev/notif-test.sh b/scripts/dev/notif-test.sh index d70a779..0aa7e87 100755 --- a/scripts/dev/notif-test.sh +++ b/scripts/dev/notif-test.sh @@ -11,4 +11,4 @@ notify-send "Regretevator" "Floor 729" notify-send "Regretevator" "Floor 729 - 49/50" notify-send -i /tmp/.tuxstrap.png "Roblox" "Regretevator [ELEVATOR SIMULATOR]\n(UDMUX Protected)" -notify-send -i /tmp/pest.png -a "regretevator-npc-chat" "Pest" "いいえ! これは許されません! パンタロンのコンパートメント を空にしましょう。" \ No newline at end of file +notify-send -i /tmp/pest.png -a "regretevator-npc-chat" "Pest" "いいえ! これは許されません! パンタロンのコンパートメント を空にしましょう。"