diff --git a/flake.lock b/flake.lock index ce4c1a5..90e2c84 100644 --- a/flake.lock +++ b/flake.lock @@ -503,11 +503,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1716948383, - "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=", + "lastModified": 1711163522, + "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ad57eef4ef0659193044870c731987a6df5cf56b", + "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4", "type": "github" }, "original": { @@ -644,11 +644,11 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1718226507, - "narHash": "sha256-Nz+qSi8YPj66UdQuETGam8MUMPyGTqPWjFeBn1piN5Q=", + "lastModified": 1716362227, + "narHash": "sha256-o+OVh6c6CW6NNidCbRfdp+9JpERyzrAB/2Eaza0Q6r4=", "owner": "Alexays", "repo": "Waybar", - "rev": "0bc43c1aa74cebb688e16f8d00d15d71ac68067a", + "rev": "35a9ca476dc2595c28fd1d3a34cc26be4f14077a", "type": "github" }, "original": { diff --git a/hosts/goopnet-interface/default.nix b/hosts/goopnet-interface/default.nix index 21e7f76..159309e 100755 --- a/hosts/goopnet-interface/default.nix +++ b/hosts/goopnet-interface/default.nix @@ -17,7 +17,7 @@ # debug strace ltrace lsof # apps - firefox qalculate-gtk krita inkscape handbrake + firefox qalculate-gtk krita inkscape # compatibility wineWowPackages.waylandFull winetricks # misc diff --git a/modules/desktop/hypridle.nix b/modules/desktop/hypridle.nix index 37a6c5c..8948480 100644 --- a/modules/desktop/hypridle.nix +++ b/modules/desktop/hypridle.nix @@ -32,7 +32,7 @@ in { listener = [ { timeout = 60 * 1; - on-timeout = "${lib.getExe pkgs.brightnessctl} -c backlight -s set 20"; # dim screen, save brightness state + on-timeout = "${lib.getExe pkgs.brightnessctl} -c backlight -s set 1%"; # dim screen, save brightness state on-resume = "${lib.getExe pkgs.brightnessctl} -c backlight -r"; # restore previous screen brightness state } { diff --git a/modules/desktop/hyprland.nix b/modules/desktop/hyprland.nix index 30472ed..7c6ff43 100644 --- a/modules/desktop/hyprland.nix +++ b/modules/desktop/hyprland.nix @@ -60,8 +60,8 @@ in { ", XF86AudioRaiseVolume, exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+" ", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-" - ", XF86MonBrightnessUp, exec, ${lib.getExe pkgs.brightnessctl} -c backlight s +2%" - ", XF86MonBrightnessDown, exec, ${lib.getExe pkgs.brightnessctl} -c backlight s 2%-" + ", XF86MonBrightnessUp, exec, ${lib.getExe pkgs.brightnessctl} -c backlight s +5%" + ", XF86MonBrightnessDown, exec, ${lib.getExe pkgs.brightnessctl} -c backlight s 5%-" ]; bindl = [ # "bind locked" ", XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle" @@ -76,6 +76,9 @@ in { "SUPER, Super_L, exec, ${lib.getExe pkgs.nwg-drawer}" ]; bind = let + # screenshotScript = pkgs.writeScript "screenshot" '' + # ${lib.getExe pkgs.grimblast} --freeze --notify copy area + # ''; screenshotScript = pkgs.writeScript "screenshot" '' temp_file=$(mktemp) trap 'rm -f "$temp_file"' EXIT diff --git a/modules/desktop/waybar.nix b/modules/desktop/waybar.nix index 0c91d10..896dfe0 100644 --- a/modules/desktop/waybar.nix +++ b/modules/desktop/waybar.nix @@ -8,7 +8,8 @@ in { enable = mkEnableOption "Enable Waybar, a highly customizable wayland bar for wlroots compositors."; package = mkOption { type = types.package; - default = inputs.waybar.packages.${system}.default; + #default = inputs.waybar.packages.${system}.default; + default = pkgs.waybar; example = "pkgs.waybar"; }; }; diff --git a/modules/software/distractions/discord.nix b/modules/software/distractions/discord.nix index 8f66e18..1c1c8d9 100644 --- a/modules/software/distractions/discord.nix +++ b/modules/software/distractions/discord.nix @@ -3,19 +3,6 @@ with lib; let cfg = config.modules.software.distractions.discord; - flags = [ - "--flag-switches-begin" - "--flag-switches-end" - "--disable-gpu-memory-buffer-video-frames" - "--enable-accelerated-mjpeg-decode" - "--enable-accelerated-video" - "--enable-gpu-rasterization" - "--enable-native-gpu-memory-buffers" - "--enable-zero-copy" - "--ignore-gpu-blocklist" - "--disable-features=UseOzonePlatform" - "--enable-features=VaapiVideoDecoder" - ]; in { options.modules.software.distractions.discord = { enable = mkEnableOption "Enable discord, a social messaging app"; @@ -25,6 +12,20 @@ in { config = mkIf cfg.enable (mkMerge [ (mkIf (!cfg.vesktop) { user.packages = let + flags = + [ + "--flag-switches-begin" + "--flag-switches-end" + "--disable-gpu-memory-buffer-video-frames" + "--enable-accelerated-mjpeg-decode" + "--enable-accelerated-video" + "--enable-gpu-rasterization" + "--enable-native-gpu-memory-buffers" + "--enable-zero-copy" + "--ignore-gpu-blocklist" + "--disable-features=UseOzonePlatform" + "--enable-features=VaapiVideoDecoder" + ]; discord = (pkgs.discord-canary.override { withOpenASAR = true; withVencord = true; @@ -36,13 +37,7 @@ in { in [ discord ]; }) (mkIf cfg.vesktop { - user.packages = [ - (pkgs.vesktop.overrideAttrs (old: { - preInstall = '' - gappsWrapperArgs+=("--add-flags" "${concatStringsSep " " flags}") - ''; - })) - ]; + user.packages = with pkgs; [ vesktop ]; }) ]); } \ No newline at end of file diff --git a/modules/software/tools/mpv.nix b/modules/software/tools/mpv.nix index 231ab58..9bc6fe4 100644 --- a/modules/software/tools/mpv.nix +++ b/modules/software/tools/mpv.nix @@ -14,14 +14,11 @@ in { config = { hwdec = "auto"; - osc = "no"; - border = "no"; }; scripts = with pkgs.mpvScripts; [ mpris - modernx - thumbfast + thumbnail visualizer ]; };