upd
This commit is contained in:
@@ -257,8 +257,6 @@
|
|||||||
permittedInsecurePackages = [
|
permittedInsecurePackages = [
|
||||||
# ...
|
# ...
|
||||||
"libsoup-2.74.3"
|
"libsoup-2.74.3"
|
||||||
# "libxml2-2.13.8"
|
|
||||||
"qtwebengine-5.15.19"
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -58,7 +58,6 @@ in
|
|||||||
];
|
];
|
||||||
|
|
||||||
extraConfig = ''
|
extraConfig = ''
|
||||||
exec-once = nm-applet
|
|
||||||
exec-once = [silent] firefox
|
exec-once = [silent] firefox
|
||||||
exec-once = [silent] vesktop
|
exec-once = [silent] vesktop
|
||||||
exec-once = [silent] chromium --app="https://music.apple.com"
|
exec-once = [silent] chromium --app="https://music.apple.com"
|
||||||
|
|||||||
@@ -461,42 +461,42 @@ in
|
|||||||
++ cfg.windowRule;
|
++ cfg.windowRule;
|
||||||
|
|
||||||
plugin = {
|
plugin = {
|
||||||
touch_gestures = {
|
# touch_gestures = {
|
||||||
# The default sensitivity is probably too low on tablet screens,
|
# # The default sensitivity is probably too low on tablet screens,
|
||||||
# I recommend turning it up to 4.0
|
# # I recommend turning it up to 4.0
|
||||||
sensitivity = "4.0";
|
# sensitivity = "4.0";
|
||||||
|
|
||||||
# must be >= 3
|
# # must be >= 3
|
||||||
workspace_swipe_fingers = "3";
|
# workspace_swipe_fingers = "3";
|
||||||
|
|
||||||
# switching workspaces by swiping from an edge, this is separate from workspace_swipe_fingers
|
# # switching workspaces by swiping from an edge, this is separate from workspace_swipe_fingers
|
||||||
# and can be used at the same time
|
# # and can be used at the same time
|
||||||
# possible values: l, r, u, or d
|
# # possible values: l, r, u, or d
|
||||||
# to disable it set it to anything else
|
# # to disable it set it to anything else
|
||||||
workspace_swipe_edge = "d";
|
# workspace_swipe_edge = "d";
|
||||||
|
|
||||||
# in milliseconds
|
# # in milliseconds
|
||||||
long_press_delay = "400";
|
# long_press_delay = "400";
|
||||||
|
|
||||||
# resize windows by long-pressing on window borders and gaps.
|
# # resize windows by long-pressing on window borders and gaps.
|
||||||
# If general:resize_on_border is enabled, general:extend_border_grab_area is used for floating
|
# # If general:resize_on_border is enabled, general:extend_border_grab_area is used for floating
|
||||||
# windows
|
# # windows
|
||||||
resize_on_border_long_press = true;
|
# resize_on_border_long_press = true;
|
||||||
|
|
||||||
# in pixels, the distance from the edge that is considered an edge
|
# # in pixels, the distance from the edge that is considered an edge
|
||||||
edge_margin = "10";
|
# edge_margin = "10";
|
||||||
|
|
||||||
# emulates touchpad swipes when swiping in a direction that does not trigger workspace swipe.
|
# # emulates touchpad swipes when swiping in a direction that does not trigger workspace swipe.
|
||||||
# ONLY triggers when finger count is equal to workspace_swipe_fingers
|
# # ONLY triggers when finger count is equal to workspace_swipe_fingers
|
||||||
#
|
# #
|
||||||
# might be removed in the future in favor of event hooks
|
# # might be removed in the future in favor of event hooks
|
||||||
emulate_touchpad_swipe = false;
|
# emulate_touchpad_swipe = false;
|
||||||
|
|
||||||
experimental = {
|
# experimental = {
|
||||||
# send proper cancel events to windows instead of hacky touch_up events,
|
# # send proper cancel events to windows instead of hacky touch_up events,
|
||||||
# NOT recommended as it crashed a few times, once it's stabilized I'll make it the default
|
# # NOT recommended as it crashed a few times, once it's stabilized I'll make it the default
|
||||||
send_cancel = "0";
|
# send_cancel = "0";
|
||||||
};
|
# };
|
||||||
|
|
||||||
# hyprgrass-bind = [
|
# hyprgrass-bind = [
|
||||||
# # swipe left from right edge
|
# # swipe left from right edge
|
||||||
@@ -522,7 +522,7 @@ in
|
|||||||
# ", longpress:2, movewindow"
|
# ", longpress:2, movewindow"
|
||||||
# ", longpress:3, resizewindow"
|
# ", longpress:3, resizewindow"
|
||||||
# ];
|
# ];
|
||||||
};
|
# };
|
||||||
};
|
};
|
||||||
|
|
||||||
# gestures = {
|
# gestures = {
|
||||||
|
|||||||
@@ -35,6 +35,7 @@ in
|
|||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./options.nix
|
./options.nix
|
||||||
|
./scripts/audio-control.nix
|
||||||
./scripts/hass.nix
|
./scripts/hass.nix
|
||||||
./scripts/weather.nix
|
./scripts/weather.nix
|
||||||
];
|
];
|
||||||
|
|||||||
33
modules/home/programs/waybar/scripts/audio-control.nix
Normal file
33
modules/home/programs/waybar/scripts/audio-control.nix
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
namespace,
|
||||||
|
pkgs,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
let
|
||||||
|
cfg = config.mjallen.programs.waybar;
|
||||||
|
|
||||||
|
pythonEnv = pkgs.python3.withPackages (_ps: [
|
||||||
|
pkgs.${namespace}.pipewire-python
|
||||||
|
]);
|
||||||
|
|
||||||
|
waybar-audio = pkgs.writeScriptBin "waybar-audio" ''
|
||||||
|
#!${pythonEnv}/bin/python
|
||||||
|
"""run with the special python"""
|
||||||
|
|
||||||
|
from pipewire_python.controller import Controller
|
||||||
|
|
||||||
|
audio_controller = Controller()
|
||||||
|
|
||||||
|
print(audio_controller.get_config())
|
||||||
|
print(audio_controller.get_list_targets())
|
||||||
|
'';
|
||||||
|
in
|
||||||
|
{
|
||||||
|
imports = [ ../options.nix ];
|
||||||
|
|
||||||
|
config = lib.mkIf cfg.enable {
|
||||||
|
home.packages = [ waybar-audio ];
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -71,7 +71,7 @@ in
|
|||||||
portalPackage = lib.mkDefault pkgs.xdg-desktop-portal-hyprland;
|
portalPackage = lib.mkDefault pkgs.xdg-desktop-portal-hyprland;
|
||||||
};
|
};
|
||||||
|
|
||||||
nm-applet.enable = true;
|
nm-applet.enable = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
security = {
|
security = {
|
||||||
|
|||||||
@@ -63,6 +63,7 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
programs.coolercontrol.enable = true;
|
programs.coolercontrol.enable = true;
|
||||||
|
systemd.services.systemd-networkd-wait-online.enable = lib.mkForce false;
|
||||||
|
|
||||||
environment.variables = {
|
environment.variables = {
|
||||||
GDK_SCALE = "1";
|
GDK_SCALE = "1";
|
||||||
|
|||||||
Reference in New Issue
Block a user