From 6e5562427bc9a2fa300e369121b366a4ed65b763 Mon Sep 17 00:00:00 2001 From: Varris Date: Mon, 1 Jan 2024 00:48:18 +0100 Subject: [PATCH] update --- flake.nix | 3 + system/configuration.nix | 2 +- user/configs/firefox/default.nix | 28 ++++-- user/configs/fish/default.nix | 2 +- user/configs/wayland/ags/ags-config/config.js | 20 ----- .../wayland/ags/ags-config/js/panel/panel.js | 45 ---------- .../ags/ags-config/js/panel/widgets/clock.js | 19 ---- .../ags/ags-config/js/panel/widgets/mpris.js | 53 ----------- .../ags-config/js/panel/widgets/sysTray.js | 22 ----- .../ags/ags-config/js/panel/widgets/volume.js | 50 ----------- .../js/panel/widgets/windowTitle.js | 11 --- .../ags-config/js/panel/widgets/workspaces.js | 32 ------- .../wayland/ags/ags-config/js/utils.js | 6 -- .../wayland/ags/ags-config/notify-test.scss | 83 ------------------ .../notificationPopup.scssc | Bin 2760 -> 0 bytes .../gruvbox.scssc | Bin 3948 -> 0 bytes .../scss/notifications/notificationPopup.scss | 48 ---------- .../wayland/ags/ags-config/scss/panel.scss | 7 -- .../ags/ags-config/scss/panel/panel.scss | 45 ---------- .../ags-config/scss/panel/widgets/clock.scss | 6 -- .../ags-config/scss/panel/widgets/mpris.scss | 6 -- .../scss/panel/widgets/sysTray.scss | 12 --- .../ags-config/scss/panel/widgets/volume.scss | 6 -- .../scss/panel/widgets/windowTitle.scss | 6 -- .../scss/panel/widgets/workspaces.scss | 27 ------ .../ags/ags-config/scss/themes/gruvbox.scss | 7 -- .../configs/wayland/ags/ags-config/style.scss | 14 --- user/configs/wayland/ags/default.nix | 13 --- user/configs/wayland/hyprland/default.nix | 1 - user/configs/wayland/hyprland/settings.nix | 2 +- user/home.nix | 2 +- 31 files changed, 28 insertions(+), 550 deletions(-) delete mode 100644 user/configs/wayland/ags/ags-config/config.js delete mode 100644 user/configs/wayland/ags/ags-config/js/panel/panel.js delete mode 100644 user/configs/wayland/ags/ags-config/js/panel/widgets/clock.js delete mode 100644 user/configs/wayland/ags/ags-config/js/panel/widgets/mpris.js delete mode 100644 user/configs/wayland/ags/ags-config/js/panel/widgets/sysTray.js delete mode 100644 user/configs/wayland/ags/ags-config/js/panel/widgets/volume.js delete mode 100644 user/configs/wayland/ags/ags-config/js/panel/widgets/windowTitle.js delete mode 100644 user/configs/wayland/ags/ags-config/js/panel/widgets/workspaces.js delete mode 100644 user/configs/wayland/ags/ags-config/js/utils.js delete mode 100644 user/configs/wayland/ags/ags-config/notify-test.scss delete mode 100644 user/configs/wayland/ags/ags-config/scss/notifications/.sass-cache/503f62c5c6d624b8605b27a983ea9fa0abebbb04/notificationPopup.scssc delete mode 100644 user/configs/wayland/ags/ags-config/scss/notifications/.sass-cache/7374c266d40f30c3143150a6135aabe76e1eef96/gruvbox.scssc delete mode 100644 user/configs/wayland/ags/ags-config/scss/notifications/notificationPopup.scss delete mode 100644 user/configs/wayland/ags/ags-config/scss/panel.scss delete mode 100644 user/configs/wayland/ags/ags-config/scss/panel/panel.scss delete mode 100644 user/configs/wayland/ags/ags-config/scss/panel/widgets/clock.scss delete mode 100644 user/configs/wayland/ags/ags-config/scss/panel/widgets/mpris.scss delete mode 100644 user/configs/wayland/ags/ags-config/scss/panel/widgets/sysTray.scss delete mode 100644 user/configs/wayland/ags/ags-config/scss/panel/widgets/volume.scss delete mode 100644 user/configs/wayland/ags/ags-config/scss/panel/widgets/windowTitle.scss delete mode 100644 user/configs/wayland/ags/ags-config/scss/panel/widgets/workspaces.scss delete mode 100644 user/configs/wayland/ags/ags-config/scss/themes/gruvbox.scss delete mode 100644 user/configs/wayland/ags/ags-config/style.scss delete mode 100644 user/configs/wayland/ags/default.nix diff --git a/flake.nix b/flake.nix index 29f96ee..b5b1bcd 100755 --- a/flake.nix +++ b/flake.nix @@ -21,6 +21,8 @@ eww-systray.url = "github:ralismark/eww/tray-3"; eww-systray.inputs.nixpkgs.follows = "nixpkgs"; + nur.url = "github:nix-community/NUR"; + gruvbox-kvantum.url = "github:thefallnn/Gruvbox-Kvantum"; gruvbox-kvantum.flake = false; @@ -87,6 +89,7 @@ }; } inputs.chaotic-nyx.nixosModules.default + inputs.nur.nixosModules.nur ]; }; }; diff --git a/system/configuration.nix b/system/configuration.nix index 29abf75..6fa57b4 100755 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -13,7 +13,7 @@ ]; boot = { - tmp.useTmpfs = true; + tmp.cleanOnBoot = true; kernel.sysctl."vm.max_map_count" = 16777216; #Star Citizen crash fix diff --git a/user/configs/firefox/default.nix b/user/configs/firefox/default.nix index b2008e5..eebda85 100755 --- a/user/configs/firefox/default.nix +++ b/user/configs/firefox/default.nix @@ -1,10 +1,24 @@ -{ - programs.browserpass = { - enable = true; - browsers = ["firefox"]; - }; - +{config, ...}: { programs.firefox = { enable = true; + + profiles.${config.home.username} = { + extensions = with config.nur.repos.rycee.firefox-addons; [ + augmented-steam + bypass-paywalls-clean + darkreader + gruvbox-dark-theme + nitter-redirect + redirector + sponsorblock + startpage-private-search + ublock-origin + youtube-shorts-block + ]; + + settings = { + "media.hardwaremediakeys.enabled" = false; + }; + }; }; -} + } diff --git a/user/configs/fish/default.nix b/user/configs/fish/default.nix index cf25947..41fbae0 100755 --- a/user/configs/fish/default.nix +++ b/user/configs/fish/default.nix @@ -39,7 +39,7 @@ ''; nor = '' - pushd . &> /dev/null + pushd $PWD &> /dev/null cd "${config.home.homeDirectory}/.dotfiles" doas nixos-rebuild switch --flake .# popd &> /dev/null diff --git a/user/configs/wayland/ags/ags-config/config.js b/user/configs/wayland/ags/ags-config/config.js deleted file mode 100644 index cd52d82..0000000 --- a/user/configs/wayland/ags/ags-config/config.js +++ /dev/null @@ -1,20 +0,0 @@ -import App from 'resource:///com/github/Aylur/ags/app.js' -import { exec } from 'resource://com/github/Aylur/ags/utils.js' - -import Panel from './js/panel/panel.js'; - -import { - forMonitors -} -from './js/utils.js'; - -const styleScss = App.configDir + '/style.scss'; -const styleCss = '/tmp/style-ags.css'; -exec(`sassc ${styleScss} ${styleCss}`); - -export default { - style: styleCss, - windows: [ - forMonitors(Panel), - ].flat(2), -}; diff --git a/user/configs/wayland/ags/ags-config/js/panel/panel.js b/user/configs/wayland/ags/ags-config/js/panel/panel.js deleted file mode 100644 index f544169..0000000 --- a/user/configs/wayland/ags/ags-config/js/panel/panel.js +++ /dev/null @@ -1,45 +0,0 @@ -import { Box, CenterBox, Window } from 'resource:///com/github/Aylur/ags/widget.js'; - -import Workspaces from './widgets/workspaces.js'; -import WindowTitle from './widgets/windowTitle.js'; -// -import Volume from './widgets/volume.js'; -import Mpris from './widgets/mpris.js' -// -import SysTray from './widgets/sysTray.js'; -import Clock from './widgets/clock.js'; - -const Left = monitor => Box({ - children: [ - Workspaces(monitor), - WindowTitle(), - ], -}); - -const Center = () => Box({ - children: [ - Volume(), - Mpris('mpd'), - ], -}); - -const Right = () => Box({ - hpack: 'end', - children: [ - SysTray(), - Clock(), - ], -}); - -export default monitor => Window({ - name: `bar-${monitor}`, - exclusivity: "exclusive", - className: 'bar', - monitor, - anchor: ['top', 'left', 'right'], - child: CenterBox({ - startWidget: Left(monitor), - centerWidget: Center(), - endWidget: Right(), - }), -}) diff --git a/user/configs/wayland/ags/ags-config/js/panel/widgets/clock.js b/user/configs/wayland/ags/ags-config/js/panel/widgets/clock.js deleted file mode 100644 index d54d119..0000000 --- a/user/configs/wayland/ags/ags-config/js/panel/widgets/clock.js +++ /dev/null @@ -1,19 +0,0 @@ -import { Box, Icon, Label } from 'resource:///com/github/Aylur/ags/widget.js'; -import { execAsync } from 'resource:///com/github/Aylur/ags/utils.js'; - -export default () => Box({ - className: 'date', - children: [ - Icon({ - icon: 'x-office-calendar-symbolic', - }), - - Label({ - connections: [ - [1000, label => execAsync(['date', '+%a %d, %B %H:%M']) - .then(date => label.label = ' ' + date).catch(console.error) - ], - ], - }), - ], -}); diff --git a/user/configs/wayland/ags/ags-config/js/panel/widgets/mpris.js b/user/configs/wayland/ags/ags-config/js/panel/widgets/mpris.js deleted file mode 100644 index eb4f020..0000000 --- a/user/configs/wayland/ags/ags-config/js/panel/widgets/mpris.js +++ /dev/null @@ -1,53 +0,0 @@ -import { Box, Button, Icon, Label, Stack } from 'resource:///com/github/Aylur/ags/widget.js'; -import Mpris from 'resource:///com/github/Aylur/ags/service/mpris.js'; - -export default player => Button({ - className: 'mpris', - onPrimaryClick: () => Mpris.getPlayer(player)?.playPause(), - onScrollUp: () => Mpris.getPlayer(player)?.previous(), - onScrollDown: () => Mpris.getPlayer(player)?.next(), - - child: Box({ - children: [ - Stack({ - items: [ - ['paused', Icon('media-playback-pause-symbolic')], - ['playing', Icon('media-playback-start-symbolic')], - ['stopped', Icon('media-playback-stop-symbolic')], - ], - - connections: [ - [Mpris, statusIcon => { - const mpris = Mpris.getPlayer(player); - - if(!mpris) - return; - - switch (mpris.playBackStatus) { - case "Playing": - statusIcon.shown = 'playing'; - break; - case "Paused": - statusIcon.shown = 'paused'; - break; - default: - statusIcon.shown = 'stopped'; - } - }] - ], - }), - - Label({ - connections: [ - [Mpris, label => { - const mpris = Mpris.getPlayer(player); - if (!mpris || mpris.playBackStatus == "Stopped") - label.label = ' Stopped'; - else - label.label = ` ${mpris.trackArtists.join(', ')} - ${mpris.trackTitle}`; - }] - ], - }), - ], - }), -}) diff --git a/user/configs/wayland/ags/ags-config/js/panel/widgets/sysTray.js b/user/configs/wayland/ags/ags-config/js/panel/widgets/sysTray.js deleted file mode 100644 index 339df3e..0000000 --- a/user/configs/wayland/ags/ags-config/js/panel/widgets/sysTray.js +++ /dev/null @@ -1,22 +0,0 @@ -import { Box, Button, Icon } from 'resource:///com/github/Aylur/ags/widget.js'; -import SystemTray from 'resource:///com/github/Aylur/ags/service/systemtray.js'; - -export default () => Box({ - className: 'tray', - connections: [ - [SystemTray, box => { - box.children = SystemTray.items.map(item => Button({ - className: 'tray-icons', - child: Icon({ binds: [['icon', item, 'icon']] }), - onPrimaryClick: (_, event) => item.activate(event), - onSecondaryClick: (_, event) => item.openMenu(event), - connections: [ - [item, button => { - button.child.icon = item.icon; - button.tooltipMarkup = item.tooltipMarkup; - }] - ], - })); - }] - ], -}); diff --git a/user/configs/wayland/ags/ags-config/js/panel/widgets/volume.js b/user/configs/wayland/ags/ags-config/js/panel/widgets/volume.js deleted file mode 100644 index 77357c7..0000000 --- a/user/configs/wayland/ags/ags-config/js/panel/widgets/volume.js +++ /dev/null @@ -1,50 +0,0 @@ -import { Box, Button, Icon, Label, Stack } from 'resource:///com/github/Aylur/ags/widget.js'; -import Audio from 'resource:///com/github/Aylur/ags/service/audio.js'; -import { execAsync } from 'resource:///com/github/Aylur/ags/utils.js'; - -export default () => Button({ - className: 'volume', - onScrollUp: () => execAsync('pamixer -i 10'), - onScrollDown: () => execAsync('pamixer -d 10'), - - child: Box({ - children: [ - Stack({ - items: [ - // tuples of [string, Widget] - ['67', Icon('audio-volume-high-symbolic')], - ['34', Icon('audio-volume-medium-symbolic')], - ['1', Icon('audio-volume-low-symbolic')], - ['0', Icon('audio-volume-muted-symbolic')], - ], - connections: [ - [Audio, stack => { - if (!Audio.speaker) - return; - - if (Audio.speaker.isMuted) { - stack.shown = '0'; - return; - } - - const show = [101, 67, 34, 1, 0].find( - threshold => threshold <= Audio.speaker.volume * 100); - - stack.shown = `${show}`; - }, 'speaker-changed'] - ], - }), - - Label({ - connections: [ - [Audio, label => { - if (!Audio.speaker) - return; - - label.label = ` ${Math.floor((Audio.speaker.volume * 100) / 5) * 5}%`; // round down to nearest 5 - }, 'speaker-changed'] - ], - }), - ], - }), -}); diff --git a/user/configs/wayland/ags/ags-config/js/panel/widgets/windowTitle.js b/user/configs/wayland/ags/ags-config/js/panel/widgets/windowTitle.js deleted file mode 100644 index d551d73..0000000 --- a/user/configs/wayland/ags/ags-config/js/panel/widgets/windowTitle.js +++ /dev/null @@ -1,11 +0,0 @@ -import { Label } from 'resource:///com/github/Aylur/ags/widget.js'; -import Hyprland from 'resource:///com/github/Aylur/ags/service/hyprland.js'; - -export default () => Label({ - connections: [ - [Hyprland, label => { - label.label = Hyprland.active.client.title || ''; - label.toggleClassName('windowTitle', label.label); - }] - ], -}); diff --git a/user/configs/wayland/ags/ags-config/js/panel/widgets/workspaces.js b/user/configs/wayland/ags/ags-config/js/panel/widgets/workspaces.js deleted file mode 100644 index cecd6ef..0000000 --- a/user/configs/wayland/ags/ags-config/js/panel/widgets/workspaces.js +++ /dev/null @@ -1,32 +0,0 @@ -import { Box, Button, Label } from 'resource:///com/github/Aylur/ags/widget.js'; -import { execAsync } from 'resource:///com/github/Aylur/ags/utils.js'; -import Hyprland from 'resource:///com/github/Aylur/ags/service/hyprland.js'; - -export default monitor => Box({ - className: 'workspaces', - connections: [ - [Hyprland, box => { - if (monitor == 0) { - box.children = [1, 2, 3].map(i => Button({ - onClicked: () => execAsync(`hyprctl dispatch workspace ${i}`), - onScrollDown: () => execAsync(`hyprctl dispatch workspace +1`), - onScrollUp: () => execAsync(`hyprctl dispatch workspace -1`), - child: Label({ - label: `${i}` - }), - className: Hyprland.active.workspace.id == i ? 'focused' : '', - })); - } else if (monitor == 1) { - box.children = [4, 5, 6].map(i => Button({ - onClicked: () => execAsync(`hyprctl dispatch workspace ${i}`), - onScrollDown: () => execAsync(`hyprctl dispatch workspace +1`), - onScrollUp: () => execAsync(`hyprctl dispatch workspace -1`), - child: Label({ - label: `${i}` - }), - className: Hyprland.active.workspace.id == i ? 'focused' : '', - })); - } - }] - ], -}); diff --git a/user/configs/wayland/ags/ags-config/js/utils.js b/user/configs/wayland/ags/ags-config/js/utils.js deleted file mode 100644 index ed254cf..0000000 --- a/user/configs/wayland/ags/ags-config/js/utils.js +++ /dev/null @@ -1,6 +0,0 @@ -import { exec } from 'resource:///com/github/Aylur/ags/utils.js' - -export function forMonitors(widget) { - const ws = JSON.parse(exec('hyprctl -j monitors')); - return ws.map(mon => widget(mon.id)); -} diff --git a/user/configs/wayland/ags/ags-config/notify-test.scss b/user/configs/wayland/ags/ags-config/notify-test.scss deleted file mode 100644 index 836df4f..0000000 --- a/user/configs/wayland/ags/ags-config/notify-test.scss +++ /dev/null @@ -1,83 +0,0 @@ -/* Assuming Adwaita-dark as Gtk theme */ - -#notification-center { - background-color: #232323; -} - -#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); -// } - -.notification > * { - margin: 8px; - padding: 8px; - border-radius: 15px; - background-color: #141414; -} - -.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); -} - -.action-button { - margin: 0 4px; -} - -.action-button:first-child { - margin-left: 0; -} - -.action-button:last-child { - margin-right: 0; -} - -.action-button:last-child:first-child { - margin: 0; -} - -.header { - padding: 8px; - border-bottom: 1px solid rgba(255, 255, 255, 0.2); -} - -.placeholder image { - font-size: 8em; -} - -.placeholder label { - font-size: 1.4em; -} diff --git a/user/configs/wayland/ags/ags-config/scss/notifications/.sass-cache/503f62c5c6d624b8605b27a983ea9fa0abebbb04/notificationPopup.scssc b/user/configs/wayland/ags/ags-config/scss/notifications/.sass-cache/503f62c5c6d624b8605b27a983ea9fa0abebbb04/notificationPopup.scssc deleted file mode 100644 index 0edf4096d6e3ef848e1e1f49ac91cd99914c239b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2760 zcmcImTTdHD6sA(OnDrGCC1?_(Dy^C6hb4(7(yR~h&~9HRZxvMGw!*P1=pZ-u&DG__&y6# zy)yYiy*ax!2JI{Bu=O$!5ub2}MqC6}BAkc6^S~81t*>V5u%&-v>ijj8Vjj3hj_`y; ztw_>9g%n&xSZm$44lM&2zmAYeqPvixvf`c=8rN$O*F+zv&$_5eM5z6!uWO*{@qlpy zHHi{)=`b6tPMJWvN$A7)C1j}IZlF3*5tWf03MJ5fQRPY~uFbCF8rZ84F_|b9!DE%M zz>Pn_O)V_pEpCEm9nqk@|0wm2a+EUg#t5S3ekf$bq(H62+aP@b*uR7C)t!o%Ujl0q zI2g1)S~KA@%csGdc~-|2k@ljjxnk0CL@?n~W!=y_j|Q$q;Tiq_Q2pN0Zmq>=k|63t zGV0m?oBds)fEHVGW8Y92@L&qymWC`cAgviyv-`DoIoe6VB`D~UtD^5RkX$?C7*OqW ztZ2r3NPQ~jU&i7#M^)DYu5@vglmTEsFZ5`{xjF16@TN$JGJ&WXeztJ>32&1+ z-XRUNRrK0j?ufa^ba-{m3_R;X-|sAf8&~;zuA-RfCV@&;%(b;Lq~A_!i+Rk6pxTk{ z9y(;7=PYno32Mq`{+LO1Z3y&ySvk{N$3JTM%SUo3E01Mb&CNP{>c%HFJOqcA;hBZhH(S!G$mOvPjTwGOwS;KTU)Dl6@j@Ck54v z2X>Amwi2`^FhC&(=`H;yU5-s~wPI-`Ln$7HCp=RE5nCH|hVOWsqP|p-T>79tsFp@9?H*jgt zE?tDTu{~V|CaQB6HX3Y7CQ+NXER+m(CR7;@z-Va0eBiKHK}R=GeF@Dv;MdHP)Tiw% z30-23QCwx<0mY($3`M)(ppiQ$qL_w4{>bDHDAs%)9Nlm?n&m*^GmRELk0CL8-R>eN zxQ{P%wvDB18*zSFW9d^~&a1OsW#A#(qJb>i&v~|5zLjNzi`k~35Sh!9{R2@~vZ%?= zxvApxYU&+mXVUg`9BIin+z+y%}>47pV-MbO}FR8%B=l<>())>hX2} diff --git a/user/configs/wayland/ags/ags-config/scss/notifications/.sass-cache/7374c266d40f30c3143150a6135aabe76e1eef96/gruvbox.scssc b/user/configs/wayland/ags/ags-config/scss/notifications/.sass-cache/7374c266d40f30c3143150a6135aabe76e1eef96/gruvbox.scssc deleted file mode 100644 index a47a11b0f8f857f796a8513bdfac19891c2b38fd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3948 zcmcJS+iv4F5QY<=@Huu)&T$i@i?q$QjxEQI6N@OIUNk_8ZcuEp3lzC9Xp2^el|_S; zbLgV4)Qi4OAE7VNp?r`jQ9%}M0UI_c^3!ns8FJXDo>iNP2;THZsUHtj)~pt zoz)ws{Z{kDZg>0jZsWYwZnSb=WSF^qjfF7H8%~I6zGKY4Vm2w5MXPs5U7Hi{w!qB2 z`9U8rr?~49Ik0HvEDsOJDf)4UoDx`gLYi5{Cv790AM zdE(Q8S+=~<00=(gosma(ldO`%QD_V3gWE>nc^UCF<0~Ef1`Ql0V zWRL+G2c<7xzpLG`0jUkJHzIDWYBOKHMbt)u@LG>~ed>tX1AcO`XV) z^O#Tjw1)%t21b-DPO#hg-}qaWfOzZ3pzAzf?orPH=Vq>npMquGVR85S!UcqvT!k@VRs@Bu&;D;353xEirVlZ^!}Qd#5vQCRmbJEZLj4M6L+}-5FtS6Wf6BcU;!R zu7OgZ%%KsiS+7W1Ph}`wlp9I9@5nGjIfn8jR0uYg3~Vkz=hAIP35LbLW6nKkoKBpZ zj)X%R@~|{}xooY@FG&Ue6$jVb&w#@?li-bH@Sibo{cIWzI*T_Ii+AS1=qrZ4PNQ!= zEubU#zA@0Z21u!+gi=cLb`^@ur|%3@iD;+8gxV>Xsdm{1@t>)eiKv$WyH{qukgfIk zRlHn19k{H36VsV4KBt}z94520SV`st^>maa#k^P|>eSO=LiMCEGt8WNPy)O-_kM^5 za=I0qu@HgTh;~^;JK0)G)b9Hj_Ovz0I~{g?<{F7j&N~#xHlM+UStqgE^VTNlrZXao=@+|gZLcvK1ThKsT(H~hvXvi<-qvRA+n_`MM*sz<)+)u zVRvWpN$e~nW5@HaG3@zNKApAu3ijXy^64nyo-U31QlTWsr^AHuDVV8zc_;yoKS#Rv zabHXmFCS4Z4|a#Ekgenj=qiRiYfJ({hYc$riA~-ze~MvS({ogZ4L3}QRSzotai^n% z$GoJd+irq#I!vgXf|)9}5hw@M7~#hp+jJCE@v?H6t5-{t^{1e;89stTZ_pZ)NKm+D z>&B#`ObZd=3SjomEQn=mUkN|Wd96c)3y2_s0u9PZxJ<}`5bh<5e;jrl^FUtXj+#bg z{DDgK4ayz%#}AI6wyK=e+ZCu-WVbx+gBkG$6Vy@5sGPPcr%gFL+@{8pV8f}jPb%lZ x!*LRfADkPNvqq)WmXl&GHV>rRP%iMKzQRn+9G3#erKXO9J0ILGI@4?M%|DTKb!q?r diff --git a/user/configs/wayland/ags/ags-config/scss/notifications/notificationPopup.scss b/user/configs/wayland/ags/ags-config/scss/notifications/notificationPopup.scss deleted file mode 100644 index 678317c..0000000 --- a/user/configs/wayland/ags/ags-config/scss/notifications/notificationPopup.scss +++ /dev/null @@ -1,48 +0,0 @@ -// #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); -} diff --git a/user/configs/wayland/ags/ags-config/scss/panel.scss b/user/configs/wayland/ags/ags-config/scss/panel.scss deleted file mode 100644 index 728b834..0000000 --- a/user/configs/wayland/ags/ags-config/scss/panel.scss +++ /dev/null @@ -1,7 +0,0 @@ -.bar { - min-height: 33px; - font-family: "JetBrainsMono Nerd Font"; - font-size: 12px; - background-color: $bg; - color: $fg; -} diff --git a/user/configs/wayland/ags/ags-config/scss/panel/panel.scss b/user/configs/wayland/ags/ags-config/scss/panel/panel.scss deleted file mode 100644 index 8eb3b2e..0000000 --- a/user/configs/wayland/ags/ags-config/scss/panel/panel.scss +++ /dev/null @@ -1,45 +0,0 @@ -@import './themes/gruvbox.scss'; - -@import './widgets/workspaces.scss'; -@import './widgets/windowTitle.scss'; -@import './widgets/volume.scss'; - -* { - min-height: unset; -} - -.bar { - min-height: 33px; - font-family: "JetBrainsMono Nerd Font"; - font-size: 12px; - background-color: $bg; - color: $fg; -} - - -.media { - background-color: $box-bg; - border-radius: $box-border-radius; - padding: 0px 10px 0px 10px; - margin: 5px 10px 5px 0px; -} - -.date { - background-color: $box-bg; - padding: 0px 10px 0px 10px; - border-radius: $box-border-radius; - margin: 5px 10px 5px 0px; -}; - -.tray { - background-color: $box-bg; - padding: 0px 10px 0px 10px; - border-radius: $box-border-radius; - margin: 5px 10px 5px 0px; -} - -.tray-icon { - font-size: 18px; - background-color: $box-bg; - padding: 2px; -} diff --git a/user/configs/wayland/ags/ags-config/scss/panel/widgets/clock.scss b/user/configs/wayland/ags/ags-config/scss/panel/widgets/clock.scss deleted file mode 100644 index a2aff87..0000000 --- a/user/configs/wayland/ags/ags-config/scss/panel/widgets/clock.scss +++ /dev/null @@ -1,6 +0,0 @@ -.date { - background-color: $box-bg; - padding: 0px 10px 0px 10px; - border-radius: $box-border-radius; - margin: 5px 10px 5px 0px; -}; diff --git a/user/configs/wayland/ags/ags-config/scss/panel/widgets/mpris.scss b/user/configs/wayland/ags/ags-config/scss/panel/widgets/mpris.scss deleted file mode 100644 index c3e7305..0000000 --- a/user/configs/wayland/ags/ags-config/scss/panel/widgets/mpris.scss +++ /dev/null @@ -1,6 +0,0 @@ -.mpris { - background-color: $box-bg; - border-radius: $box-border-radius; - padding: 0px 10px 0px 10px; - margin: 5px 10px 5px 0px; -} diff --git a/user/configs/wayland/ags/ags-config/scss/panel/widgets/sysTray.scss b/user/configs/wayland/ags/ags-config/scss/panel/widgets/sysTray.scss deleted file mode 100644 index 8999bd7..0000000 --- a/user/configs/wayland/ags/ags-config/scss/panel/widgets/sysTray.scss +++ /dev/null @@ -1,12 +0,0 @@ -.tray { - background-color: $box-bg; - padding: 0px 10px 0px 10px; - border-radius: $box-border-radius; - margin: 5px 10px 5px 0px; -} - -.tray .tray-icons { - font-size: 18px; - background-color: $box-bg; - padding: 2px; -} diff --git a/user/configs/wayland/ags/ags-config/scss/panel/widgets/volume.scss b/user/configs/wayland/ags/ags-config/scss/panel/widgets/volume.scss deleted file mode 100644 index 3e8ba74..0000000 --- a/user/configs/wayland/ags/ags-config/scss/panel/widgets/volume.scss +++ /dev/null @@ -1,6 +0,0 @@ -.volume { - background-color: $box-bg; - border-radius: $box-border-radius; - padding: 0px 10px 0px 10px; - margin: 5px 5px 5px 0px; -} diff --git a/user/configs/wayland/ags/ags-config/scss/panel/widgets/windowTitle.scss b/user/configs/wayland/ags/ags-config/scss/panel/widgets/windowTitle.scss deleted file mode 100644 index 3a07a0e..0000000 --- a/user/configs/wayland/ags/ags-config/scss/panel/widgets/windowTitle.scss +++ /dev/null @@ -1,6 +0,0 @@ -.windowTitle { - background-color: $box-bg; - border-radius: $box-border-radius; - padding: 0px 10px 0px 10px; - margin: 5px 0px 5px 10px; -} diff --git a/user/configs/wayland/ags/ags-config/scss/panel/widgets/workspaces.scss b/user/configs/wayland/ags/ags-config/scss/panel/widgets/workspaces.scss deleted file mode 100644 index b8475a0..0000000 --- a/user/configs/wayland/ags/ags-config/scss/panel/widgets/workspaces.scss +++ /dev/null @@ -1,27 +0,0 @@ -.workspaces { - background-color: $box-bg; - border-radius: $box-border-radius; - margin: 5px 0px 5px 10px; - font-size: 0px; -} - -.workspaces button { - border-radius: 0; - background-color: $wsbg; - font-size: 10px; -} - -.workspaces button.focused { - border-radius: 0px; - background-color: $activewsbg; -} - -.workspaces button:first-child { - border-radius: $box-border-radius 0px 0px $box-border-radius; -} - -.workspaces button:last-child { - border-radius: 0px $box-border-radius $box-border-radius 0px; -} - - diff --git a/user/configs/wayland/ags/ags-config/scss/themes/gruvbox.scss b/user/configs/wayland/ags/ags-config/scss/themes/gruvbox.scss deleted file mode 100644 index a8b2a33..0000000 --- a/user/configs/wayland/ags/ags-config/scss/themes/gruvbox.scss +++ /dev/null @@ -1,7 +0,0 @@ -$bg: rgba(40,40,40,0.8); -$fg: rgb(235,219,178); -$wsfg: rgb(235,219,178); -$wsbg: rgb(60,56,54); -$activewsbg: rgb(102,92,84); -$box-bg: rgb(80,73,69); -$box-border-radius: 10px; diff --git a/user/configs/wayland/ags/ags-config/style.scss b/user/configs/wayland/ags/ags-config/style.scss deleted file mode 100644 index ff91bb6..0000000 --- a/user/configs/wayland/ags/ags-config/style.scss +++ /dev/null @@ -1,14 +0,0 @@ -@import './scss/themes/gruvbox.scss'; - -@import './scss/panel.scss'; -@import './scss/panel/widgets/workspaces.scss'; -@import './scss/panel/widgets/windowTitle.scss'; -@import './scss/panel/widgets/volume.scss'; -@import './scss/panel/widgets/mpris.scss'; -@import './scss/panel/widgets/clock.scss'; -@import './scss/panel/widgets/sysTray.scss'; - -* { - min-height: unset; -} - diff --git a/user/configs/wayland/ags/default.nix b/user/configs/wayland/ags/default.nix deleted file mode 100644 index 70c6acb..0000000 --- a/user/configs/wayland/ags/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ - pkgs, - lib, - inputs, - ... -}: { - imports = [inputs.ags.homeManagerModules.default]; - - programs.ags = { - enable = true; - configDir = ./ags-config; - }; -} diff --git a/user/configs/wayland/hyprland/default.nix b/user/configs/wayland/hyprland/default.nix index cc851cb..976561a 100755 --- a/user/configs/wayland/hyprland/default.nix +++ b/user/configs/wayland/hyprland/default.nix @@ -6,7 +6,6 @@ ... }: { imports = [ - ../ags ./settings.nix ]; diff --git a/user/configs/wayland/hyprland/settings.nix b/user/configs/wayland/hyprland/settings.nix index 3896a3f..cb48dfe 100644 --- a/user/configs/wayland/hyprland/settings.nix +++ b/user/configs/wayland/hyprland/settings.nix @@ -105,7 +105,7 @@ in { exec = [ "${pkgs.xorg.xrandr}/bin/xrandr --output ${rightMonitor.display} --primary" - "ags -q; sleep 1; ags" + "eww kill; sleep 1; eww open-many bar0 bar1" "sleep 2; pkill swww-daemon; swww init" #Set cursor diff --git a/user/home.nix b/user/home.nix index a3fe0d5..d20f505 100755 --- a/user/home.nix +++ b/user/home.nix @@ -23,6 +23,7 @@ ./configs/wayland/hyprland ./configs/xdg-mime.nix inputs.nix-index-database.hmModules.nix-index + inputs.nur.hmModules.nur ]; home.username = "manuel"; @@ -36,7 +37,6 @@ calcurse electron filezilla - gamescope_git gimp gnome.gnome-boxes gnome.gnome-settings-daemon