update
This commit is contained in:
parent
efcb6d1faf
commit
33522eb465
|
@ -85,7 +85,6 @@
|
|||
allowUnfree = true;
|
||||
allowUnsupportedSystem = true;
|
||||
permittedInsecurePackages = [
|
||||
"libxls-1.6.2"
|
||||
];
|
||||
};
|
||||
|
||||
|
|
|
@ -25,5 +25,6 @@
|
|||
version = "1";
|
||||
src = inputs.nvim-hmts;
|
||||
};
|
||||
|
||||
};
|
||||
}
|
||||
|
|
|
@ -58,6 +58,7 @@
|
|||
ls = "${pkgs.eza}/bin/eza --icons";
|
||||
ll = "${pkgs.eza}/bin/eza --icons -l";
|
||||
nf = "${pkgs.fastfetch}/bin/fastfetch";
|
||||
r = "${pkgs.ranger}/bin/ranger";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -57,7 +57,7 @@
|
|||
visualizer_output_name = "my_fifo";
|
||||
visualizer_in_stereo = true;
|
||||
visualizer_type = "spectrum";
|
||||
visualizer_look = "+│";
|
||||
visualizer_look = "▮●";
|
||||
|
||||
mouse_support = false;
|
||||
|
||||
|
|
|
@ -2,5 +2,4 @@ vim.opt.list = true
|
|||
vim.opt.listchars:append "eol:↴"
|
||||
|
||||
require("ibl").setup {
|
||||
show_end_of_line = true,
|
||||
}
|
||||
|
|
|
@ -1,13 +1,18 @@
|
|||
import App from 'resource:///com/github/Aylur/ags/app.js'
|
||||
import { exec } from 'resource://com/github/Aylur/ags/utils.js'
|
||||
import Notifications from 'resource:///com/github/Aylur/ags/service/notifications.js';
|
||||
|
||||
import Panel from './js/panel/panel.js';
|
||||
import { NotificationCenter, NotificationsPopupWindow } from './js/notifications/config.js';
|
||||
import NotificationsPopupWindow from './js/notifications/notificationPopup.js';
|
||||
import { NotificationCenter } from './js/notifications/notificationCenter.js';
|
||||
|
||||
import {
|
||||
forMonitors
|
||||
}
|
||||
from './js/utils.js';
|
||||
|
||||
Notifications.clear();
|
||||
|
||||
const scss = App.configDir + '/style.scss';
|
||||
const css = '/tmp/style-ags.css';
|
||||
exec(`sassc ${scss} ${css}`);
|
||||
|
|
|
@ -19,9 +19,10 @@ const NotificationIcon = ({ appEntry, appIcon, image }) => {
|
|||
}
|
||||
|
||||
let icon = 'dialog-information-symbolic';
|
||||
if (lookUpIcon(appIcon))
|
||||
|
||||
if(lookUpIcon(appIcon))
|
||||
icon = appIcon;
|
||||
|
||||
|
||||
if (lookUpIcon(appEntry))
|
||||
icon = appEntry;
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
import {
|
||||
NotificationList, ClearButton, PopupList
|
||||
NotificationList, ClearButton
|
||||
} from './widgets.js';
|
||||
import Widget from 'resource:///com/github/Aylur/ags/widget.js';
|
||||
import App from 'resource:///com/github/Aylur/ags/app.js';
|
||||
|
@ -16,6 +16,7 @@ export const NotificationCenter = () => Widget.Window({
|
|||
name: 'notification-center',
|
||||
anchor: [ 'right', 'top', 'bottom'],
|
||||
popup: true,
|
||||
visible: false,
|
||||
focusable: true,
|
||||
child: Widget.Box({
|
||||
children: [
|
||||
|
@ -35,8 +36,4 @@ export const NotificationCenter = () => Widget.Window({
|
|||
}),
|
||||
});
|
||||
|
||||
export const NotificationsPopupWindow = () => Widget.Window({
|
||||
name: 'popup-window',
|
||||
anchor: ['right', 'top'],
|
||||
child: PopupList(),
|
||||
});
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
import { Box, Window } from 'resource:///com/github/Aylur/ags/widget.js';
|
||||
import Notifications from 'resource:///com/github/Aylur/ags/service/notifications.js';
|
||||
|
||||
import { Notification } from './notification.js';
|
||||
|
||||
const PopupList = () => Box({
|
||||
className: 'notificationPopupList',
|
||||
style: 'padding: 1px;', // so it shows up
|
||||
vertical: true,
|
||||
binds: [['children', Notifications, 'popups',
|
||||
popups => popups.map(Notification)]],
|
||||
});
|
||||
|
||||
export default () => Window({
|
||||
name: 'notificationPopupWindow',
|
||||
anchor: ['right', 'top'],
|
||||
child: PopupList(),
|
||||
});
|
|
@ -58,11 +58,3 @@ export const ClearButton = () => Widget.Button({
|
|||
],
|
||||
}),
|
||||
});
|
||||
|
||||
export const PopupList = () => Widget.Box({
|
||||
className: 'list',
|
||||
style: 'padding: 1px;', // so it shows up
|
||||
vertical: true,
|
||||
binds: [['children', Notifications, 'popups',
|
||||
popups => popups.map(Notification)]],
|
||||
});
|
||||
|
|
|
@ -11,7 +11,8 @@ import Clock from './widgets/clock.js';
|
|||
|
||||
const Left = monitor => Box({
|
||||
children: [
|
||||
Workspaces(monitor), WindowTitle(),
|
||||
Workspaces(monitor),
|
||||
WindowTitle(),
|
||||
],
|
||||
});
|
||||
|
||||
|
|
|
@ -20,6 +20,9 @@ export default player => Button({
|
|||
[Mpris, statusIcon => {
|
||||
const mpris = Mpris.getPlayer(player);
|
||||
|
||||
if(!mpris)
|
||||
return;
|
||||
|
||||
switch (mpris.playBackStatus) {
|
||||
case "Playing":
|
||||
statusIcon.shown = 'playing';
|
||||
|
|
|
@ -1,37 +1,28 @@
|
|||
/* Assuming Adwaita-dark as Gtk theme */
|
||||
|
||||
#popup-window {
|
||||
background-color: transparent;
|
||||
}
|
||||
|
||||
#notification-center {
|
||||
background-color: #232323;
|
||||
}
|
||||
|
||||
#popup-window .notification > * {
|
||||
box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.5);
|
||||
}
|
||||
|
||||
#popup-window *,
|
||||
#notification-center *{
|
||||
outline: none;
|
||||
color: white;
|
||||
}
|
||||
|
||||
button {
|
||||
border: none;
|
||||
box-shadow: none;
|
||||
border-radius: 7px;
|
||||
background-color: rgba(255,255,255, 0.1);
|
||||
}
|
||||
|
||||
button:hover {
|
||||
background-color: rgba(255,255,255, 0.2);
|
||||
}
|
||||
|
||||
button:active {
|
||||
background-color: rgba(255,255,255, 0.3);
|
||||
}
|
||||
// button {
|
||||
// border: none;
|
||||
// box-shadow: none;
|
||||
// border-radius: 7px;
|
||||
// background-color: rgba(255,255,255, 0.1);
|
||||
// }
|
||||
//
|
||||
// button:hover {
|
||||
// background-color: rgba(255,255,255, 0.2);
|
||||
// }
|
||||
//
|
||||
// button:active {
|
||||
// background-color: rgba(255,255,255, 0.3);
|
||||
// }
|
||||
|
||||
.notification > * {
|
||||
margin: 8px;
|
||||
|
@ -62,11 +53,6 @@ button:active {
|
|||
color: rgba(255, 255, 255, 0.7);
|
||||
}
|
||||
|
||||
.list {
|
||||
margin: 8px;
|
||||
min-width: 380px;
|
||||
}
|
||||
|
||||
.action-button {
|
||||
margin: 0 4px;
|
||||
}
|
||||
|
|
Binary file not shown.
Binary file not shown.
|
@ -0,0 +1,48 @@
|
|||
// #notificationPopupWindow {
|
||||
// background-color: transparent;
|
||||
// }
|
||||
#notificationPopupWindow {
|
||||
background-color: transparent;
|
||||
}
|
||||
|
||||
#notificationPopupWindow * {
|
||||
outline: none;
|
||||
}
|
||||
|
||||
.notificationPopupList {
|
||||
margin: 8px;
|
||||
min-width: 400px;
|
||||
}
|
||||
|
||||
#notificationPopupWindow .notification > * {
|
||||
box-shadow: 0 0 4px 0 rgba(102, 92, 84, 1);
|
||||
}
|
||||
|
||||
.notification > * {
|
||||
margin: 8px;
|
||||
padding: 8px;
|
||||
border-radius: 15px;
|
||||
background-color: $bg;
|
||||
}
|
||||
|
||||
.notification .icon {
|
||||
border-radius: 7px;
|
||||
margin-right: 8px;
|
||||
}
|
||||
|
||||
.notification .close-button {
|
||||
padding: 0;
|
||||
margin: 0;
|
||||
min-height: 1.4em;
|
||||
min-width: 1.4em;
|
||||
border-radius: 1em;
|
||||
}
|
||||
|
||||
.notification .title {
|
||||
font-size: 1.1em;
|
||||
color: white;
|
||||
}
|
||||
|
||||
.notification .description {
|
||||
color: rgba(255, 255, 255, 0.7);
|
||||
}
|
|
@ -8,7 +8,7 @@
|
|||
@import './scss/panel/widgets/clock.scss';
|
||||
@import './scss/panel/widgets/sysTray.scss';
|
||||
|
||||
@import './notify-test.scss';
|
||||
@import './scss/notifications/notificationPopup.scss';
|
||||
|
||||
|
||||
* {
|
||||
|
|
|
@ -188,8 +188,7 @@ in {
|
|||
bind = , XF86AudioRaiseVolume, exec, ${pkgs.pamixer}/bin/pamixer -i 10 --get-volume > ${wobsock}
|
||||
bind = , XF86AudioLowerVolume, exec, ${pkgs.pamixer}/bin/pamixer -d 10 --get-volume > ${wobsock}
|
||||
|
||||
bind = SHIFT CTRL, Space, exec, ${pkgs.mako}/bin/makoctl dismiss
|
||||
bind = CTRL, grave, exec, ${pkgs.mako}/bin/makoctl restore
|
||||
bind = CTRL, grave, exec, ags toggle-window notification-center
|
||||
bind = ${modKey} SHIFT, O, exec, ${killprocess}/bin/killprocess.sh
|
||||
bind = ${modKey} SHIFT, P, exec, ${passmenu}/bin/passmenu.sh
|
||||
|
||||
|
@ -212,6 +211,9 @@ in {
|
|||
layerrule = blur, bar-0
|
||||
layerrule = blur, bar-1
|
||||
|
||||
layerrule = blur, notificationPopupWindow
|
||||
layerrule = ignorezero, notificationPopupWindow
|
||||
|
||||
|
||||
windowrulev2 = fullscreen, class:^(hl2_linux)$
|
||||
windowrulev2 = float, class:^(org.kde.dolphin)$
|
||||
|
|
|
@ -1,23 +0,0 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: {
|
||||
services.mako = {
|
||||
enable = false;
|
||||
anchor = "top-right";
|
||||
defaultTimeout = 5000;
|
||||
|
||||
width = 440;
|
||||
height = 320;
|
||||
|
||||
backgroundColor = "#282828B3";
|
||||
borderColor = "#665C54ff";
|
||||
textColor = "#ebdbb2";
|
||||
progressColor = "over #665c54";
|
||||
borderRadius = 10;
|
||||
borderSize = 2;
|
||||
|
||||
font = "JetBrainsMono Nerd Font Regular 10";
|
||||
};
|
||||
}
|
|
@ -38,7 +38,6 @@
|
|||
gnome.gvfs
|
||||
gnome.seahorse
|
||||
gnome.simple-scan
|
||||
heroic
|
||||
imv
|
||||
jq
|
||||
libsForQt5.ark
|
||||
|
@ -61,7 +60,6 @@
|
|||
qt5ct
|
||||
ranger
|
||||
samba
|
||||
sc-im
|
||||
signal-desktop
|
||||
sshfs
|
||||
steam-run
|
||||
|
|
Reference in New Issue