commit 22274a6feb1f90dfacd02b63ded1f42f7fdb561b · kitten.sh/system

+69

flake.lock

···

       27
        
               "type": "github"

     

       28
        
             }

     

       29
        
           },

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       30
        
           "android-sdk": {

     

       31
        
             "inputs": {

     

       32
        
               "devshell": "devshell",

     
···

       71
        
               "owner": "kitten",

     

       72
        
               "ref": "edge",

     

       73
        
               "repo": "nixos-apple-silicon",

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       74
        
               "type": "github"

     

       75
        
             }

     

       76
        
           },

     
···

       805
        
               "nixos-hardware": "nixos-hardware",

     

       806
        
               "nixpkgs": "nixpkgs",

     

       807
        
               "nvim-plugins": "nvim-plugins",

     

       0
        
       
     

       808
        
               "yeetmouse": "yeetmouse",

     

       809
        
               "zen-browser": "zen-browser"

     

       810
        
             }

     
···

       827
        
             "original": {

     

       828
        
               "owner": "oxalica",

     

       829
        
               "repo": "rust-overlay",

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       830
        
               "type": "github"

     

       831
        
             }

     

       832
        
           },

···

       27
        
               "type": "github"

     

       28
        
             }

     

       29
        
           },

     

       30
       +
           "ags": {

     

       31
       +
             "inputs": {

     

       32
       +
               "astal": "astal",

     

       33
       +
               "nixpkgs": [

     

       34
       +
                 "system-shell",

     

       35
       +
                 "nixpkgs"

     

       36
       +
               ]

     

       37
       +
             },

     

       38
       +
             "locked": {

     

       39
       +
               "lastModified": 1744557573,

     

       40
       +
               "narHash": "sha256-XAyj0iDuI51BytJ1PwN53uLpzTDdznPDQFG4RwihlTQ=",

     

       41
       +
               "owner": "aylur",

     

       42
       +
               "repo": "ags",

     

       43
       +
               "rev": "3ed9737bdbc8fc7a7c7ceef2165c9109f336bff6",

     

       44
       +
               "type": "github"

     

       45
       +
             },

     

       46
       +
             "original": {

     

       47
       +
               "owner": "aylur",

     

       48
       +
               "repo": "ags",

     

       49
       +
               "type": "github"

     

       50
       +
             }

     

       51
       +
           },

     

       52
        
           "android-sdk": {

     

       53
        
             "inputs": {

     

       54
        
               "devshell": "devshell",

     
···

       93
        
               "owner": "kitten",

     

       94
        
               "ref": "edge",

     

       95
        
               "repo": "nixos-apple-silicon",

     

       96
       +
               "type": "github"

     

       97
       +
             }

     

       98
       +
           },

     

       99
       +
           "astal": {

     

       100
       +
             "inputs": {

     

       101
       +
               "nixpkgs": [

     

       102
       +
                 "system-shell",

     

       103
       +
                 "ags",

     

       104
       +
                 "nixpkgs"

     

       105
       +
               ]

     

       106
       +
             },

     

       107
       +
             "locked": {

     

       108
       +
               "lastModified": 1742571008,

     

       109
       +
               "narHash": "sha256-5WgfJAeBpxiKbTR/gJvxrGYfqQRge5aUDcGKmU1YZ1Q=",

     

       110
       +
               "owner": "aylur",

     

       111
       +
               "repo": "astal",

     

       112
       +
               "rev": "dc0e5d37abe9424c53dcbd2506a4886ffee6296e",

     

       113
       +
               "type": "github"

     

       114
       +
             },

     

       115
       +
             "original": {

     

       116
       +
               "owner": "aylur",

     

       117
       +
               "repo": "astal",

     

       118
        
               "type": "github"

     

       119
        
             }

     

       120
        
           },

     
···

       849
        
               "nixos-hardware": "nixos-hardware",

     

       850
        
               "nixpkgs": "nixpkgs",

     

       851
        
               "nvim-plugins": "nvim-plugins",

     

       852
       +
               "system-shell": "system-shell",

     

       853
        
               "yeetmouse": "yeetmouse",

     

       854
        
               "zen-browser": "zen-browser"

     

       855
        
             }

     
