commit c7b91120bb4977477b0005b5d20d655af6d54327 · kitten.sh/system

home/desktop/hyprland.nix

···

       105
       105
        
       

     

       106
       106
        
               bindl = [

     

       107
       107
        
                 ", XF86AudioMute, exec, ${wpctl} set-mute @DEFAULT_AUDIO_SINK@ toggle"

     

       108
       108
       +
                 ", XF86AudioMicMute, exec, ${wpctl} set-mute @DEFAULT_AUDIO_SOURCE@ toggle"

     

       108
       109
        
                 ", XF86AudioPlay, exec, ${playerctl} play-pause"

     

       109
       110
        
                 ", XF86AudioPause, exec, ${playerctl} play-pause"

     

       110
       111
        
                 ", XF86AudioNext, exec, ${playerctl} next"

     
···

       125
       126
        
       

     

       126
       127
        
               windowrule = [

     

       127
       128
        
                 "float, class:zen-beta,initialTitle:(Picture-in-Picture)"

     

       129
       129
       +
               ];

     

       130
       130
       +
       

     

       131
       131
       +
               layerrule = [

     

       132
       132
       +
                 "blur, hyprpanel"

     

       128
       133
        
               ];

     

       129
       134
        
             };

     

       130
       135
        
           };

+13 -8

home/desktop/hyprpanel/src/scss/Bar.scss

