diff --git a/flake.nix b/flake.nix index 4c7036c..d8808a2 100755 --- a/flake.nix +++ b/flake.nix @@ -84,7 +84,7 @@ ./profiles/user0 ./profiles/user1 config.nixosModules.desktop - config.nixosModules.gnome + config.nixosModules.hyprland config.nixosModules.personal config.nixosModules.shared config.nixosModules.sops diff --git a/home/default.nix b/home/default.nix index efe8fd3..f61d53d 100755 --- a/home/default.nix +++ b/home/default.nix @@ -50,7 +50,7 @@ in messaging sharing tools - gnome + hypr ; }; }; diff --git a/home/modules/gui/apps/browsers/firefox/config/themes/config/userChrome.css b/home/modules/gui/apps/browsers/firefox/config/themes/config/userChrome.css index a337c32..ba839e4 100755 --- a/home/modules/gui/apps/browsers/firefox/config/themes/config/userChrome.css +++ b/home/modules/gui/apps/browsers/firefox/config/themes/config/userChrome.css @@ -19,7 +19,7 @@ } .titlebar-buttonbox-container { - display: none !important; + display: visible !important; } @@ -91,8 +91,8 @@ #forward-button[disabled="true"] { display: none !important; } -.personalize-button { - display: none !important; +.personalize-button { + display: none !important; } .tab-close-button { diff --git a/home/modules/gui/apps/tools/flameshot/default.nix b/home/modules/gui/apps/tools/flameshot/default.nix index 621d3f3..a072b53 100755 --- a/home/modules/gui/apps/tools/flameshot/default.nix +++ b/home/modules/gui/apps/tools/flameshot/default.nix @@ -1,29 +1,35 @@ { pkgs, ... }: -let - flameshotGrim = pkgs.flameshot.overrideAttrs (oldAttrs: { - src = pkgs.fetchFromGitHub { - owner = "flameshot-org"; - repo = "flameshot"; - rev = "3d21e4967b68e9ce80fb2238857aa1bf12c7b905"; - sha256 = "sha256-OLRtF/yjHDN+sIbgilBZ6sBZ3FO6K533kFC1L2peugc="; - }; - cmakeFlags = [ - "-DUSE_WAYLAND_CLIPBOARD=1" - "-DUSE_WAYLAND_GRIM=1" - ]; - buildInputs = oldAttrs.buildInputs ++ [ pkgs.libsForQt5.kguiaddons ]; - }); -in { - services.flameshot = { - enable = true; - package = flameshotGrim; - settings = { - General = { - disabledTrayIcon = false; - showStartupLaunchMessage = false; - # disabledGrimWarning = false; - }; - }; + # let + # flameshotGrim = pkgs.flameshot.overrideAttrs (oldAttrs: { + # src = pkgs.fetchFromGitHub { + # owner = "flameshot-org"; + # repo = "flameshot"; + # rev = "3d21e4967b68e9ce80fb2238857aa1bf12c7b905"; + # sha256 = "sha256-OLRtF/yjHDN+sIbgilBZ6sBZ3FO6K533kFC1L2peugc="; + # }; + # cmakeFlags = [ + # "-DUSE_WAYLAND_CLIPBOARD=1" + # "-DUSE_WAYLAND_GRIM=1" + # ]; + # buildInputs = oldAttrs.buildInputs ++ [ pkgs.libsForQt5.kguiaddons ]; + # }); + # in + # { + # services.flameshot = { + # enable = true; + # # package = flameshotGrim; + # settings = { + # General = { + # disabledTrayIcon = false; + # showStartupLaunchMessage = false; + # # disabledGrimWarning = false; + # }; + # }; + # }; + home.packages = builtins.attrValues { + inherit (pkgs) + flameshot + ; }; } diff --git a/home/modules/gui/desktop/gnome/default.nix b/home/modules/gui/desktop/gnome/default.nix old mode 100644 new mode 100755 index 9b649bc..b99bea4 --- a/home/modules/gui/desktop/gnome/default.nix +++ b/home/modules/gui/desktop/gnome/default.nix @@ -6,6 +6,7 @@ gnome-tweaks gnome-shell-extensions gnome-remote-desktop + ulauncher ; inherit (pkgs.gnomeExtensions) tiling-shell diff --git a/nixos/modules/hyprland/hyprland.nix b/nixos/modules/hyprland/hyprland.nix index e04e46e..4038bdd 100755 --- a/nixos/modules/hyprland/hyprland.nix +++ b/nixos/modules/hyprland/hyprland.nix @@ -7,8 +7,8 @@ programs.hyprland = { enable = true; xwayland.enable = true; - package = flake.inputs.hyprland.packages.${pkgs.system}.hyprland; - portalPackage = flake.inputs.hyprland-portal.packages.${pkgs.system}.xdg-desktop-portal-hyprland; + # package = flake.inputs.hyprland.packages.${pkgs.system}.hyprland; + # portalPackage = flake.inputs.hyprland-portal.packages.${pkgs.system}.xdg-desktop-portal-hyprland; }; nix = { settings = { diff --git a/systems/desktop/config/graphics.nix b/systems/desktop/config/graphics.nix index b67a5df..18e5509 100755 --- a/systems/desktop/config/graphics.nix +++ b/systems/desktop/config/graphics.nix @@ -3,19 +3,20 @@ hardware = { graphics = { enable = true; + enable32Bit = true; extraPackages = builtins.attrValues { - inherit (pkgs) - amdvlk - ; + # inherit (pkgs) + # amdvlk + # ; inherit (pkgs.rocmPackages.clr) icd ; }; - extraPackages32 = builtins.attrValues { - inherit (pkgs.driversi686Linux) - amdvlk - ; - }; + # extraPackages32 = builtins.attrValues { + # inherit (pkgs.driversi686Linux) + # amdvlk + # ; + # }; }; }; boot.initrd.kernelModules = [