···

       872
        
             "original": {

     

       873
        
               "owner": "oxalica",

     

       874
        
               "repo": "rust-overlay",

     

       875
       +
               "type": "github"

     

       876
       +
             }

     

       877
       +
           },

     

       878
       +
           "system-shell": {

     

       879
       +
             "inputs": {

     

       880
       +
               "ags": "ags",

     

       881
       +
               "flake-utils": [

     

       882
       +
                 "flake-utils"

     

       883
       +
               ],

     

       884
       +
               "nixpkgs": [

     

       885
       +
                 "nixpkgs"

     

       886
       +
               ]

     

       887
       +
             },

     

       888
       +
             "locked": {

     

       889
       +
               "lastModified": 1746537812,

     

       890
       +
               "narHash": "sha256-gr1DbuTbbEa53Hx0BlC+9a382hcUn/XZfdFiQhO8nNw=",

     

       891
       +
               "owner": "kitten",

     

       892
       +
               "repo": "system-shell",

     

       893
       +
               "rev": "bccdaa60737f39c008a79c84fb7b5e36f14dc911",

     

       894
       +
               "type": "github"

     

       895
       +
             },

     

       896
       +
             "original": {

     

       897
       +
               "owner": "kitten",

     

       898
       +
               "repo": "system-shell",

     

       899
        
               "type": "github"

     

       900
        
             }

     

       901
        
           },

flake.nix

···

       54
        
             };

     

       55
        
           };

     

       56
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       57
        
           nvim-plugins = {

     

       58
        
             url = "github:kitten/system-nvim-plugins.nix";

     

       59
        
             inputs = {

     
···

       95
        
             inputs.language-servers.overlays.default

     

       96
        
             (self: super: {

     

       97
        
               zen-browser = inputs.zen-browser.packages.${self.system}.beta;

     

       0
        
       
     

       98
        
             } // (import ./lib/pkgs self))

     

       99
        
           ];

     

       100
        
         in {

···

       54
        
             };

     

       55
        
           };

     

       56
        
       

     

       57
       +
           system-shell = {

     

       58
       +
             url = "github:kitten/system-shell";

     

       59
       +
             inputs = {

     

       60
       +
               nixpkgs.follows = "nixpkgs";

     

       61
       +
               flake-utils.follows = "flake-utils";

     

       62
       +
             };

     

       63
       +
           };

     

       64
       +
       

     

       65
        
           nvim-plugins = {

     

       66
        
             url = "github:kitten/system-nvim-plugins.nix";

     

       67
        
             inputs = {

     
···

       103
        
             inputs.language-servers.overlays.default

     

       104
        
             (self: super: {

     

       105
        
               zen-browser = inputs.zen-browser.packages.${self.system}.beta;

     

       106
       +
               system-shell = inputs.system-shell.packages.${self.system}.default;

     

       107
        
             } // (import ./lib/pkgs self))

     

       108
        
           ];

     

       109
        
         in {

+23 -6

home/desktop/hyprland.nix

···

       4
        
       let

     

       5
        
         cfg = config.modules.desktop;

     

       6
        
       

     

       7
       -
         hyprpanel = pkgs.callPackage ./hyprpanel {};

     

       8
       -
       

     

       9
        
         wpctl = "${pkgs.wireplumber}/bin/wpctl";

     

       10
        
         brightnessctl = "${pkgs.brightnessctl}/bin/brightnessctl";

     

       11
        
         playerctl = "${pkgs.playerctl}/bin/playerctl";

     
···

       55
        
                   brightness = 0.45;

     

       56
        
                   vibrancy = 0.15;

     

       57
        
                   vibrancy_darkness = 0.1;

     

       58
       -
                   ignore_opacity = true;

     

       0
        
       
     

       0
        
       
     

       59
        
                   noise = 0.012;

     

       60
        
                 };

     

       61
        
       

     
···

       88
        
       

     

       89
        
               monitor = [

     

       90
        
                 "eDP-1, preferred, 0x0, 1.6"

     

       91
       -
                 "eDP-1, addreserved, 35, 0, 0, 0"

     

       92
        
               ];

     

       93
        
       

     

       94
        
               bindm = [

     
···

       97
        
               ];

     

       98
        
       

     

       99
        
               bindel = [

     

       100
       -
                 ", XF86AudioRaiseVolume, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 3%+"

     

       101
       -
                 ", XF86AudioLowerVolume, exec, ${wpctl} set-volume @DEFAULT_AUDIO_SINK@ 3%-"

     

       102
        
                 ", XF86MonBrightnessDown, exec, ${brightnessctl} s 10%-"

     

       103
        
                 ", XF86MonBrightnessUp, exec, ${brightnessctl} set +10%"

     

       104
        
               ];

     
···

       130
        
       

     

       131
        
               layerrule = [

     

       132
        
                 "blur, hyprpanel"

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       133
        
               ];

     

       134
        
             };

     

       135
        
           };

     
···

       195
        
                   shadow_passes = 2;

     

       196
        
                 }

     

       197
        
               ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       198
        
             };

     

       199
        
           };

     

       200
        
         };

