Compare commits
5 commits
b74ed84bf0
...
79538cc993
Author | SHA1 | Date | |
---|---|---|---|
79538cc993 | |||
3399b05bed | |||
61ff00c912 | |||
62acc8b4dd | |||
bbe0c17023 |
7 changed files with 35 additions and 31 deletions
12
flake.lock
generated
12
flake.lock
generated
|
@ -503,11 +503,11 @@
|
|||
},
|
||||
"nixpkgs_8": {
|
||||
"locked": {
|
||||
"lastModified": 1711163522,
|
||||
"narHash": "sha256-YN/Ciidm+A0fmJPWlHBGvVkcarYWSC+s3NTPk/P+q3c=",
|
||||
"lastModified": 1716948383,
|
||||
"narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "44d0940ea560dee511026a53f0e2e2cde489b4d4",
|
||||
"rev": "ad57eef4ef0659193044870c731987a6df5cf56b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -644,11 +644,11 @@
|
|||
"nixpkgs": "nixpkgs_8"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1716362227,
|
||||
"narHash": "sha256-o+OVh6c6CW6NNidCbRfdp+9JpERyzrAB/2Eaza0Q6r4=",
|
||||
"lastModified": 1718226507,
|
||||
"narHash": "sha256-Nz+qSi8YPj66UdQuETGam8MUMPyGTqPWjFeBn1piN5Q=",
|
||||
"owner": "Alexays",
|
||||
"repo": "Waybar",
|
||||
"rev": "35a9ca476dc2595c28fd1d3a34cc26be4f14077a",
|
||||
"rev": "0bc43c1aa74cebb688e16f8d00d15d71ac68067a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
# debug
|
||||
strace ltrace lsof
|
||||
# apps
|
||||
firefox qalculate-gtk krita inkscape
|
||||
firefox qalculate-gtk krita inkscape handbrake
|
||||
# compatibility
|
||||
wineWowPackages.waylandFull winetricks
|
||||
# misc
|
||||
|
|
|
@ -32,7 +32,7 @@ in {
|
|||
listener = [
|
||||
{
|
||||
timeout = 60 * 1;
|
||||
on-timeout = "${lib.getExe pkgs.brightnessctl} -c backlight -s set 1%"; # dim screen, save brightness state
|
||||
on-timeout = "${lib.getExe pkgs.brightnessctl} -c backlight -s set 20"; # dim screen, save brightness state
|
||||
on-resume = "${lib.getExe pkgs.brightnessctl} -c backlight -r"; # restore previous screen brightness state
|
||||
}
|
||||
{
|
||||
|
|
|
@ -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 +5%"
|
||||
", XF86MonBrightnessDown, exec, ${lib.getExe pkgs.brightnessctl} -c backlight s 5%-"
|
||||
", XF86MonBrightnessUp, exec, ${lib.getExe pkgs.brightnessctl} -c backlight s +2%"
|
||||
", XF86MonBrightnessDown, exec, ${lib.getExe pkgs.brightnessctl} -c backlight s 2%-"
|
||||
];
|
||||
bindl = [ # "bind locked"
|
||||
", XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
|
||||
|
@ -76,9 +76,6 @@ 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
|
||||
|
|
|
@ -8,8 +8,7 @@ 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 = pkgs.waybar;
|
||||
default = inputs.waybar.packages.${system}.default;
|
||||
example = "pkgs.waybar";
|
||||
};
|
||||
};
|
||||
|
|
|
@ -3,17 +3,7 @@
|
|||
with lib;
|
||||
let
|
||||
cfg = config.modules.software.distractions.discord;
|
||||
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 =
|
||||
[
|
||||
flags = [
|
||||
"--flag-switches-begin"
|
||||
"--flag-switches-end"
|
||||
"--disable-gpu-memory-buffer-video-frames"
|
||||
|
@ -26,6 +16,15 @@ in {
|
|||
"--disable-features=UseOzonePlatform"
|
||||
"--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 {
|
||||
withOpenASAR = true;
|
||||
withVencord = true;
|
||||
|
@ -37,7 +36,13 @@ in {
|
|||
in [ discord ];
|
||||
})
|
||||
(mkIf cfg.vesktop {
|
||||
user.packages = with pkgs; [ vesktop ];
|
||||
user.packages = [
|
||||
(pkgs.vesktop.overrideAttrs (old: {
|
||||
preInstall = ''
|
||||
gappsWrapperArgs+=("--add-flags" "${concatStringsSep " " flags}")
|
||||
'';
|
||||
}))
|
||||
];
|
||||
})
|
||||
]);
|
||||
}
|
|
@ -14,11 +14,14 @@ in {
|
|||
|
||||
config = {
|
||||
hwdec = "auto";
|
||||
osc = "no";
|
||||
border = "no";
|
||||
};
|
||||
|
||||
scripts = with pkgs.mpvScripts; [
|
||||
mpris
|
||||
thumbnail
|
||||
modernx
|
||||
thumbfast
|
||||
visualizer
|
||||
];
|
||||
};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue