From ec97ec7d6ff3b33b8970a24d4becd64b0bd280b8 Mon Sep 17 00:00:00 2001 From: Varris Date: Fri, 1 Dec 2023 13:55:49 +0100 Subject: [PATCH] update --- flake.nix | 20 +- overlay.nix | 1 - pkgs/gruvbox-plus-icon-pack/default.nix | 10 +- pkgs/test.patch | 20 ++ system/configuration.nix | 7 +- system/hardware-configuration.nix | 2 +- system/hardware/default.nix | 2 +- system/services/default.nix | 3 +- system/services/xdg-portal/default.nix | 1 + user/configs/beets/default.nix | 2 +- user/configs/fish/default.nix | 1 - user/configs/kvantum/default.nix | 6 +- user/configs/mpd/default.nix | 2 + .../clock.scssc | Bin 0 -> 2349 bytes .../mpris.scssc | Bin 0 -> 2351 bytes .../sysTray.scssc | Bin 0 -> 3516 bytes .../volume.scssc | Bin 0 -> 2353 bytes .../windowTitle.scssc | Bin 0 -> 2375 bytes .../workspaces.scssc | Bin 0 -> 7043 bytes .../notificationPopup.scssc | Bin 0 -> 2741 bytes .../notify-test.scssc | Bin 0 -> 14723 bytes .../style.scssc | Bin 0 -> 2823 bytes .../gruvbox.scssc | Bin 0 -> 3912 bytes .../panel.scssc | Bin 0 -> 2522 bytes user/configs/wayland/ags/ags-config/config.js | 8 +- .../js/notifications/notification.js | 14 +- .../js/notifications/notificationPopup.js | 2 +- .../ags-config/js/notifications/widgets.js | 2 +- .../wayland/ags/ags-config/js/panel/panel.js | 4 +- .../ags/ags-config/js/panel/widgets/volume.js | 1 - user/configs/wayland/hyprland/default.nix | 215 +----------------- user/configs/wayland/hyprland/settings.nix | 177 ++++++++++++++ user/home.nix | 8 +- 33 files changed, 245 insertions(+), 263 deletions(-) create mode 100644 pkgs/test.patch create mode 100644 user/configs/wayland/ags/ags-config/.sass-cache/276f4d14bb513c1c4ba632ea44b6c2e9dde349c2/clock.scssc create mode 100644 user/configs/wayland/ags/ags-config/.sass-cache/276f4d14bb513c1c4ba632ea44b6c2e9dde349c2/mpris.scssc create mode 100644 user/configs/wayland/ags/ags-config/.sass-cache/276f4d14bb513c1c4ba632ea44b6c2e9dde349c2/sysTray.scssc create mode 100644 user/configs/wayland/ags/ags-config/.sass-cache/276f4d14bb513c1c4ba632ea44b6c2e9dde349c2/volume.scssc create mode 100644 user/configs/wayland/ags/ags-config/.sass-cache/276f4d14bb513c1c4ba632ea44b6c2e9dde349c2/windowTitle.scssc create mode 100644 user/configs/wayland/ags/ags-config/.sass-cache/276f4d14bb513c1c4ba632ea44b6c2e9dde349c2/workspaces.scssc create mode 100644 user/configs/wayland/ags/ags-config/.sass-cache/503f62c5c6d624b8605b27a983ea9fa0abebbb04/notificationPopup.scssc create mode 100644 user/configs/wayland/ags/ags-config/.sass-cache/7066c94b235402477038797511879657f5f15bb3/notify-test.scssc create mode 100644 user/configs/wayland/ags/ags-config/.sass-cache/7066c94b235402477038797511879657f5f15bb3/style.scssc create mode 100644 user/configs/wayland/ags/ags-config/.sass-cache/7374c266d40f30c3143150a6135aabe76e1eef96/gruvbox.scssc create mode 100644 user/configs/wayland/ags/ags-config/.sass-cache/e1a883864ee50a2ec0950f8f950a16a1146b42eb/panel.scssc create mode 100644 user/configs/wayland/hyprland/settings.nix diff --git a/flake.nix b/flake.nix index 2e1f960..246eec3 100755 --- a/flake.nix +++ b/flake.nix @@ -34,6 +34,11 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + ags = { + url = "github:Aylur/ags"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + gruvbox-kvantum = { url = "github:thefallnn/Gruvbox-Kvantum"; flake = false; @@ -63,11 +68,6 @@ url = "github:SylEleuth/gruvbox-plus-icon-pack"; flake = false; }; - - ags = { - url = "github:Aylur/ags"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; outputs = { @@ -90,10 +90,6 @@ overlays = [ self.overlays.default - inputs.chaotic-nyx.overlays.default - inputs.hyprland-contrib.overlays.default - inputs.hyprpicker.overlays.default - inputs.nixd.overlays.default ]; }; in { @@ -113,12 +109,14 @@ home-manager = { useUserPackages = true; users.manuel = import ./user/home.nix; - extraSpecialArgs = {inherit inputs;}; + extraSpecialArgs = { + inherit inputs; + inherit system; + }; useGlobalPkgs = true; }; } inputs.chaotic-nyx.nixosModules.default - inputs.hyprland.nixosModules.default ]; }; }; diff --git a/overlay.nix b/overlay.nix index be139ef..daa749f 100755 --- a/overlay.nix +++ b/overlay.nix @@ -25,6 +25,5 @@ version = "1"; src = inputs.nvim-hmts; }; - }; } diff --git a/pkgs/gruvbox-plus-icon-pack/default.nix b/pkgs/gruvbox-plus-icon-pack/default.nix index 3dddb9a..4e1cdeb 100755 --- a/pkgs/gruvbox-plus-icon-pack/default.nix +++ b/pkgs/gruvbox-plus-icon-pack/default.nix @@ -3,7 +3,6 @@ fetchFromGitHub, inputs, gtk3, - fd, gnome-icon-theme, hicolor-icon-theme, }: @@ -13,22 +12,15 @@ stdenvNoCC.mkDerivation rec { src = inputs.gruvbox-plus-icon-pack; - nativeBuildInputs = [gtk3 fd]; + nativeBuildInputs = [gtk3]; propagatedBuildInputs = [gnome-icon-theme hicolor-icon-theme]; installPhase = '' cd Gruvbox-Plus-Dark - fd " " -X rm mkdir -p $out/share/icons/Gruvbox-Plus-Dark cp -r * $out/share/icons/Gruvbox-Plus-Dark ''; - postFixup = '' - for i in $out/share/icons/*; do - gtk-update-icon-cache $i - done - ''; - dontDropIconThemeCache = true; } diff --git a/pkgs/test.patch b/pkgs/test.patch new file mode 100644 index 0000000..554be71 --- /dev/null +++ b/pkgs/test.patch @@ -0,0 +1,20 @@ +diff --git a/CMake/Utils/MyGUIConfigTargets.cmake b/CMake/Utils/MyGUIConfigTargets.cmake +index 871ef84b9..6a594cfe4 100644 +--- a/CMake/Utils/MyGUIConfigTargets.cmake ++++ b/CMake/Utils/MyGUIConfigTargets.cmake +@@ -421,15 +421,6 @@ function(mygui_config_lib PROJECTNAME) + # add GCC visibility flags to shared library build + target_compile_options(${PROJECTNAME} PRIVATE ${MYGUI_GCC_VISIBILITY_OPTIONS}) + target_compile_definitions(${PROJECTNAME} PRIVATE ${MYGUI_GCC_VISIBILITY_DEFINITIONS}) +- if (APPLE) +- # deal with Mac OS X's framework system +- set_target_properties(${PROJECTNAME} PROPERTIES FRAMEWORK TRUE) +- set_target_properties(${PROJECTNAME} PROPERTIES PUBLIC_HEADER "${${PROJECTNAME}_HEADERS}") +- set_target_properties(${PROJECTNAME} PROPERTIES OUTPUT_NAME ${PROJECTNAME}) +- set_target_properties(${PROJECTNAME} PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE) +- set_target_properties(${PROJECTNAME} PROPERTIES BUILD_WITH_INSTALL_NAME_DIR TRUE) +- set_target_properties(${PROJECTNAME} PROPERTIES INSTALL_NAME_DIR "@executable_path/../lib") +- endif (APPLE) + endif () + endif (MYGUI_STATIC) + mygui_install_target(${PROJECTNAME} "") diff --git a/system/configuration.nix b/system/configuration.nix index fb0367d..13e4c6c 100755 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -34,11 +34,10 @@ }; systemd-boot = { - enable = true; - configurationLimit = 5; - consoleMode = "max"; + enable = true; + configurationLimit = 10; + consoleMode = "max"; }; - }; }; diff --git a/system/hardware-configuration.nix b/system/hardware-configuration.nix index 66dc4f4..d4d6f61 100644 --- a/system/hardware-configuration.nix +++ b/system/hardware-configuration.nix @@ -13,7 +13,7 @@ ]; boot.initrd.availableKernelModules = ["nvme"]; - boot.initrd.kernelModules = [ "amdgpu" ]; + boot.initrd.kernelModules = ["amdgpu"]; boot.kernelModules = ["kvm-amd"]; boot.extraModulePackages = []; diff --git a/system/hardware/default.nix b/system/hardware/default.nix index 8cb5d14..94f6b2b 100644 --- a/system/hardware/default.nix +++ b/system/hardware/default.nix @@ -4,7 +4,7 @@ extraPackages = [pkgs.libvdpau-va-gl]; driSupport32Bit = true; }; - chaotic.mesa-git.enable = true; + # chaotic.mesa-git.enable = true; hardware.steam-hardware.enable = true; diff --git a/system/services/default.nix b/system/services/default.nix index bc37060..d024dc0 100644 --- a/system/services/default.nix +++ b/system/services/default.nix @@ -1,4 +1,4 @@ - { +{ imports = [ ./avahi ./locate @@ -11,6 +11,7 @@ services = { blueman.enable = true; flatpak.enable = true; + fwupd.enable = true; gnome.gnome-keyring.enable = true; gvfs.enable = true; openssh.enable = true; diff --git a/system/services/xdg-portal/default.nix b/system/services/xdg-portal/default.nix index 798136d..926a17b 100644 --- a/system/services/xdg-portal/default.nix +++ b/system/services/xdg-portal/default.nix @@ -1,6 +1,7 @@ {pkgs, ...}: { xdg.portal = { enable = true; + config.common.default = "*"; xdgOpenUsePortal = true; wlr.enable = false; #conflict with XDPH if enabled extraPortals = [pkgs.xdg-desktop-portal-gtk]; diff --git a/user/configs/beets/default.nix b/user/configs/beets/default.nix index 70ea9de..ff8f69d 100755 --- a/user/configs/beets/default.nix +++ b/user/configs/beets/default.nix @@ -1,6 +1,6 @@ { programs.beets = { - enable = true; + enable = true; #until fixed settings = { plugins = "duplicates ftintitle fetchart embedart chroma edit replaygain badfiles fish"; diff --git a/user/configs/fish/default.nix b/user/configs/fish/default.nix index cd31315..41fa9c0 100755 --- a/user/configs/fish/default.nix +++ b/user/configs/fish/default.nix @@ -57,7 +57,6 @@ e = "nvim"; ls = "${pkgs.eza}/bin/eza --icons"; ll = "${pkgs.eza}/bin/eza --icons -l"; - nf = "${pkgs.fastfetch}/bin/fastfetch"; r = "${pkgs.ranger}/bin/ranger"; }; }; diff --git a/user/configs/kvantum/default.nix b/user/configs/kvantum/default.nix index fce7bf4..d75a861 100755 --- a/user/configs/kvantum/default.nix +++ b/user/configs/kvantum/default.nix @@ -16,7 +16,7 @@ platformTheme = "gtk"; }; - xdg.configFile."Kvantum/kvantum.kvconfig".text = "theme=gruvbox-kvantum"; - xdg.configFile."Kvantum/gruvbox-kvantum/gruvbox-kvantum.kvconfig".source = inputs.gruvbox-kvantum + "/gruvbox-kvantum/gruvbox-kvantum.kvconfig"; - xdg.configFile."Kvantum/gruvbox-kvantum/gruvbox-kvantum.svg".source = inputs.gruvbox-kvantum + "/gruvbox-kvantum/gruvbox-kvantum.svg"; + # xdg.configFile."Kvantum/kvantum.kvconfig".text = "theme=gruvbox-kvantum"; + # xdg.configFile."Kvantum/gruvbox-kvantum/gruvbox-kvantum.kvconfig".source = inputs.gruvbox-kvantum + "/gruvbox-kvantum/gruvbox-kvantum.kvconfig"; + # xdg.configFile."Kvantum/gruvbox-kvantum/gruvbox-kvantum.svg".source = inputs.gruvbox-kvantum + "/gruvbox-kvantum/gruvbox-kvantum.svg"; } diff --git a/user/configs/mpd/default.nix b/user/configs/mpd/default.nix index 84207af..144373d 100755 --- a/user/configs/mpd/default.nix +++ b/user/configs/mpd/default.nix @@ -53,6 +53,8 @@ enable = true; settings = { + lyrics_fetchers = "musixmatch, sing365, metrolyrics, justsomelyrics, jahlyrics, plyrics, tekstowo, zeneszoveg, internet"; + visualizer_data_source = "/tmp/mpd.fifo"; visualizer_output_name = "my_fifo"; visualizer_in_stereo = true; diff --git a/user/configs/wayland/ags/ags-config/.sass-cache/276f4d14bb513c1c4ba632ea44b6c2e9dde349c2/clock.scssc b/user/configs/wayland/ags/ags-config/.sass-cache/276f4d14bb513c1c4ba632ea44b6c2e9dde349c2/clock.scssc new file mode 100644 index 0000000000000000000000000000000000000000..d417134d26490d21f759c8d438be42da4fdff988 GIT binary patch literal 2349 zcmb_e-*4MC5YB)>v1PaU0VHvqrEs-2Ti3;MQYTKxhjA!Yz`!sRwb7S62$V=UTxC%s zX#$Od)q@2Qg^)j?z`{EyzP(rL;G?Vgrm_JyBM)^HXNM~&#q1{hvD$z z>M97&!cjQzgA4zX+21xKdN!e2BQ#Z5R|wy}Tz$S&qd#7nPM?$urOdKW>J4FDX|IUhUC3@vU>;Y%c9E-WZG6cIP( z0U*)~|4%@hE#*Q5rjEvhrxqNzq59_Q#(St!XC_b4c*Z5_6iKs>z@_=xL|a6sRHa@b zA;e+b<%85B6*At$JAj}~WEg6m!tx2>G0TqNZf3-Xq6Mi9!~sBsnx#s)8kmE4H~*6_ z(IL?V(_Rf9?lkc;xr}Gw?;h;h_-O1nI?&opXv`z`R@)b z;pZg(ZV~}+iqpvZe}Z+0hQ@lPyWTBTv503{;ynxRn?~9srM?y$*t%}6X#IndiP8Et z-ZnDd^J(yTrsN`KfHjgTgW4j0(`W&6AkmAW!GRJ4I=%VicvnY~Yt- z1MQFmD)97uoYFhgi1{rPxnUIZn!Nds_>J}P(LpvmYeYr*wG*8Z5$fc`tT|FBuPBGO z zi!3@&VKi``aI_^Dk5dr}u8>0*PZST}Vq>0&Ay4ALr6r)*;A3X4vC^Fe^kb*u!t9)~ zFw+hE6Mj>te_enj{q+Dp=RzQ)mSC$&a8eUW0fqcp+Lz4k`ci@FP84Ngkx#YZ7yppy zb3fDPBaa_}y-b;z1+Kj6?2c%z(9nd!4=R*q_qs%3M4Cx&EgkCuE$OHSD(U!GOSD%d zs?$+GB9qd-q@y*bY9``JXSi>~gxyRrd*`KM%mP$X3I-4GDLykIuveH!5fI@g>uLj>LQIk#;$^xwL4&>JfJa6#OdF6ir)8fv6 z#|N(YB!ZzBJKy}1J^Q^ccCWX3Gos$h{HDWTEM^&1b5|{lwWi1N+(QK#r@Tw3x7rYF Yf5mpz74!bpZ%b29{h71M^6=Z~zoqtof&c&j literal 0 HcmV?d00001 diff --git a/user/configs/wayland/ags/ags-config/.sass-cache/276f4d14bb513c1c4ba632ea44b6c2e9dde349c2/mpris.scssc b/user/configs/wayland/ags/ags-config/.sass-cache/276f4d14bb513c1c4ba632ea44b6c2e9dde349c2/mpris.scssc new file mode 100644 index 0000000000000000000000000000000000000000..ffd81857302b7030e0249f3985b66483379efe0d GIT binary patch literal 2351 zcmb_e-*4MC5cYsUv1OYv?8M}Pzk4K~Vo8a$v8`)kRPfHl!JiCOG3 zsdTE7b!X$Zg*)2*?ISyn(})?bcHz}q_j(sWnN2{P(3njeyMT*ZGx!wogmDW>p7V%l z`w$?hrT+)O&6i>+16@dS$}$TM+)#D%rSTpLRk_KNG+8i#x@FelYZc)$2l zEYUGhCDmRHAMUpBQ?ZI?;cp)7w(-ftaa5p`o6>|u?kx`&EK_by)j%68;0r$!s9zK@ zDKUV2-UBRkuQC>EjwQ%w;{5F1h?u!CO_mUC5Q{U1^M!J6>3u|#(50}3 zpR?k-P6WJ3MkDY43DzYF8tduqdbd<2JXt7#4=jAB8)=h_`ieKOb=_K1`v)mft@d5K ztA&2x)8NmA6w4$8tdWp8)HeB>MoX9kfu5HQ4kS-AGgqIeo z9!a4BPu(XOy+h4}-9nKKt(aHj^?$@~ZjO(R^6A+iDl({@=o&<*TM)D1NU6NC9O9ZI z0>3P&-uHzBZq6hP`LfX7DKLz`%UL|kS$yR2{lw80uQ&^XS)JYE%{3~UK;BUWT<=~P z6q?GMAfOQcfM3@++Z1TUSv}B?MfV7)B|4}Qoz=QqLL$Ey`-+ZEO2ZIjn-8HT!i?dx zCbi!<+zK>m;?qYCpR`61nr0HhwD2iVHB9gN=lYjfz!i?)8c&0?4|%KX6peAvma{-cB%w* zW=kk!YV0d!+cA|3o>au*fo2c8IYkE-h9bQHnhZmDh|lpGUA4VdwGDOdR-p8*Z<21V zdQ*T^)%5_T>adpJNtK{pbqR&A%3ck=Wl)oD70Lpv@D3E$2|RD`(0S(nfLVEGz~ckg zd>VlYCeBy?6c2y@v)%8nUyZ2$qPXg?Ha;9xV|n;ZJCzbgl^m;uwiazd{q>Gu`-`1- UMZbUb+fo-)f95Px9v;p91;>nnA^-pY literal 0 HcmV?d00001 diff --git a/user/configs/wayland/ags/ags-config/.sass-cache/276f4d14bb513c1c4ba632ea44b6c2e9dde349c2/sysTray.scssc b/user/configs/wayland/ags/ags-config/.sass-cache/276f4d14bb513c1c4ba632ea44b6c2e9dde349c2/sysTray.scssc new file mode 100644 index 0000000000000000000000000000000000000000..b29d3715800a97dcc7b7c60ad109374f9b11dc64 GIT binary patch literal 3516 zcmb_f&2Aev5VnCrT1mELJMmBKI#pCRZJJt=|5Nf%7C{3D2#O#Qa`8c+b}4z=)pE;S z)p3Iy`UdSQw6D-UPT!?7`@RgJ`%M1JB;{4g!*<^Aysefci@?gNjkdUDgf{@ozM&Ch=V`%@vw zZt67t2)V?sHPU2Z#8os3B$(JYRbI)^ja=zh=>{NJVRAAFMFh)LCVVG8Lib`J-FF+{ z8X@)oD#R>RBvcO%(#_;gvLyQ~Ofx+)@X_5GeIRpt75eeQZiOE7+lQeYhTVYs!t36+ z&QwHUH@pppP}&ZPDv&YyP?A;>Mn6RX^mzfmKr<3EOtJzR_1oWcujNd1XWXBIy^bRz zgdcY2p-^30`V)5=c5nEt$9<>EVGTb=$#--FnNxy$qyNX)E(@WwBdqV}hAZFor=g@< z6}pY3th0!ZLwAW*u4)Cgzfv+lwy)E5B>L8v+doc~ocj)7^`wfSHrUVHo5M|zzEy6Y z?8MingjTF$oY>6}k=-OQB}Y>3rQxt{c0|(8(p0Ym+;N~zG3y>NEn@3O_ z*9Skr2-=nl#ReU`bylG|7Sv-y=K^=_EHJDF{gOU4(_dyFPrqs4tAq%Q84jA-!I43f z6bkz`ljoV;97_ePJ5tM-2 zyC)e6Bxy{&(sYy=%F|&Q%F^-LaI~czndwL&u|X!!)6tl5HFbT>GulBi(QeF`t@DgA zxB%84@hcf> zwyRB504q#_q@BQkgHboi-T^~Nt4(TQ6WorceJlQbLkVZ{TOuHv|^O1hQ| zWZJYSbUr%e zcOPygWrp(TO+z~RKXmk{kk{0VKE=eA|GXRhovCGX6YHd`((8qo*THu_MR0dNb5!0y z$_(VOng(>Nf9Y6J;X`92#ln{V)(~_HS+c)29Z!TH$pVcrZ)*?d5-x z4)U(vY84+;q;;4)kSGY#CjimoS}#y)jIr$8;^0E1q`8w;v5(XG`+D+k%VHyIAtZfY oNei!L?5gnW%e+lds8K?7(QJIp@i}fj-LSjnO(WT57x;AeFMU;c82|tP literal 0 HcmV?d00001 diff --git a/user/configs/wayland/ags/ags-config/.sass-cache/276f4d14bb513c1c4ba632ea44b6c2e9dde349c2/volume.scssc b/user/configs/wayland/ags/ags-config/.sass-cache/276f4d14bb513c1c4ba632ea44b6c2e9dde349c2/volume.scssc new file mode 100644 index 0000000000000000000000000000000000000000..14bb0a0306f6818a70e3b1e511b3ea9acdd13432 GIT binary patch literal 2353 zcmb_eTW{Mo6!w5Y@h!~-OX509=ek|i%VN244JYKoI20>jU>J(p=t~|1N}?TZlBkhV zlc4DH{`L+fQH~t%Z4b6dp2Ks#^PP{RM}x`WZF4mC*<$357Z;P^Vluk)F3;)ZV*K{p zb0-%U7j!uEFURg=-2ApK(Bm0Z3Zc1V455!gB!38>wb3KuUGu<~EV{DRozj45rybNJ z62@27wBH_l7C{;^3t7L-(LRZ(RLpm@Sqaq7bIe%4yhKQZ-ia`zGxm4NB9GP4HVIki zGO2W~lXYj~w}so<{_KIBhjGA+S1b4Gu6w-;pw2o#j%diH{Z@e&H|DSw@Q85>ieB)5 zX@?1?LSkVQg%!u7T7o3U$R8mIadR1v4AlAM4(zm`FqwM@_P!$W)W-LDNcrop3i<9q#lUeTFpmCc+%U zSw(8UbGR00P{*ea96o7{A~Z`RglXVYplTT3_TK0(GsvQYGW3zSiy7MCK8q5*;7p=E z@mVaHM-$L0k04L%z%|Z6`{1MRpvD@*4d8UIEL_j}rZ6qehsJ^R7r z++6gg0IQ;_0Zh?;B>`OC#T8I3x`0AhX)n*cWl)n&8Oj2zWhi*w;GuKOKY@91Wx(SD zw|pFc2&VmS{wbdR-j`;tw|+IE-t+vb!`gWNs2a=tHSJVL9F=k`2ilsq36c5C6P|55r+#~MAMM{gvdcx_iPWnSdo{Mb-g!`L5per_Ax5q0CTLokfWec# zkQS6blb%4YE&wyj=^p?(TB@aXu$3iY z$N@7U*P$IK2yvQs`JjvprSkXaAt2aiYBn<>gyj<^d^g%c8n^%8xi*6}R*?Z(?T^la36WgKHV0r!R1SxI*;LIcmN%WX7U zz#4t7NHZ>Flpp~?y$5jS!GvOgd}|QasP%K_PAx=d!Tlw~Y`ZGN5=>`lgzh-XpUF9- z;13@6-42H}{9VM~F%ht*1^4X#Cs>^sXs?YuwpU#H(w`eek1TqO?JTp9PmL^4>$bF| z{|{OPsQ)UhqV$iZ-1&2^)zWtXtEY4XwZi`9-V$a*krzpu9W8?}owQF}OFs2Pg;qzc z%2eH7Oy|+YV+Mg>3LK?jc4D2P-Hz?h;yrqzHruxca%g1j!?zdoj5X+Uc1mlk0rF7+ z>dJgB(3i464p{&d*yh0x`8_H6Vg*GOP&cpHoBxPk+#R2sM3b~bTCAPhQBM((dQ8lY zEs6e;a#$zbqUiSt)wQY8z|Do`u3X02I|qj84-t#U5sQyJUX5C4vE#ikp4r|*S=^$s z2;`k)!13*MiUO&O2m%V}kMvERvt5DKoaF=k6nBrYT%w~a(M7Ji2_*JQYG2c_A8^+N z*+xT%M5JRl&PnYz31&X(m=Zk)s=C2_^DX{M7g2Oj29Cr-AjpAq zg&)e96q>Y{D*`PX9)eb-4|xI`4s;3H2Om6$N?Qz=hDxJrEO%7b|Q+71_?X(M5LCRdpHa ztY)C_t(hj>UG=U2>#Fks(yHBDf~Q%6eANjQCNg_A_*ROV)w56*V1?TtK2G40gX_*t ze;G`YGXt(5IOYQnR4{6N_0Q%{f#&COv$=ghlIF|!z@uo~9N5&d`3;>Cp_5FM*#fO` evq*EhFSPun9Q6k8!u*+uW#z9tD=m`tC;tK;F^b6m literal 0 HcmV?d00001 diff --git a/user/configs/wayland/ags/ags-config/.sass-cache/276f4d14bb513c1c4ba632ea44b6c2e9dde349c2/workspaces.scssc b/user/configs/wayland/ags/ags-config/.sass-cache/276f4d14bb513c1c4ba632ea44b6c2e9dde349c2/workspaces.scssc new file mode 100644 index 0000000000000000000000000000000000000000..747ac1a8b65111615fc9ed688fe44d09031b1b2d GIT binary patch literal 7043 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 EKaivR0RR91 literal 0 HcmV?d00001 diff --git a/user/configs/wayland/ags/ags-config/.sass-cache/7066c94b235402477038797511879657f5f15bb3/style.scssc b/user/configs/wayland/ags/ags-config/.sass-cache/7066c94b235402477038797511879657f5f15bb3/style.scssc new file mode 100644 index 0000000000000000000000000000000000000000..70e5964020ac55c03c23453f7144e0a81892d1d1 GIT binary patch literal 2823 zcmb_e+iu%N5Os@!mS|lZ+i9J;7e&1UF%pxm?bzLYD1o8@1QdZ$seSQ-up&p&HYAtb zCG7}7eyCsBS&EcNimLn22LYPh**P<3xM%k4DHj_>J(OMLLc<=e{Q)yy*&ZRCF2y zk&vldn|$W*)BDS@9eKP}WQ)w-fR1M6Vgd_+>O`wlQAI5!0!Hn0F8xLN7f+AEldgj~^ql&Ti1}s(9hUGIiPSVvY?qCi@%2&a6etUI>wS?E~| z|KsoFa^28~T}J}*$Nx{TLq}nU#=1@8J0?RO&XB6c5Ml!po-;N7u=Sek=S41?Y74sE zrj0@W)2y!%3&CG;qPs~=o9;L!ZP`d~gLVY%HtDWdGTJ~!J9NKbJ*5Xuhdy??^ov#S z=f&XG9rtDsBQZk0RS|PRZN_U>@R}t&ZJpQP9oOUW&=Yqf9v7OvR-jn{G)sWmx~KvC zt`_iC_(^d8fvsWfRIqkRSlY5{u)eLu3L?q>g~wI}s#Sv0mi3>ZTwl0vH@B=^fohka zv{eW7eQi~E;YN}zHiLC4V4V_}woYs6vNNzy#C*zKmg9+&1rQGNDH@wC;* zX-95jHc@;FZynZNnuOO@vqB&`0xgP~q|bt36n8sjVk@?esa{B9EL1%N(mk7_)bz5yD+jf9m5k>f_-{ zAe}1feQ?~;iM>1na=4^#bL+D79WOtUj~U(mY{odFRrGRi_w+a$=Z~0CezY~{fBg4H z*?{Xk%Px7%OXV3g&8pk|;KSY8%}s;rVgJhDdGJ7Ca6IUHFZ>U>-V67Gu0`QR=QTo# tTB$ZDr#@#M_uiYm-u>kwz4R_n^Mh%o7XqJbdB3w)#JWlttB>T>=pUcqB<=tJ literal 0 HcmV?d00001 diff --git a/user/configs/wayland/ags/ags-config/.sass-cache/7374c266d40f30c3143150a6135aabe76e1eef96/gruvbox.scssc b/user/configs/wayland/ags/ags-config/.sass-cache/7374c266d40f30c3143150a6135aabe76e1eef96/gruvbox.scssc new file mode 100644 index 0000000000000000000000000000000000000000..efc1cab9162348982bc0db17bfc1bd4841decf26 GIT binary patch literal 3912 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 Kb_!zj^y*)X6PS|# literal 0 HcmV?d00001 diff --git a/user/configs/wayland/ags/ags-config/config.js b/user/configs/wayland/ags/ags-config/config.js index e846348..ac87b49 100644 --- a/user/configs/wayland/ags/ags-config/config.js +++ b/user/configs/wayland/ags/ags-config/config.js @@ -13,12 +13,12 @@ from './js/utils.js'; Notifications.clear(); -const scss = App.configDir + '/style.scss'; -const css = '/tmp/style-ags.css'; -exec(`sassc ${scss} ${css}`); +const styleScss = App.configDir + '/style.scss'; +const styleCss = '/tmp/style-ags.css'; +exec(`sassc ${styleScss} ${styleCss}`); export default { - style: css, + style: styleCss, windows: [ forMonitors(Panel), NotificationsPopupWindow(), diff --git a/user/configs/wayland/ags/ags-config/js/notifications/notification.js b/user/configs/wayland/ags/ags-config/js/notifications/notification.js index 54712cf..13ee49f 100644 --- a/user/configs/wayland/ags/ags-config/js/notifications/notification.js +++ b/user/configs/wayland/ags/ags-config/js/notifications/notification.js @@ -4,10 +4,10 @@ import { lookUpIcon, timeout } from 'resource:///com/github/Aylur/ags/utils.js'; const NotificationIcon = ({ appEntry, appIcon, image }) => { if (image) { return Widget.Box({ - valign: 'start', + vpack: 'start', hexpand: false, className: 'icon img', - style: ` + css: ` background-image: url("${image}"); background-size: contain; background-repeat: no-repeat; @@ -27,17 +27,17 @@ const NotificationIcon = ({ appEntry, appIcon, image }) => { icon = appEntry; return Widget.Box({ - valign: 'start', + vpack: 'start', hexpand: false, className: 'icon', - style: ` + css: ` min-width: 78px; min-height: 78px; `, children: [Widget.Icon({ icon, size: 58, - halign: 'center', hexpand: true, - valign: 'center', vexpand: true, + hpack: 'center', hexpand: true, + vpack: 'center', vexpand: true, })], }); }; @@ -88,7 +88,7 @@ export const Notification = n => Widget.EventBox({ }), Widget.Button({ className: 'close-button', - valign: 'start', + vpack: 'start', child: Widget.Icon('window-close-symbolic'), onClicked: n.close.bind(n), }), diff --git a/user/configs/wayland/ags/ags-config/js/notifications/notificationPopup.js b/user/configs/wayland/ags/ags-config/js/notifications/notificationPopup.js index 7b2d029..0258bc2 100644 --- a/user/configs/wayland/ags/ags-config/js/notifications/notificationPopup.js +++ b/user/configs/wayland/ags/ags-config/js/notifications/notificationPopup.js @@ -5,7 +5,7 @@ import { Notification } from './notification.js'; const PopupList = () => Box({ className: 'notificationPopupList', - style: 'padding: 1px;', // so it shows up + css: 'padding: 1px;', // so it shows up vertical: true, binds: [['children', Notifications, 'popups', popups => popups.map(Notification)]], diff --git a/user/configs/wayland/ags/ags-config/js/notifications/widgets.js b/user/configs/wayland/ags/ags-config/js/notifications/widgets.js index dfc2281..7d1fbf2 100644 --- a/user/configs/wayland/ags/ags-config/js/notifications/widgets.js +++ b/user/configs/wayland/ags/ags-config/js/notifications/widgets.js @@ -18,7 +18,7 @@ const Placeholder = () => Widget.Box({ className: 'placeholder', vertical: true, vexpand: true, - valign: 'center', + vpack: 'center', children: [ Widget.Icon('notifications-disabled-symbolic'), Widget.Label('Your inbox is empty'), diff --git a/user/configs/wayland/ags/ags-config/js/panel/panel.js b/user/configs/wayland/ags/ags-config/js/panel/panel.js index f8c4832..f544169 100644 --- a/user/configs/wayland/ags/ags-config/js/panel/panel.js +++ b/user/configs/wayland/ags/ags-config/js/panel/panel.js @@ -24,7 +24,7 @@ const Center = () => Box({ }); const Right = () => Box({ - halign: 'end', + hpack: 'end', children: [ SysTray(), Clock(), @@ -33,7 +33,7 @@ const Right = () => Box({ export default monitor => Window({ name: `bar-${monitor}`, - exclusive: true, + exclusivity: "exclusive", className: 'bar', monitor, anchor: ['top', 'left', 'right'], diff --git a/user/configs/wayland/ags/ags-config/js/panel/widgets/volume.js b/user/configs/wayland/ags/ags-config/js/panel/widgets/volume.js index c93f43a..591a52e 100644 --- a/user/configs/wayland/ags/ags-config/js/panel/widgets/volume.js +++ b/user/configs/wayland/ags/ags-config/js/panel/widgets/volume.js @@ -11,7 +11,6 @@ export default () => Button({ Stack({ items: [ // tuples of [string, Widget] - ['101', Icon('audio-volume-overamplified-symbolic')], ['67', Icon('audio-volume-high-symbolic')], ['34', Icon('audio-volume-medium-symbolic')], ['1', Icon('audio-volume-low-symbolic')], diff --git a/user/configs/wayland/hyprland/default.nix b/user/configs/wayland/hyprland/default.nix index 830ef95..c93067e 100755 --- a/user/configs/wayland/hyprland/default.nix +++ b/user/configs/wayland/hyprland/default.nix @@ -2,222 +2,19 @@ config, pkgs, inputs, + system, ... -}: let - leftMonitor = { - display = "DP-2"; - res = "preferred"; - pos = "0x0"; - }; - - rightMonitor = { - display = "DP-1"; - res = "preferred"; - pos = "2560x0"; - }; - - modKey = "SUPER"; - - wobsock = "/tmp/wob-vol.fifo"; - - wob-voldaemon = pkgs.writeShellScriptBin "wob-volumeindicator.sh" '' - if pgrep "wob"; then - killall wob &> /dev/null - fi - - if [[ -e "${wobsock}" ]]; then - rm "${wobsock}" - fi - - mkfifo "${wobsock}" - tail -f "${wobsock}" | ${pkgs.wob}/bin/wob & - echo "wob: started" - ''; - - killprocess = pkgs.writeShellScriptBin "killprocess.sh" '' - ps -x -o pid=,comm= | column -t -o " " | ${pkgs.rofi-wayland}/bin/rofi -dmenu -p "kill process: " | awk '{print $1}' | uniq | xargs -r kill -9 - ''; - - passmenu = pkgs.writeShellScriptBin "passmenu.sh" '' - shopt -s nullglob globstar - - prefix=''${PASSWORD_STORE_DIR-~/.password-store} - password_files=( "$prefix"/**/*.gpg ) - password_files=( "''${password_files[@]#"$prefix"/}" ) - password_files=( "''${password_files[@]%.gpg}" ) - - password=$(printf '%s\n' "''${password_files[@]}" | ${pkgs.rofi-wayland}/bin/rofi -dmenu -p "pass: " "$@") - - [[ -n $password ]] || exit - - pass show -c "$password" 2>/dev/null - ''; -in { +}: { imports = [ - inputs.hyprland.homeManagerModules.default + ./settings.nix ../ags ../foot ../wob - ../mako ]; wayland.windowManager.hyprland = { enable = true; - extraConfig = '' - monitor=${leftMonitor.display}, ${leftMonitor.res}, ${leftMonitor.pos}, 1 - monitor=${rightMonitor.display}, ${rightMonitor.res}, ${rightMonitor.pos}, 1 - - workspace = 1, monitor:${rightMonitor.display}, persistent:true - workspace = 2, monitor:${rightMonitor.display}, persistent:true - workspace = 3, monitor:${rightMonitor.display}, persistent:true - - workspace = 4, monitor:${leftMonitor.display}, persistent:true - workspace = 5, monitor:${leftMonitor.display}, persistent:true - workspace = 6, monitor:${leftMonitor.display}, persistent:true - - input { - kb_layout = us - kb_variant = altgr-intl - - #mouse - accel_profile = flat - follow_mouse = 1 - } - - general { - gaps_in = 10 - border_size = 4 - col.active_border = rgba(665C54ff) - col.inactive_border = rgba(282828ff) - } - - dwindle { - pseudotile = yes - preserve_split = yes - } - - master { - new_is_master = true - } - - misc { - force_default_wallpaper = 0 - vfr = true - vrr = 2 - # enable_swallow = true - # swallow_regex = ^(foot)$ - } - - decoration { - rounding = 10 - - blur { - enabled = yes - size = 3 - passes = 2 - new_optimizations = on - } - - drop_shadow = yes - shadow_range = 30 - shadow_render_power = 3 - col.shadow = rgba(1a1a1aee) - } - - animations { - enabled = yes - - animation = windowsIn, 1, 8, default, slide - animation = windowsOut, 1, 8, default, slide - animation = border, 1, 8, default - animation = fade, 1, 5, default - animation = workspaces, 1, 4, default - } - - exec-once = ${pkgs.openrgb}/bin/openrgb --startminimized --profile autorun.orp - exec-once = ${pkgs.blueman}/bin/blueman-applet - # exec-once = ${pkgs.networkmanagerapplet}/bin/nm-applet --indicator - exec-once = ${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1 - # exec-once = ${pkgs.mullvad-vpn}/bin/mullvad-gui - exec-once = ${pkgs.ydotool}/bin/ydotoold - - exec = ${pkgs.xorg.xrandr}/bin/xrandr --output ${rightMonitor.display} --primary - exec = ${wob-voldaemon}/bin/wob-volumeindicator.sh - exec = ags -q; ags - exec = pkill swww; sleep 2 && ${pkgs.swww}/bin/swww init && ${pkgs.swww}/bin/swww img $(cat ~/.cache/swww/wallpaper.txt) - - #Set cursor - exec = ${pkgs.hyprland}/bin/hyprctl setcursor "${config.gtk.cursorTheme.name}" ${builtins.toString config.gtk.cursorTheme.size} &> /dev/null - - # Fix clipboard with Wine - exec-once = ${pkgs.wl-clipboard}/bin/wl-paste -t text -w sh -c '[ "$(${pkgs.xclip}/bin/xclip -selection clipboard -o)" = "$(${pkgs.wl-clipboard}/bin/wl-paste -n)" ] || ${pkgs.xclip}/bin/xclip -selection clipboard' - - env = XCURSOR_SIZE,${builtins.toString config.gtk.cursorTheme.size} - - #keybinds - bind = ${modKey}, 1, workspace, 1 - bind = ${modKey}, 2, workspace, 2 - bind = ${modKey}, 3, workspace, 3 - bind = ${modKey}, 4, workspace, 4 - bind = ${modKey}, 5, workspace, 5 - bind = ${modKey}, 6, workspace, 6 - - bind = ${modKey} SHIFT, 1, movetoworkspace, 1 - bind = ${modKey} SHIFT, 2, movetoworkspace, 2 - bind = ${modKey} SHIFT, 3, movetoworkspace, 3 - bind = ${modKey} SHIFT, 4, movetoworkspace, 4 - bind = ${modKey} SHIFT, 5, movetoworkspace, 5 - bind = ${modKey} SHIFT, 6, movetoworkspace, 6 - - - bindm = ${modKey}, mouse:272, movewindow - bindm = ${modKey}, mouse:273, resizewindow - - bind = ${modKey}, P, pseudo, # dwindle - bind = ${modKey}, J, togglesplit, # dwindle - bind = ${modKey} SHIFT, Space, togglefloating - bind = ${modKey}, F, fullscreen - - bind = ${modKey} SHIFT, Q, killactive - bind = ${modKey}, D, exec, ${pkgs.rofi-wayland}/bin/rofi -show drun -p Applications -show-icons - - bind = ${modKey}, Q, exec, ${pkgs.firefox}/bin/firefox - - bind = ${modKey}, Return, exec, ${pkgs.foot}/bin/foot - - bind = , XF86AudioRaiseVolume, exec, ${pkgs.pamixer}/bin/pamixer -i 10 --get-volume > ${wobsock} - bind = , XF86AudioLowerVolume, exec, ${pkgs.pamixer}/bin/pamixer -d 10 --get-volume > ${wobsock} - - bind = CTRL, grave, exec, ags toggle-window notification-center - bind = ${modKey} SHIFT, O, exec, ${killprocess}/bin/killprocess.sh - bind = ${modKey} SHIFT, P, exec, ${passmenu}/bin/passmenu.sh - - bind = MOD5, F9, exec, ${pkgs.mpc-cli}/bin/mpc stop - bind = MOD5, F10, exec, ${pkgs.mpc-cli}/bin/mpc prev - bind = MOD5, F11, exec, ${pkgs.mpc-cli}/bin/mpc toggle - bind = MOD5, F12, exec, ${pkgs.mpc-cli}/bin/mpc next - - bind = , Print, exec, ${pkgs.grimblast}/bin/grimblast -c --notify copy screen - bind = ${modKey}, Print, exec, ${pkgs.grimblast}/bin/grimblast -c --notify copy active - bind = ${modKey} SHIFT, Print, exec, ${pkgs.grimblast}/bin/grimblast -c --notify copy area - bind = ${modKey}, R, exec, ${pkgs.dolphin}/bin/dolphin - - bind = ${modKey} SHIFT, C, exec, hyprctl reload - - layerrule = blur, notifications - layerrule = ignorezero, notifications - - layerrule = blur, gtk-layer-shell - layerrule = blur, bar-0 - layerrule = blur, bar-1 - - layerrule = blur, notificationPopupWindow - layerrule = ignorezero, notificationPopupWindow - - - windowrulev2 = fullscreen, class:^(hl2_linux)$ - windowrulev2 = float, class:^(org.kde.dolphin)$ - ''; + package = inputs.hyprland.packages.${system}.hyprland; }; home.file.".local/share/kservices5/swww.desktop".text = '' @@ -230,8 +27,8 @@ in { [Desktop Action setSWWWWallpaper] Name=Set Image as Wallpaper - Exec=swww img "%f" && echo "%f" > ~/.cache/swww/wallpaper.txt + Exec=swww img "%f" && ln -sf "%f" ~/.cache/swww/wallpaper ''; - home.packages = [pkgs.wl-clipboard pkgs.wl-clipboard-x11 pkgs.hyprpicker pkgs.swww pkgs.hyprprop]; + home.packages = [pkgs.wl-clipboard pkgs.wl-clipboard-x11 pkgs.swww inputs.hyprland-contrib.packages.${system}.hyprprop]; } diff --git a/user/configs/wayland/hyprland/settings.nix b/user/configs/wayland/hyprland/settings.nix new file mode 100644 index 0000000..1a95c92 --- /dev/null +++ b/user/configs/wayland/hyprland/settings.nix @@ -0,0 +1,177 @@ +{ + config, + pkgs, + ... +}: let + leftMonitor = { + display = "DP-2"; + res = "preferred"; + pos = "0x0"; + }; + + rightMonitor = { + display = "DP-1"; + res = "preferred"; + pos = "2560x0"; + }; + + modKey = "SUPER"; +in { + wayland.windowManager.hyprland = { + settings = { + monitor = [ + "${leftMonitor.display}, ${leftMonitor.res}, ${leftMonitor.pos}, 1" + "${rightMonitor.display}, ${rightMonitor.res}, ${rightMonitor.pos}, 1" + ]; + + workspace = [ + "1, monitor:${rightMonitor.display}, persistent:true" + "2, monitor:${rightMonitor.display}, persistent:true" + "3, monitor:${rightMonitor.display}, persistent:true" + + "4, monitor:${leftMonitor.display}, persistent:true" + "5, monitor:${leftMonitor.display}, persistent:true" + "6, monitor:${leftMonitor.display}, persistent:true" + ]; + + input = { + kb_layout = "us"; + kb_variant = "altgr-intl"; + accel_profile = "flat"; + follow_mouse = 1; + }; + + general = { + gaps_in = 10; + border_size = 4; + "col.active_border" = "rgba(665C54ff)"; + "col.inactive_border" = "rgba(282828ff)"; + }; + + dwindle = { + pseudotile = true; + preserve_split = true; + }; + + master = { + new_is_master = true; + }; + + misc = { + force_default_wallpaper = 0; + vfr = true; + vrr = 2; + }; + + decoration = { + rounding = 10; + + blur = { + enabled = true; + size = 3; + passes = 2; + new_optimizations = true; + }; + drop_shadow = true; + shadow_range = 30; + shadow_render_power = 3; + "col.shadow" = "rgba(1a1a1aee)"; + }; + + animations = { + enabled = true; + animation = [ + "windowsIn, 1, 8, default, slide" + "windowsOut, 1, 8, default, slide" + "border, 1, 8, default" + "fade, 1, 5, default" + "workspaces, 1, 4, default" + ]; + }; + + exec-once = [ + "${pkgs.openrgb}/bin/openrgb --startminimized --profile autorun.orp" + "${pkgs.blueman}/bin/blueman-applet" + "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1" + "${pkgs.ydotool}/bin/ydotoold" + ]; + + exec = [ + "${pkgs.xorg.xrandr}/bin/xrandr --output ${rightMonitor.display} --primary" + "ags -q; ags" + "pkill swww; sleep 2 && ${pkgs.swww}/bin/swww init && ${pkgs.swww}/bin/swww img $(cat ~/.cache/swww/wallpaper.txt)" + + #Set cursor + "${pkgs.hyprland}/bin/hyprctl setcursor ${config.gtk.cursorTheme.name} ${builtins.toString config.gtk.cursorTheme.size} &> /dev/null" + ]; + + env = [ + "XCURSOR_SIZE,${builtins.toString config.gtk.cursorTheme.size}" + ]; + + bind = [ + "${modKey}, 1, workspace, 1" + "${modKey}, 2, workspace, 2" + "${modKey}, 3, workspace, 3" + "${modKey}, 4, workspace, 4" + "${modKey}, 5, workspace, 5" + "${modKey}, 6, workspace, 6" + + "${modKey} SHIFT, 1, movetoworkspace, 1" + "${modKey} SHIFT, 2, movetoworkspace, 2" + "${modKey} SHIFT, 3, movetoworkspace, 3" + "${modKey} SHIFT, 4, movetoworkspace, 4" + "${modKey} SHIFT, 5, movetoworkspace, 5" + "${modKey} SHIFT, 6, movetoworkspace, 6" + + "${modKey}, P, pseudo, # dwindle" + "${modKey}, J, togglesplit, # dwindle" + "${modKey} SHIFT, Space, togglefloating" + "${modKey}, F, fullscreen" + + "${modKey} SHIFT, Q, killactive" + "${modKey}, D, exec, ${pkgs.rofi-wayland}/bin/rofi -show drun -p Applications -show-icons" + "${modKey} SHIFT, P, exec, ${pkgs.rofi-pass-wayland}/bin/rofi-pass" + + "${modKey}, Q, exec, ${pkgs.firefox}/bin/firefox" + + "${modKey}, Return, exec, ${pkgs.foot}/bin/foot" + + ", XF86AudioRaiseVolume, exec, ${pkgs.pamixer}/bin/pamixer -i 10 --get-volume" + ", XF86AudioLowerVolume, exec, ${pkgs.pamixer}/bin/pamixer -d 10 --get-volume" + + "CTRL, grave, exec, ags toggle-window notification-center" + + "MOD5, F9, exec, ${pkgs.mpc-cli}/bin/mpc stop" + "MOD5, F10, exec, ${pkgs.mpc-cli}/bin/mpc prev" + "MOD5, F11, exec, ${pkgs.mpc-cli}/bin/mpc toggle" + "MOD5, F12, exec, ${pkgs.mpc-cli}/bin/mpc next" + ", Print, exec, ${pkgs.grimblast}/bin/grimblast -c --notify copy screen" + "${modKey}, Print, exec, ${pkgs.grimblast}/bin/grimblast -c --notify copy active" + "${modKey} SHIFT, Print, exec, ${pkgs.grimblast}/bin/grimblast -c --notify copy area" + "${modKey}, R, exec, ${pkgs.dolphin}/bin/dolphin" + "${modKey} SHIFT, C, exec, hyprctl reload" + ]; + + bindm = [ + "${modKey}, mouse:272, movewindow" + "${modKey}, mouse:273, resizewindow" + ]; + + layerrule = [ + "blur, notifications" + "ignorezero, notifications" + "blur, gtk-layer-shell" + "blur, bar-0" + "blur, bar-1" + "blur, notificationPopupWindow" + "ignorezero, notificationPopupWindow" + ]; + + windowrulev2 = [ + "fullscreen, class:^(hl2_linux)$" + "float, class:^(org.kde.dolphin)$" + ]; + }; + }; +} diff --git a/user/home.nix b/user/home.nix index 678e9a2..99bb2be 100755 --- a/user/home.nix +++ b/user/home.nix @@ -2,6 +2,7 @@ config, pkgs, inputs, + system, ... }: { imports = [ @@ -25,11 +26,11 @@ home.homeDirectory = "/home/manuel"; home.packages = with pkgs; [ appimage-run + armcord bc bottles bottom calcurse - discord electron gamescope_git gimp @@ -69,18 +70,15 @@ twemoji-color-font vimv vulkan-tools - vulkan-validation-layers xdg-utils - xivlauncher + wqy_zenhei #fix for missing non-ascii fonts in TF2 ]; home.sessionVariables = { EDITOR = "nvim"; GTK_THEME = "${builtins.toString config.gtk.theme.name}"; - MESA_DISK_CACHE_SINGLE_FILE = "1"; NIXOS_OZONE_WL = "1"; NIXPKGS_ALLOW_UNFREE = "1"; - RADV_PERFTEST = "gpl"; WINEDLLOVERRIDES = "winemenubuilder.exe=d"; XDG_SCREENSHOTS_DIR = "~/Screenshots"; };