···

       4
        
       let

     

       5
        
         cfg = config.modules.desktop;

     

       6
        
       

     

       0
        
       
     

       0
        
       
     

       7
        
         wpctl = "${pkgs.wireplumber}/bin/wpctl";

     

       8
        
         brightnessctl = "${pkgs.brightnessctl}/bin/brightnessctl";

     

       9
        
         playerctl = "${pkgs.playerctl}/bin/playerctl";

     
···

       53
        
                   brightness = 0.45;

     

       54
        
                   vibrancy = 0.15;

     

       55
        
                   vibrancy_darkness = 0.1;

     

       56
       +
                   ignore_opacity = false;

     

       57
       +
                   popups_ignorealpha = 0.1;

     

       58
       +
                   input_methods_ignorealpha = 0.1;

     

       59
        
                   noise = 0.012;

     

       60
        
                 };

     

       61
        
       

     
···

       88
        
       

     

       89
        
               monitor = [

     

       90
        
                 "eDP-1, preferred, 0x0, 1.6"

     

       0
        
       
     

       91
        
               ];

     

       92
        
       

     

       93
        
               bindm = [

     
···

       96
        
               ];

     

       97
        
       

     

       98
        
               bindel = [

     

       99
       +
                 ", XF86AudioRaiseVolume, exec, ${wpctl} set-volume -l 1.0 @DEFAULT_AUDIO_SINK@ 3%+"

     

       100
       +
                 ", XF86AudioLowerVolume, exec, ${wpctl} set-volume -l 1.0 @DEFAULT_AUDIO_SINK@ 3%-"

     

       101
        
                 ", XF86MonBrightnessDown, exec, ${brightnessctl} s 10%-"

     

       102
        
                 ", XF86MonBrightnessUp, exec, ${brightnessctl} set +10%"

     

       103
        
               ];

     
···

       129
        
       

     

       130
        
               layerrule = [

     

       131
        
                 "blur, hyprpanel"

     

       132
       +
                 "ignorezero, hyprpanel"

     

       133
       +
                 "xray, hyprpanel"

     

       134
       +
                 "animation slide, hyprpanel"

     

       135
        
               ];

     

       136
        
             };

     

       137
        
           };

     
···

       197
        
                   shadow_passes = 2;

     

       198
        
                 }

     

       199
        
               ];

     

       200
       +
             };

     

       201
       +
           };

     

       202
       +
       

     

       203
       +
           systemd.user.services.hyprpanel = {

     

       204
       +
             Install.WantedBy = ["graphical-session.target"];

     

       205
       +
             Service = {

     

       206
       +
               ExecStart = "${lib.getExe pkgs.system-shell}";

     

       207
       +
               Restart = "on-failure";

     

       208
       +
               RestartSec = 5;

     

       209
       +
               Environment = [ "GSK_RENDERER=ngl" ];

     

       210
       +
             };

     

       211
       +
             Unit = {

     

       212
       +
               After = [ "graphical-session.target" ];

     

       213
       +
               ConditionEnvironment = "WAYLAND_DISPLAY";

     

       214
       +
               PartOf = [ "graphical-session.target" ];

     

       215
        
             };

     

       216
        
           };

     

       217
        
         };

-56

home/desktop/hyprpanel/default.nix

