commit 480dbc953f29daca121fe9b3c2fed86133621b9a · pyrox.dev/nix

-1

modules/home/wayland/keybindings.nix

···

       15
       15
        
             "${mod}+d" = "${menu}";

     

       16
       16
        
             "${mod}+Shift+F" = "exec MOZ_DISABLE_RDD_SANDBOX=1 firefox";

     

       17
       17
        
             "${mod}+Return" = "exec ${term}";

     

       18
       18
       -
             # "${mod}+Shift+Return" = "exec ${pkgs.wezterm}/bin/wezterm";

     

       19
       18
        
             "${mod}+x" = "exec wlogout";

     

       20
       19
        
             "${mod}+s" = null;

     

       21
       20
        
             "${mod}+w" = null;

+4 -4

modules/home/wayland/sway.nix

···

       37
       37
        
             };

     

       38
       38
        
             config = {

     

       39
       39
        
               terminal = lib.getExe pkgs.ghostty;

     

       40
       40
       -
               menu = "exec ${term} --class=py.floating --window-height=15 --window-width=10 --font-size=16 -e ${pkgs.sway-launcher-desktop}/bin/sway-launcher-desktop";

     

       40
       40
       +
               menu = "exec ${term} --class=py.floating --window-height=20 --window-width=12 --font-size=14 -e ${pkgs.sway-launcher-desktop}/bin/sway-launcher-desktop";

     

       41
       41
        
               modifier = "Mod4";

     

       42
       42
        
               bars = [ { command = "true"; } ];

     

       43
       43
        
               focus = {

     
···

       51
       51
        
                 size = 12.0;

     

       52
       52
        
               };

     

       53
       53
        
               gaps = {

     

       54
       54
       -
                 inner = 4;

     

       55
       55
       -
                 outer = 4;

     

       56
       56
       -
                 smartBorders = "off";

     

       54
       54
       +
                 inner = 1;

     

       55
       55
       +
                 outer = 1;

     

       56
       56
       +
                 smartBorders = "on";

     

       57
       57
        
                 smartGaps = false;

     

       58
       58
        
               };

     

       59
       59
        
               input = {

+13 -11

modules/home/wayland/waybar-style.css

···

       7
       7
        
       }

     

       8
       8
        
       

     

       9
       9
        
       #window {

     

       10
       10
       -
         padding: 0 10px;

     

       10
       10
       +
         padding: 0 4px;

     

       11
       11
       +
       }

     

       12
       12
       +
       

     

       13
       13
       +
       .modules-center {

     

       14
       14
       +
         padding-right: 20px;

     

       11
       15
        
       }

     

       12
       16
        
       

     

       13
       17
        
       window#waybar {

     
···

       27
       31
        
       #workspaces button {

     

       28
       32
        
         padding: 0 8px;

     

       29
       33
        
         color: @text;

     

       30
       30
       -
         border: 2px solid @subtext0;

     

       31
       31
       -
         border-radius: 10px;

     

       34
       34
       +
         border-bottom: 2px solid @subtext0;

     

       35
       35
       +
         border-radius: 0px;

     

       32
       36
        
         min-width: 25px;

     

       33
       37
        
         margin-right: 8px;

     

       34
       38
        
       }

     
···

       38
       42
        
       }

     

       39
       43
        
       

     

       40
       44
        
       #workspaces button.focused {

     

       41
       41
       -
         border: 3px solid @mauve;

     

       45
       45
       +
         border-bottom: 3px solid @mauve;

     

       46
       46
       +
         font-weight: bold;

     

       42
       47
        
       }

     

       43
       48
        
       

     

       44
       49
        
       #workspaces button.urgent {

     

       45
       45
       -
         background-color: @red;

     

       50
       50
       +
         border: 2px solid @red;

     

       46
       51
        
       }

     

       47
       52
        
       

     

       48
       53
        
       #workspaces button:hover {

     

       49
       49
       -
         box-shadow: inherit;

     

       50
       54
        
         border-color: @blue;

     

       51
       55
        
         color: @blue;

     

       52
       56
        
       }

     
···

       77
       81
        
         color: @text;

     

       78
       82
        
       }

     

       79
       83
        
       

     

       80
       80
       -
       #tray:hover,

     

       81
       84
        
       #mode:hover,

     

       82
       85
        
       #battery:hover,

     

       83
       86
        
       #temperature:hover,

     
