Compare commits

..

No commits in common. "79538cc993cf8dbdd2da77a155ec505fc76124ac" and "b74ed84bf0f239831fd6a1b750c758e28664d4ae" have entirely different histories.

7 changed files with 31 additions and 35 deletions

12
flake.lock generated
View file

@ -503,11 +503,11 @@
}, },
"nixpkgs_8": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1716948383, "lastModified": 1711163522,
"narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=", "narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ad57eef4ef0659193044870c731987a6df5cf56b", "rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -644,11 +644,11 @@
"nixpkgs": "nixpkgs_8" "nixpkgs": "nixpkgs_8"
}, },
"locked": { "locked": {
"lastModified": 1718226507, "lastModified": 1716362227,
"narHash": "sha256-Nz+qSi8YPj66UdQuETGam8MUMPyGTqPWjFeBn1piN5Q=", "narHash": "sha256-o+OVh6c6CW6NNidCbRfdp+9JpERyzrAB/2Eaza0Q6r4=",
"owner": "Alexays", "owner": "Alexays",
"repo": "Waybar", "repo": "Waybar",
"rev": "0bc43c1aa74cebb688e16f8d00d15d71ac68067a", "rev": "35a9ca476dc2595c28fd1d3a34cc26be4f14077a",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -17,7 +17,7 @@
# debug # debug
strace ltrace lsof strace ltrace lsof
# apps # apps
firefox qalculate-gtk krita inkscape handbrake firefox qalculate-gtk krita inkscape
# compatibility # compatibility
wineWowPackages.waylandFull winetricks wineWowPackages.waylandFull winetricks
# misc # misc

View file

@ -32,7 +32,7 @@ in {
listener = [ listener = [
{ {
timeout = 60 * 1; 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 on-resume = "${lib.getExe pkgs.brightnessctl} -c backlight -r"; # restore previous screen brightness state
} }
{ {

View file

@ -60,8 +60,8 @@ in {
", XF86AudioRaiseVolume, exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+" ", XF86AudioRaiseVolume, exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+"
", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-" ", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
", XF86MonBrightnessUp, 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 2%-" ", XF86MonBrightnessDown, exec, ${lib.getExe pkgs.brightnessctl} -c backlight s 5%-"
]; ];
bindl = [ # "bind locked" bindl = [ # "bind locked"
", XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle" ", XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
@ -76,6 +76,9 @@ in {
"SUPER, Super_L, exec, ${lib.getExe pkgs.nwg-drawer}" "SUPER, Super_L, exec, ${lib.getExe pkgs.nwg-drawer}"
]; ];
bind = let bind = let
# screenshotScript = pkgs.writeScript "screenshot" ''
# ${lib.getExe pkgs.grimblast} --freeze --notify copy area
# '';
screenshotScript = pkgs.writeScript "screenshot" '' screenshotScript = pkgs.writeScript "screenshot" ''
temp_file=$(mktemp) temp_file=$(mktemp)
trap 'rm -f "$temp_file"' EXIT trap 'rm -f "$temp_file"' EXIT

View file

@ -8,7 +8,8 @@ in {
enable = mkEnableOption "Enable Waybar, a highly customizable wayland bar for wlroots compositors."; enable = mkEnableOption "Enable Waybar, a highly customizable wayland bar for wlroots compositors.";
package = mkOption { package = mkOption {
type = types.package; type = types.package;
default = inputs.waybar.packages.${system}.default; #default = inputs.waybar.packages.${system}.default;
default = pkgs.waybar;
example = "pkgs.waybar"; example = "pkgs.waybar";
}; };
}; };

View file

@ -3,7 +3,17 @@
with lib; with lib;
let let
cfg = config.modules.software.distractions.discord; cfg = config.modules.software.distractions.discord;
flags = [ in {
options.modules.software.distractions.discord = {
enable = mkEnableOption "Enable discord, a social messaging app";
vesktop = mkEnableOption "Use vesktop, an alternative discord client.";
};
config = mkIf cfg.enable (mkMerge [
(mkIf (!cfg.vesktop) {
user.packages = let
flags =
[
"--flag-switches-begin" "--flag-switches-begin"
"--flag-switches-end" "--flag-switches-end"
"--disable-gpu-memory-buffer-video-frames" "--disable-gpu-memory-buffer-video-frames"
@ -16,15 +26,6 @@ let
"--disable-features=UseOzonePlatform" "--disable-features=UseOzonePlatform"
"--enable-features=VaapiVideoDecoder" "--enable-features=VaapiVideoDecoder"
]; ];
in {
options.modules.software.distractions.discord = {
enable = mkEnableOption "Enable discord, a social messaging app";
vesktop = mkEnableOption "Use vesktop, an alternative discord client.";
};
config = mkIf cfg.enable (mkMerge [
(mkIf (!cfg.vesktop) {
user.packages = let
discord = (pkgs.discord-canary.override { discord = (pkgs.discord-canary.override {
withOpenASAR = true; withOpenASAR = true;
withVencord = true; withVencord = true;
@ -36,13 +37,7 @@ in {
in [ discord ]; in [ discord ];
}) })
(mkIf cfg.vesktop { (mkIf cfg.vesktop {
user.packages = [ user.packages = with pkgs; [ vesktop ];
(pkgs.vesktop.overrideAttrs (old: {
preInstall = ''
gappsWrapperArgs+=("--add-flags" "${concatStringsSep " " flags}")
'';
}))
];
}) })
]); ]);
} }

View file

@ -14,14 +14,11 @@ in {
config = { config = {
hwdec = "auto"; hwdec = "auto";
osc = "no";
border = "no";
}; };
scripts = with pkgs.mpvScripts; [ scripts = with pkgs.mpvScripts; [
mpris mpris
modernx thumbnail
thumbfast
visualizer visualizer
]; ];
}; };