···

       1
       -
       {

     

       2
       -
         stdenv,

     

       3
       -
         astal,

     

       4
       -
         meson,

     

       5
       -
         ninja,

     

       6
       -
         pkg-config,

     

       7
       -
         gobject-introspection,

     

       8
       -
         blueprint-compiler,

     

       9
       -
         gtk4-layer-shell,

     

       10
       -
         gtk4,

     

       11
       -
         json-glib,

     

       12
       -
         networkmanager,

     

       13
       -
         dart-sass,

     

       14
       -
         vala,

     

       15
       -
         wrapGAppsHook4,

     

       16
       -
         ...

     

       17
       -
       }: let

     

       18
       -
         astalPackages = [

     

       19
       -
           astal.astal4

     

       20
       -
           astal.io

     

       21
       -
           astal.gjs

     

       22
       -
           astal.auth

     

       23
       -
           astal.cava

     

       24
       -
           astal.apps

     

       25
       -
           astal.greet

     

       26
       -
           astal.mpris

     

       27
       -
           astal.notifd

     

       28
       -
           astal.network

     

       29
       -
           astal.battery

     

       30
       -
           astal.hyprland

     

       31
       -
           astal.bluetooth

     

       32
       -
           astal.wireplumber

     

       33
       -
           astal.powerprofiles

     

       34
       -
         ];

     

       35
       -
       in stdenv.mkDerivation {

     

       36
       -
         name = "hyprpanel";

     

       37
       -
         src = ./.;

     

       38
       -
         depsBuildBuild = [

     

       39
       -
           pkg-config

     

       40
       -
         ];

     

       41
       -
         nativeBuildInputs = [

     

       42
       -
           meson

     

       43
       -
           ninja

     

       44
       -
           gobject-introspection

     

       45
       -
           wrapGAppsHook4

     

       46
       -
           blueprint-compiler

     

       47
       -
           dart-sass

     

       48
       -
           vala

     

       49
       -
         ];

     

       50
       -
         buildInputs = [

     

       51
       -
           gtk4

     

       52
       -
           gtk4-layer-shell

     

       53
       -
           networkmanager

     

       54
       -
           json-glib

     

       55
       -
         ] ++ astalPackages;

     

       56
       -
       }

-2

home/desktop/hyprpanel/meson.build

···

       1
       -
       project('hyprpanel', 'vala')

     

       2
       -
       subdir('src')

-7

home/desktop/hyprpanel/src/gresource.xml

···

       1
       -
       <?xml version="1.0" encoding="UTF-8"?>

     

       2
       -
       <gresources>

     

       3
       -
           <gresource prefix="/">

     

       4
       -
               <file>main.css</file>

     

       5
       -
               <file>ui/Bar.ui</file>

     

       6
       -
           </gresource>

     

       7
       -
       </gresources>

-1

home/desktop/hyprpanel/src/main.scss

···

       1
       -
       @use "./scss/Bar.scss";

···

       0

-66

home/desktop/hyprpanel/src/meson.build