···

       3
       3
        
       $bg-color: #{"@theme_bg_color"};

     

       4
       4
        
       

     

       5
       5
        
       window.Bar {

     

       6
       6
       +
           background: transparent;

     

       7
       7
       +
       

     

       6
       8
        
           > box {

     

       7
       7
       -
               background: $bg-color;

     

       9
       9
       +
               min-height: 36px;

     

       10
       10
       +
               padding: 2px 18px;

     

       11
       11
       +
               background: transparent;

     

       8
       12
        
               color: $fg-color;

     

       9
       9
       -
               font-weight: bold;

     

       13
       13
       +
       

     

       14
       14
       +
               font-family: SF Pro Display;

     

       15
       15
       +
               font-weight: medium;

     

       16
       16
       +
               font-size: 13px;

     

       10
       17
        
           }

     

       11
       18
        
       

     

       12
       12
       -
           button {

     

       13
       13
       -
               min-height: 0;

     

       14
       14
       -
               min-width: 0;

     

       15
       15
       -
               border-radius: 8px;

     

       16
       16
       -
               margin: 4px;

     

       17
       17
       -
               padding: 4px 8px;

     

       19
       19
       +
           .menubar-item {

     

       20
       20
       +
               > * + * {

     

       21
       21
       +
                   margin-left: 6px;

     

       22
       22
       +
               }

     

       18
       23
        
           }

     

       19
       24
        
       }

     

       20
       25

+9 -49

home/desktop/hyprpanel/src/ui/Bar.blp

···

       2
       2
        
       using Astal 4.0;

     

       3
       3
        
       

     

       4
       4
        
       template $Bar: Astal.Window {

     

       5
       5
       +
           default-height: 40;

     

       6
       6
       +
       

     

       5
       7
        
           CenterBox centerbox {

     

       6
       8
        
               start-widget: Box {

     

       7
       7
       -
                   MenuButton {

     

       8
       8
       -
                       Label {

     

       9
       9
       -
                           label: bind template.clock;

     

       10
       10
       -
                       }

     

       11
       11
       -
       

     

       12
       12
       -
                       popover: Popover popover {

     

       13
       13
       -
                           Calendar calendar {

     

       14
       14
       -
                               show-day-names: true;

     

       15
       15
       -
                               show-heading: true;

     

       16
       16
       -
                               show-week-numbers: true;

     

       17
       17
       -
                           }

     

       18
       18
       -
                       };

     

       19
       19
       -
                   }

     

       20
       9
        
               };

     

       21
       10
        
       

     

       22
       11
        
               center-widget: Box {

     

       23
       23
       -
                   Box {

     

       24
       24
       -
                       visible: bind template.mpris-visible;

     

       25
       25
       -
       

     

       26
       26
       -
                       Image {

     

       27
       27
       -
                           file: bind template.mpris-art;

     

       28
       28
       -
                       }

     

       29
       29
       -
       

     

       30
       30
       -
                       Label {

     

       31
       31
       -
                           label: bind template.mpris-label;

     

       32
       32
       -
                       }

     

       33
       33
       -
                   }

     

       34
       12
        
               };

     

       35
       13
        
       

     

       36
       14
        
               end-widget: Box {

     

       37
       37
       -
                   spacing: 4;

     

       38
       38
       -
       

     

       39
       39
       -
                   Image {

     

       40
       40
       -
                       visible: bind template.bluetooth-visible;

     

       41
       41
       -
                       icon-name: "bluetooth-symbolic";

     

       42
       42
       -
                   }

     

       15
       15
       +
                   spacing: 14;

     

       43
       16
        
       

     

       44
       17
        
                   Image {

     

       45
       45
       -
                       icon-name: bind template.power-profile-icon;

     

       46
       46
       -
                   }

     

       47
       47
       -
       

     

       48
       48
       -
                   Image {

     

       18
       18
       +
                       styles ["menubar-item"]

     

       49
       19
        
                       icon-name: bind template.network-icon;

     

       50
       20
        
                   }

     

       51
       21
        
       

     

       52
       22
        
                   Box {

     

       23
       23
       +
                       styles ["menubar-item"]

     

       53
       24
        
                       Image {

     

       54
       25
        
                           icon-name: bind template.volume-icon;

     

       55
       26
        
                       }

     

       56
       56
       -
       

     

       57
       57
       -
                       Scale {

     

       58
       58
       -
                           width-request: 100;

     

       59
       59
       -
                           change-value => $change_volume();

     

       60
       60
       -
       

     

       61
       61
       -
                           adjustment: Adjustment {

     

       62
       62
       -
                               value: bind template.volume;

     

       63
       63
       -
                               lower: 0;

     

       64
       64
       -
                               upper: 1;

     

       65
       65
       -
                           };

     

       66
       66
       -
                       }

     

       67
       27
        
                   }

     

       68
       28
        
       

     

       69
       29
        
                   Box {

     

       70
       70
       -
                       Image {

     

       71
       71
       -
                           icon-name: bind template.battery-icon;

     

       72
       72
       -
                       }

     

       73
       73
       -
       

     

       30
       30
       +
                       styles ["menubar-item"]

     

       74
       31
        
                       Label {

     

       75
       32
        
                           label: bind template.battery-label;

     

       33
       33
       +
                       }

     

       34
       34
       +
                       Image {

     

       35
       35
       +
                           icon-name: bind template.battery-icon;

     

       76
       36
        
                       }

     

       77
       37
        
                   }

     

       78
       38
        
               };

+1 -56

home/desktop/hyprpanel/src/vala/Bar.vala

···

       1
       1
        
       [GtkTemplate(ui="/ui/Bar.ui")]

     

       2
       2
        
       class Bar : Astal.Window {

     

       3
       3
       -
           public string clock { get; set; }

     

       4
       3
        
           public string volume_icon { get; set; }

     

       5
       4
        
           public string battery_visible { get; set; }

     

       6
       5
        
           public string battery_label { get; set; }

     

       7
       6
        
           public string battery_icon { get; set; }

     

       8
       8
       -
           public double volume { get; set; }

     

       9
       7
        
           public string network_icon { get; set; }

     

       10
       10
       -
           public bool mpris_visible { get; set; }

     

       11
       11
       -
           public string mpris_label { get; set; }

     

       12
       12
       -
           public string mpris_art { get; set; }

     

       13
       13
       -
           public string power_profile_icon { get; set; }

     

       14
       14
       -
           public bool bluetooth_visible { get; set; }

     

       15
       15
       -
       

     

       16
       16
       -
           AstalIO.Time timer;

     

       17
       17
       -
           AstalMpris.Player player;

     

       18
       18
       -
       

     

       19
       19
       -
           [GtkChild] unowned Gtk.Popover popover;

     

       20
       20
       -
           [GtkChild] unowned Gtk.Calendar calendar;

     

       21
       8
        
       

     

       22
       9
        
           public Bar() {

     

       10
       10
       +
               namespace = "hyprpanel";

     

       23
       11
        
               anchor = TOP | LEFT | RIGHT;

     

       24
       12
        
               exclusivity = EXCLUSIVE;

     

       25
       13
        
               add_css_class("Bar");

     

       26
       14
        
               present();

     

       27
       27
       -
       

     

       28
       28
       -
               // clock

     

       29
       29
       -
               timer = AstalIO.Time.interval(1000, null);

     

       30
       30
       -
               timer.now.connect(() => {

     

       31
       31
       -
                   clock = new DateTime.now_local().format("%H:%M:%S");

     

       32
       32
       -
               });

     

       33
       33
       -
       

     

       34
       34
       -
               // everytime popover is opened, select current day

     

       35
       35
       -
               popover.notify["visible"].connect(() => {

     

       36
       36
       -
                   if (popover.visible) {

     

       37
       37
       -
                       calendar.select_day(new DateTime.now_local());

     

       38
       38
       -
                   }

     

       39
       39
       -
               });

     

       40
       15
        
       

     

       41
       16
        
               // network

     

       42
       17
        
               var nw = AstalNetwork.get_default();

     
···

       89
       64
        
               // volume

     

       90
       65
        
               var speaker = AstalWp.get_default().get_default_speaker();

     

       91
       66
        
               speaker.bind_property("volume-icon", this, "volume-icon", BindingFlags.SYNC_CREATE);

     

       92
       92
       -
               speaker.bind_property("volume", this, "volume", BindingFlags.SYNC_CREATE);

     

       93
       93
       -
       

     

       94
       94
       -
               // mpris

     

       95
       95
       -
               player = new AstalMpris.Player("spotify");

     

       96
       96
       -
               player.bind_property("available", this, "mpris-visible", BindingFlags.SYNC_CREATE);

     

       97
       97
       -
               player.bind_property("cover-art", this, "mpris-art", BindingFlags.SYNC_CREATE);

     

       98
       98
       -
               player.bind_property("metadata", this, "mpris-label", BindingFlags.SYNC_CREATE, (_, src, ref target) => {

     

       99
       99
       -
                   if (player.title == null || player.artist == null) {

     

       100
       100
       -
                       return false;

     

       101
       101
       -
                   }

     

       102
       102
       -
                   target.set_string(@"$(player.artist) - $(player.title)");

     

       103
       103
       -
                   return true;

     

       104
       104
       -
               }, null);

     

       105
       105
       -
       

     

       106
       106
       -
               // powerprofiles

     

       107
       107
       -
               var powerprofile = AstalPowerProfiles.get_default();

     

       108
       108
       -
               powerprofile.bind_property("icon-name", this, "power-profile-icon", BindingFlags.SYNC_CREATE);

     

       109
       109
       -
       

     

       110
       110
       -
               // bluetooth

     

       111
       111
       -
               var bt = AstalBluetooth.get_default();

     

       112
       112
       -
               bt.bind_property("is-connected", this, "bluetooth-visible", BindingFlags.SYNC_CREATE);

     

       113
       113
       -
           }

     

       114
       114
       -
       

     

       115
       115
       -
           [GtkCallback]

     

       116
       116
       -
           bool change_volume(Gtk.Range scale, Gtk.ScrollType type, double value) {

     

       117
       117
       -
               AstalWp.get_default().get_default_speaker().set_volume(value);

     

       118
       118
       -
               return true;

     

       119
       67
        
           }

     

       120
       68
        
       

     

       121
       69
        
           public override void dispose() {

     

       122
       122
       -
               timer.cancel();

     

       123
       123
       -
               timer.dispose();

     

       124
       124
       -
               player.dispose();

     

       125
       70
        
               base.dispose();

     

       126
       71
        
           }

     

       127
       72
        
       }

modules/desktop/session.nix

···

       35
       35
        
               settings.terminal.vt = 1;

     

       36
       36
        
             };

     

       37
       37
        
             hypridle.enable = true;

     

       38
       38
       +
             upower.enable = true;

     

       38
       39
        
             logind = {

     

       39
       40
        
               powerKey = "suspend";

     

       40
       41
        
               powerKeyLongPress = "poweroff";