···

       89
       92
        
       #idle_inhibitor:hover,

     

       90
       93
        
       #sway-language:hover,

     

       91
       94
        
       #backlight:hover {

     

       92
       92
       -
         padding: 2px 8px;

     

       93
       93
       -
         margin: 2px 5px;

     

       95
       95
       +
         background-color: @subtext1;

     

       94
       96
        
         color: @base;

     

       95
       95
       -
         background-color: @subtext1;

     

       96
       97
        
       }

     

       97
       98
        
       

     

       98
       99
        
       #clock {

     
···

       107
       108
        
         color: @red;

     

       108
       109
        
       }

     

       109
       110
        
       

     

       110
       110
       -
       #battery.charging {

     

       111
       111
       +
       #battery.charging,

     

       112
       112
       +
       #battery.full {

     

       111
       113
        
         color: @green;

     

       112
       114
        
       }

     

       113
       115

+41 -28

modules/home/wayland/waybar.nix

···

       2
       2
        
         pkgs,

     

       3
       3
        
         lib,

     

       4
       4
        
         config,

     

       5
       5
       -
         inputs,

     

       6
       6
       -
         system,

     

       7
       5
        
         ...

     

       8
       6
        
       }:

     

       9
       7
        
       let

     
···

       30
       28
        
                   "sway/workspaces"

     

       31
       29
        
                   "sway/mode"

     

       32
       30
        
                 ];

     

       33
       33
       -
                 modules-center = [ "custom/media" ];

     

       31
       31
       +
                 modules-center = [ "mpris" ];

     

       34
       32
        
                 modules-right = [

     

       35
       33
        
                   "idle_inhibitor"

     

       36
       34
        
                   "wireplumber"

     
···

       49
       47
        
                   format = "{icon}";

     

       50
       48
        
                 };

     

       51
       49
        
                 "idle_inhibitor" = {

     

       52
       52
       -
                   format = "{icon}";

     

       50
       50
       +
                   format = "{icon} ";

     

       53
       51
        
                   format-icons = {

     

       54
       52
        
                     "activated" = "";

     

       55
       53
        
                     "deactivated" = "";

     
···

       61
       59
        
                 };

     

       62
       60
        
                 "clock" = {

     

       63
       61
        
                   tooltip-format = "<tt><small>{calendar}</small></tt>";

     

       64
       64
       -
                   format = "{:%H:%M:%S}  ";

     

       62
       62
       +
                   format = " {:%H:%M:%S}";

     

       65
       63
        
                   format-alt = "{%d %b %Y}";

     

       66
       64
        
                   interval = 1;

     

       65
       65
       +
                   calendar = {

     

       66
       66
       +
                     format = {

     

       67
       67
       +
                       today = "<span color='#89b4fa'><b><u>{}</u></b></span>";

     

       68
       68
       +
                     };

     

       69
       69
       +
                   };

     

       67
       70
        
                 };

     

       68
       71
        
                 "cpu" = {

     

       69
       69
       -
                   format = "{usage}% ";

     

       72
       72
       +
                   format = " {usage}%";

     

       70
       73
        
                   interval = 5;

     

       71
       74
        
                   tooltip = false;

     

       72
       75
        
                 };

     

       73
       76
        
                 "memory" = {

     

       74
       74
       -
                   format = "{}% ";

     

       77
       77
       +
                   format = " {}%";

     

       75
       78
        
                 };

     

       76
       79
        
                 "temperature" = {

     

       77
       80
        
                   critical-threshold = 80;

     

       78
       78
       -
                   format = "{temperatureC}°C {icon}";

     

       81
       81
       +
                   format = "{icon} {temperatureC}°C";

     

       79
       82
        
                   format-icons = [

     

       80
       83
        
                     ""

     

       81
       84
        
                     ""

     
···

       85
       88
        
                   ];

     

       86
       89
        
                 };

     

       87
       90
        
                 "backlight" = {

     

       88
       88
       -
                   format = "{percent}% {icon}";

     

       91
       91
       +
                   format = "{icon} {percent}%";

     

       89
       92
        
                   format-icons = [

     

       90
       93
        
                     "󰃚"

     

       91
       94
        
                     "󰃛"

     
···

       98
       101
        
                 };

     

       99
       102
        
                 "battery" = {

     

       100
       103
        
                   states = {

     

       101
       101
       -
                     good = 80;

     

       104
       104
       +
                     good = 65;

     

       102
       105
        
                     warning = 30;

     

       103
       106
        
                     critical = 15;

     

       104
       107
        
                   };

     

       105
       105
       -
                   format = "{capacity}% {icon}";

     

       106
       106
       -
                   format-charging = "{capacity}% 󰂄";

     

       107
       107
       -
                   format-plugged = "{capacity}% ";

     

       108
       108
       -
                   format-alt = "{time} {icon}";

     

       108
       108
       +
                   full-at = 80;

     

       109
       109
       +
                   format = "{icon} {capacity}%";

     

       110
       110
       +
                   format-charging = "󰂄 {capacity}%";

     

       111
       111
       +
                   format-plugged = " {capacity}%";

     

       112
       112
       +
                   format-alt = "{icon} {time}";

     

       109
       113
        
                   format-icons = [

     

       110
       114
        
                     "󰂎"

     

       111
       115
        
                     "󰁺"

     
···

       121
       125
        
                   ];

     

       122
       126
        
                 };

     

       123
       127
        
                 "network" = {

     

       124
       124
       -
                   format-wifi = "{essid} <big></big>";

     

       125
       125
       -
                   format-ethernet = "{ifname}: {ipaddr}/{cidr} 󰈀";

     

       126
       126
       -
                   format-linked = "{ifname} (No IP) 󰄡";

     

       127
       127
       -
                   format-disconnected = "Disconnected! ⚠";

     

       128
       128
       +
                   format-wifi = "<big></big>  {essid}";

     

       129
       129
       +
                   format-ethernet = "󰈀 {ifname}: {ipaddr}/{cidr}";

     

       130
       130
       +
                   format-linked = "󰄡 {ifname} (No IP)";

     

       131
       131
       +
                   format-disconnected = "⚠ Disconnected!";

     

       128
       132
        
                   format-alt = "{ifname}: {ipaddr}/{cidr}";

     

       129
       133
        
                   on-click = lib.getExe pkgs.networkmanagerapplet;

     

       130
       134
        
                 };

     

       131
       135
        
                 "wireplumber" = {

     

       132
       132
       -
                   format = "{volume}% {icon}";

     

       136
       136
       +
                   format = "{icon} {volume}%";

     

       133
       137
        
                   format-muted = "󰝟";

     

       134
       138
        
                   format-icons = [

     

       135
       139
        
                     ""

     

       136
       140
        
                     ""

     

       137
       141
        
                     ""

     

       138
       142
        
                   ];

     

       143
       143
       +
                   states = {

     

       144
       144
       +
                     low = 15;

     

       145
       145
       +
                     med = 40;

     

       146
       146
       +
                     high = 60;

     

       147
       147
       +
                   };

     

       148
       148
       +
                   scroll-step = 5;

     

       139
       149
        
                   on-click = lib.getExe pkgs.pwvucontrol;

     

       140
       150
        
                 };

     

       141
       141
       -
                 "custom/media" = {

     

       142
       142
       -
                   format = "{icon}{}";

     

       143
       143
       -
                   return-type = "json";

     

       144
       144
       -
                   format-icons = {

     

       145
       145
       -
                     Paused = " ";

     

       146
       146
       -
                     Playing = " ";

     

       151
       151
       +
                 mpris = {

     

       152
       152
       +
                   format = "{status_icon} {dynamic}";

     

       153
       153
       +
                   format-paused = "{status_icon} <i>{dynamic}</i>";

     

       154
       154
       +
                   dynamic-order = [

     

       155
       155
       +
                     "artist" "title"

     

       156
       156
       +
                   ];

     

       157
       157
       +
                   status-icons = {

     

       158
       158
       +
                     playing = "";

     

       159
       159
       +
                     paused = "";

     

       147
       160
        
                   };

     

       148
       148
       -
                   max-length = 70;

     

       149
       149
       -
                   exec = ''${lib.getExe pkgs.playerctl} -a metadata --format '{"text": "{{playerName}}: {{artist}} - {{markup_escape(title)}}", "tooltip": "{{playerName}} : {{markup_escape(title)}}", "alt": "{{status}}", "class": "{{status}}"}' -F'';

     

       150
       150
       -
                   on-click = "${lib.getExe pkgs.playerctl} play-pause";

     

       161
       161
       +
                   player-icons = {

     

       162
       162
       +
                     firefox = "󰈹";

     

       163
       163
       +
                   };

     

       151
       164
        
                 };

     

       152
       165
        
               };

     

       153
       166
        
             };