···

       1
       -
       pkgdatadir = get_option('prefix') / get_option('datadir')

     

       2
       -
       bindir = get_option('prefix') / get_option('bindir')

     

       3
       -
       blp = find_program('blueprint-compiler', required: true)

     

       4
       -
       sass = find_program('sass', required: true)

     

       5
       -
       

     

       6
       -
       dependencies = [

     

       7
       -
         dependency('glib-2.0'),

     

       8
       -
         dependency('libnm'),

     

       9
       -
         dependency('gtk4-layer-shell-0'),

     

       10
       -
         dependency('astal-io-0.1'),

     

       11
       -
         dependency('astal-4-4.0'),

     

       12
       -
         dependency('astal-battery-0.1'),

     

       13
       -
         dependency('astal-wireplumber-0.1'),

     

       14
       -
         dependency('astal-network-0.1'),

     

       15
       -
         dependency('astal-mpris-0.1'),

     

       16
       -
         dependency('astal-power-profiles-0.1'),

     

       17
       -
         dependency('astal-bluetooth-0.1'),

     

       18
       -
       ]

     

       19
       -
       

     

       20
       -
       blueprint_sources = files(

     

       21
       -
         'ui/Bar.blp',

     

       22
       -
       )

     

       23
       -
       

     

       24
       -
       vala_sources = files(

     

       25
       -
         'vala/Bar.vala',

     

       26
       -
         'vala/App.vala',

     

       27
       -
       )

     

       28
       -
       

     

       29
       -
       # transplie blueprints

     

       30
       -
       ui = custom_target(

     

       31
       -
         'blueprint',

     

       32
       -
         input: blueprint_sources,

     

       33
       -
         output: '.',

     

       34
       -
         command: [

     

       35
       -
           blp,

     

       36
       -
           'batch-compile',

     

       37
       -
           '@OUTPUT@',

     

       38
       -
           '@CURRENT_SOURCE_DIR@',

     

       39
       -
           '@INPUT@',

     

       40
       -
         ],

     

       41
       -
       )

     

       42
       -
       

     

       43
       -
       # bundle scss files

     

       44
       -
       css = custom_target(

     

       45
       -
         'scss',

     

       46
       -
         input: files('main.scss'),

     

       47
       -
         command: [sass, '@INPUT@', '@OUTPUT@'],

     

       48
       -
         output: ['main.css'],

     

       49
       -
       )

     

       50
       -
       

     

       51
       -
       # compiling data files into a binary

     

       52
       -
       resource = import('gnome').compile_resources(

     

       53
       -
         'data',

     

       54
       -
         files('gresource.xml'),

     

       55
       -
         dependencies: [ui, css],

     

       56
       -
         source_dir: meson.current_build_dir(),

     

       57
       -
       )

     

       58
       -
       

     

       59
       -
       executable(

     

       60
       -
         meson.project_name(),

     

       61
       -
         dependencies: dependencies,

     

       62
       -
         sources: [vala_sources, resource],

     

       63
       -
         link_args: ['-lm'], # Link math library

     

       64
       -
         install: true,

     

       65
       -
         install_dir: bindir,

     

       66
       -
       )

-25

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

···

       1
       -
       // https://gitlab.gnome.org/GNOME/gtk/-/blob/gtk-4-16/gtk/theme/Default/_colors-public.scss

     

       2
       -
       $fg-color: #{"@theme_fg_color"};

     

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

     

       4
       -
       

     

       5
       -
       window.Bar {

     

       6
       -
           background: transparent;

     

       7
       -
       

     

       8
       -
           > box {

     

       9
       -
               min-height: 36px;

     

       10
       -
               padding: 2px 18px;

     

       11
       -
               background: transparent;

     

       12
       -
               color: $fg-color;

     

       13
       -
       

     

       14
       -
               font-family: SF Pro Display;

     

       15
       -
               font-weight: medium;

     

       16
       -
               font-size: 13px;

     

       17
       -
           }

     

       18
       -
       

     

       19
       -
           .menubar-item {

     

       20
       -
               > * + * {

     

       21
       -
                   margin-left: 6px;

     

       22
       -
               }

     

       23
       -
           }

     

       24
       -
       }

     

       25
       -

-41

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

···

       1
       -
       using Gtk 4.0;

     

       2
       -
       using Astal 4.0;

     

       3
       -
       

     

       4
       -
       template $Bar: Astal.Window {

     

       5
       -
           default-height: 40;

     

       6
       -
       

     

       7
       -
           CenterBox centerbox {

     

       8
       -
               start-widget: Box {

     

       9
       -
               };

     

       10
       -
       

     

       11
       -
               center-widget: Box {

     

       12
       -
               };

     

       13
       -
       

     

       14
       -
               end-widget: Box {

     

       15
       -
                   spacing: 14;

     

       16
       -
       

     

       17
       -
                   Image {

     

       18
       -
                       styles ["menubar-item"]

     

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

     

       20
       -
                   }

     

       21
       -
       

     

       22
       -
                   Box {

     

       23
       -
                       styles ["menubar-item"]

     

       24
       -
                       Image {

     

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

     

       26
       -
                       }

     

       27
       -
                   }

     

       28
       -
       

     

       29
       -
                   Box {

     

       30
       -
                       styles ["menubar-item"]

     

       31
       -
                       Label {

     

       32
       -
                           label: bind template.battery-label;

     

       33
       -
                       }

     

       34
       -
                       Image {

     

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

     

       36
       -
                       }

     

       37
       -
                   }

     

       38
       -
               };

     

       39
       -
           }

     

       40
       -
       }

     

       41
       -

-46

home/desktop/hyprpanel/src/vala/App.vala

···

       1
       -
       class App : Astal.Application {

     

       2
       -
           static App instance;

     

       3
       -
       

     

       4
       -
           // this is where request handlers can be implemented

     

       5
       -
           // that will be used to handle `astal` cli invocations

     

       6
       -
           public override void request(string request, GLib.SocketConnection conn) {

     

       7
       -
               print(@"incoming request: $request\n");

     

       8
       -
       

     

       9
       -
               AstalIO.write_sock.begin(conn, "response", null);

     

       10
       -
           }

     

       11
       -
       

     

       12
       -
           // this is the method that will be invoked on `app.run()`

     

       13
       -
           // this is where everything should be initialized and instantiated

     

       14
       -
           public override void activate() {

     

       15
       -
               this.apply_css("resource:///main.css", false);

     

       16
       -
               this.add_window(new Bar());

     

       17
       -
           }

     

       18
       -
       

     

       19
       -
           // entry point of our app

     

       20
       -
           static int main(string[] argv) {

     

       21
       -
               App.instance = new App() { instance_name = "hyprpanel" };

     

       22
       -
       

     

       23
       -
               try {

     

       24
       -
                   // `app.acquire_socket()` needed for the request API to work

     

       25
       -
                   App.instance.acquire_socket();

     

       26
       -
       

     

       27
       -
                   // if it succeeds we can run the app

     

       28
       -
                   return App.instance.run(null);

     

       29
       -
               } catch (Error _) {

     

       30
       -
                   // if it throws an error it means there is already an instance

     

       31
       -
                   // with `instance_name` running, so we just send a request instead

     

       32
       -
                   try {

     

       33
       -
                       var response = AstalIO.send_request(

     

       34
       -
                           "hyprpanel",

     

       35
       -
                           string.joinv(" ", argv[1:])

     

       36
       -
                       );

     

       37
       -
                       print(@"$response\n");

     

       38
       -
                       return 0;

     

       39
       -
                   } catch (Error err) {

     

       40
       -
                       printerr(err.message);

     

       41
       -
                       return 1;

     

       42
       -
                   }

     

       43
       -
               }

     

       44
       -
           }

     

       45
       -
       }

     

       46
       -

-73

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

···

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

     

       2
       -
       class Bar : Astal.Window {

     

       3
       -
           public string volume_icon { get; set; }

     

       4
       -
           public string battery_visible { get; set; }

     

       5
       -
           public string battery_label { get; set; }

     

       6
       -
           public string battery_icon { get; set; }

     

       7
       -
           public string network_icon { get; set; }

     

       8
       -
       

     

       9
       -
           public Bar() {

     

       10
       -
               namespace = "hyprpanel";

     

       11
       -
               anchor = TOP | LEFT | RIGHT;

     

       12
       -
               exclusivity = EXCLUSIVE;

     

       13
       -
               add_css_class("Bar");

     

       14
       -
               present();

     

       15
       -
       

     

       16
       -
               // network

     

       17
       -
               var nw = AstalNetwork.get_default();

     

       18
       -
               Binding networkBinding = null;

     

       19
       -
       

     

       20
       -
               nw.bind_property(

     

       21
       -
                   "primary",

     

       22
       -
                   this,

     

       23
       -
                   "network-icon",

     

       24
       -
                   BindingFlags.SYNC_CREATE,

     

       25
       -
                   (_, primary) => {

     

       26
       -
                       if (networkBinding != null) networkBinding.unbind();

     

       27
       -
       

     

       28
       -
                       switch (primary.get_enum()) {

     

       29
       -
                           case AstalNetwork.Primary.WIRED:

     

       30
       -
                               networkBinding = nw.wired.bind_property(

     

       31
       -
                                   "icon-name",

     

       32
       -
                                   this,

     

       33
       -
                                   "network-icon",

     

       34
       -
                                   BindingFlags.SYNC_CREATE

     

       35
       -
                               );

     

       36
       -
                               return false;

     

       37
       -
       

     

       38
       -
                           case AstalNetwork.Primary.WIFI:

     

       39
       -
                               networkBinding = nw.wifi.bind_property(

     

       40
       -
                                   "icon-name",

     

       41
       -
                                   this,

     

       42
       -
                                   "network-icon",

     

       43
       -
                                   BindingFlags.SYNC_CREATE

     

       44
       -
                               );

     

       45
       -
                               return false;

     

       46
       -
       

     

       47
       -
                           default:

     

       48
       -
                               network_icon = "network-idle-symbolic";

     

       49
       -
                               return false;

     

       50
       -
                       }

     

       51
       -
                   },

     

       52
       -
                   null

     

       53
       -
               );

     

       54
       -
       

     

       55
       -
               // battery

     

       56
       -
               var bat = AstalBattery.get_default();

     

       57
       -
               bat.bind_property("is-present", this, "battery-visible", BindingFlags.SYNC_CREATE);

     

       58
       -
               bat.bind_property("icon-name", this, "battery-icon", BindingFlags.SYNC_CREATE);

     

       59
       -
               bat.bind_property("percentage", this, "battery-label", BindingFlags.SYNC_CREATE, (_, src, ref target) => {

     

       60
       -
                   target.set_string(@"$(Math.floor(bat.percentage * 100))%");

     

       61
       -
                   return true;

     

       62
       -
               }, null);

     

       63
       -
       

     

       64
       -
               // volume

     

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

     

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

     

       67
       -
           }

     

       68
       -
       

     

       69
       -
           public override void dispose() {

     

       70
       -
               base.dispose();

     

       71
       -
           }

     

       72
       -
       }

     

       73
       -

+2 -2

lib/pkgs/default.nix

···

       1
        
       pkgs: {

     

       2
        
         sf-pro = import ./sf-pro.nix pkgs;

     

       3
       -
         sf-pro-mono = import ./sf-pro-mono.nix pkgs;

     

       4
       -
         hyprpanel = import ../../home/desktop/hyprpanel pkgs;

     

       5
        
       }

···

       1
        
       pkgs: {

     

       2
        
         sf-pro = import ./sf-pro.nix pkgs;

     

       3
       +
         sf-mono = import ./sf-mono.nix pkgs;

     

       4
       +
         new-york = import ./new-york.nix pkgs;

     

       5
        
       }

+24

lib/pkgs/new-york.nix

···

       1
       +
       {

     

       2
       +
         stdenv,

     

       3
       +
         lib,

     

       4
       +
         fetchFromGitHub,

     

       5
       +
         unzip,

     

       6
       +
         ...

     

       7
       +
       }: stdenv.mkDerivation rec {

     

       8
       +
         pname = "New-York";

     

       9
       +
         version = "0";

     

       10
       +
       

     

       11
       +
         src = fetchFromGitHub {

     

       12
       +
           owner = "yell0wsuit";

     

       13
       +
           repo = "New-York-fonts";

     

       14
       +
           rev = "master";

     

       15
       +
           sha256 = "sha256-0uuzr64KxDEMtkLizvGeHTXDBAMLe4j5iXGaJPfDdmg=";

     

       16
       +
         };

     

       17
       +
       

     

       18
       +
         nativeBuildInputs = [unzip];

     

       19
       +
       

     

       20
       +
         installPhase = ''

     

       21
       +
           mkdir -p $out/share/fonts/opentype

     

       22
       +
           cp *.otf $out/share/fonts/opentype/

     

       23
       +
         '';

     

       24
       +
       }

+24

lib/pkgs/sf-mono.nix

···

       1
       +
       {

     

       2
       +
         stdenv,

     

       3
       +
         lib,

     

       4
       +
         fetchFromGitHub,

     

       5
       +
         unzip,

     

       6
       +
         ...

     

       7
       +
       }: stdenv.mkDerivation rec {

     

       8
       +
         pname = "SF-Mono";

     

       9
       +
         version = "0";

     

       10
       +
       

     

       11
       +
         src = fetchFromGitHub {

     

       12
       +
           owner = "supercomputra";

     

       13
       +
           repo = "SF-Mono-Font";

     

       14
       +
           rev = "master";

     

       15
       +
           sha256 = "sha256-3wG3M4Qep7MYjktzX9u8d0iDWa17FSXYnObSoTG2I/o=";

     

       16
       +
         };

     

       17
       +
       

     

       18
       +
         nativeBuildInputs = [unzip];

     

       19
       +
       

     

       20
       +
         installPhase = ''

     

       21
       +
           mkdir -p $out/share/fonts/opentype

     

       22
       +
           cp *.otf $out/share/fonts/opentype/

     

       23
       +
         '';

     

       24
       +
       }

-24

lib/pkgs/sf-pro-mono.nix

···

       1
       -
       {

     

       2
       -
         stdenv,

     

       3
       -
         lib,

     

       4
       -
         fetchFromGitHub,

     

       5
       -
         unzip,

     

       6
       -
         ...

     

       7
       -
       }: stdenv.mkDerivation rec {

     

       8
       -
         pname = "SF-Pro-mono";

     

       9
       -
         version = "v3.0.0";

     

       10
       -
       

     

       11
       -
         src = fetchFromGitHub {

     

       12
       -
           owner = "shaunsingh";

     

       13
       -
           repo = "SFMono-Nerd-Font-Ligaturized";

     

       14
       -
           rev = "main";

     

       15
       -
           sha256 = "sha256-AYjKrVLISsJWXN6Cj74wXmbJtREkFDYOCRw1t2nVH2w=";

     

       16
       -
         };

     

       17
       -
       

     

       18
       -
         nativeBuildInputs = [unzip];

     

       19
       -
       

     

       20
       -
         installPhase = ''

     

       21
       -
           mkdir -p $out/share/fonts/opentype

     

       22
       -
           cp *.otf $out/share/fonts/opentype/

     

       23
       -
         '';

     

       24
       -
       }

+1 -1

lib/pkgs/sf-pro.nix

···

       6
        
         ...

     

       7
        
       }: stdenv.mkDerivation rec {

     

       8
        
         pname = "SF-Pro";

     

       9
       -
         version = "v3.0.0";

     

       10
        
       

     

       11
        
         src = fetchFromGitHub {

     

       12
        
           owner = "sahibjotsaggu";

···

       6
        
         ...

     

       7
        
       }: stdenv.mkDerivation rec {

     

       8
        
         pname = "SF-Pro";

     

       9
       +
         version = "0";

     

       10
        
       

     

       11
        
         src = fetchFromGitHub {

     

       12
        
           owner = "sahibjotsaggu";

+5 -5

modules/desktop/fonts.nix

···

       22
        
       

     

       23
        
             packages = with pkgs; [

     

       24
        
               sf-pro

     

       25
       -
               sf-pro-mono

     

       0
        
       
     

       26
        
               noto-fonts

     

       27
        
               noto-fonts-cjk-sans

     

       28
        
               noto-fonts-emoji

     

       29
       -
               roboto-mono

     

       30
        
               inter

     

       31
        
             ];

     

       32
        
       

     

       33
        
             fontconfig.defaultFonts = {

     

       34
       -
               serif = [ "Noto Serif" "Noto Color Emoji" ];

     

       35
       -
               sansSerif = [ "SF Pro Display" "Noto Color Emoji" ];

     

       36
       -
               monospace = [ "Dank Mono" "Roboto Mono" "Noto Color Emoji" ];

     

       37
        
               emoji = [ "Noto Color Emoji" ];

     

       38
        
             };

     

       39
        
           };

···

       22
        
       

     

       23
        
             packages = with pkgs; [

     

       24
        
               sf-pro

     

       25
       +
               sf-mono

     

       26
       +
               new-york

     

       27
        
               noto-fonts

     

       28
        
               noto-fonts-cjk-sans

     

       29
        
               noto-fonts-emoji

     

       0
        
       
     

       30
        
               inter

     

       31
        
             ];

     

       32
        
       

     

       33
        
             fontconfig.defaultFonts = {

     

       34
       +
               serif = [ "New York" "Noto Serif" "Noto Color Emoji" ];

     

       35
       +
               sansSerif = [ "SF Pro Display" "Inter" "Noto Color Emoji" ];

     

       36
       +
               monospace = [ "Dank Mono" "SF Mono" "Noto Color Emoji" ];

     

       37
        
               emoji = [ "Noto Color Emoji" ];

     

       38
        
             };

     

       39
        
           };