parent
d21e1f9ff9
commit
af3d9eb720
|
@ -75,6 +75,11 @@
|
||||||
flake = false;
|
flake = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
waybar = {
|
||||||
|
url = "github:alexays/waybar";
|
||||||
|
flake = false;
|
||||||
|
};
|
||||||
|
|
||||||
nvim-hmts = {
|
nvim-hmts = {
|
||||||
url = "github:calops/hmts.nvim";
|
url = "github:calops/hmts.nvim";
|
||||||
flake = false;
|
flake = false;
|
||||||
|
|
|
@ -13,10 +13,6 @@
|
||||||
"amd_pstate=active"
|
"amd_pstate=active"
|
||||||
];
|
];
|
||||||
|
|
||||||
# kernelPackages = pkgs.linuxPackages_latest;
|
|
||||||
supportedFilesystems = [ "bcachefs" ];
|
|
||||||
kernelModules = [ "i2c-dev" "i2c-piix4" ];
|
|
||||||
|
|
||||||
loader = {
|
loader = {
|
||||||
efi = {
|
efi = {
|
||||||
canTouchEfiVariables = true;
|
canTouchEfiVariables = true;
|
||||||
|
@ -37,6 +33,8 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
kernelPackages = pkgs.linuxPackages_latest;
|
||||||
|
kernelModules = [ "i2c-dev" "i2c-piix4" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
powerManagement.cpuFreqGovernor = "schedutil";
|
powerManagement.cpuFreqGovernor = "schedutil";
|
||||||
|
|
|
@ -31,7 +31,6 @@
|
||||||
null-ls-nvim
|
null-ls-nvim
|
||||||
nvim-lspconfig
|
nvim-lspconfig
|
||||||
nvim-treesitter.withAllGrammars
|
nvim-treesitter.withAllGrammars
|
||||||
playground
|
|
||||||
trouble-nvim
|
trouble-nvim
|
||||||
|
|
||||||
nvim-cmp
|
nvim-cmp
|
||||||
|
|
|
@ -3,12 +3,11 @@ let
|
||||||
inherit (import ./scripts.nix { inherit pkgs; }) workspaces mpd-current-song get-volume;
|
inherit (import ./scripts.nix { inherit pkgs; }) workspaces mpd-current-song get-volume;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
panel-config =
|
eww-config = ''
|
||||||
''
|
|
||||||
;; ----------------------------- right monitor
|
;; ----------------------------- right monitor
|
||||||
(defwidget bar0 []
|
(defwidget bar0 []
|
||||||
(centerbox
|
(centerbox
|
||||||
:class "panel"
|
:class "bar"
|
||||||
:orientation "h"
|
:orientation "h"
|
||||||
(left_side0)
|
(left_side0)
|
||||||
(center)
|
(center)
|
||||||
|
@ -29,7 +28,7 @@ in
|
||||||
)
|
)
|
||||||
|
|
||||||
(box
|
(box
|
||||||
:class { window0 != "" ? "panel-widget-window" : "" }
|
:class "window"
|
||||||
window0)
|
window0)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
@ -38,7 +37,7 @@ in
|
||||||
|
|
||||||
(defwidget bar1 []
|
(defwidget bar1 []
|
||||||
(centerbox
|
(centerbox
|
||||||
:class "panel"
|
:class "bar"
|
||||||
:orientation "h"
|
:orientation "h"
|
||||||
(left_side1)
|
(left_side1)
|
||||||
(center)
|
(center)
|
||||||
|
@ -59,7 +58,7 @@ in
|
||||||
)
|
)
|
||||||
|
|
||||||
(box
|
(box
|
||||||
:class { window1 != "" ? "panel-widget-window" : "" }
|
:class "window"
|
||||||
window1)
|
window1)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
@ -75,7 +74,7 @@ in
|
||||||
:onscroll "pamixer `echo {} | sed 's/up/\-i/\' | sed 's/down/\-d/'` 10"
|
:onscroll "pamixer `echo {} | sed 's/up/\-i/\' | sed 's/down/\-d/'` 10"
|
||||||
(box
|
(box
|
||||||
:space-evenly false
|
:space-evenly false
|
||||||
:class "panel-widget-volume"
|
:class "volume"
|
||||||
volume))
|
volume))
|
||||||
|
|
||||||
(box
|
(box
|
||||||
|
@ -119,8 +118,8 @@ in
|
||||||
|
|
||||||
;; ---------------------------- window widget
|
;; ---------------------------- window widget
|
||||||
|
|
||||||
(deflisten window0 "${pkgs.eww-hyprland-activewindow}/bin/hyprland-activewindow `${pkgs.hyprland}/bin/hyprctl monitors -j | ${pkgs.jq}/bin/jq -r \".[0].name\"`")
|
(deflisten window0 "${pkgs.eww-hyprland-activewindow}/bin/hyprland-activewindow `hyprctl monitors -j | jq -r \".[0].name\"`")
|
||||||
(deflisten window1 "${pkgs.eww-hyprland-activewindow}/bin/hyprland-activewindow `${pkgs.hyprland}/bin/hyprctl monitors -j | ${pkgs.jq}/bin/jq -r \".[1].name\"`")
|
(deflisten window1 "${pkgs.eww-hyprland-activewindow}/bin/hyprland-activewindow `hyprctl monitors -j | jq -r \".[1].name\"`")
|
||||||
|
|
||||||
(defwidget title0 []
|
(defwidget title0 []
|
||||||
(label :text "''${window0}"))
|
(label :text "''${window0}"))
|
|
@ -1,17 +1,13 @@
|
||||||
{ pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
let
|
let
|
||||||
|
|
||||||
inherit (import ./panel/config.nix { inherit pkgs; }) panel-config;
|
inherit (import ./config.nix { inherit pkgs; }) eww-config;
|
||||||
inherit (import ./panel/stylesheet.nix) panel-stylesheet;
|
inherit (import ./stylesheet.nix) eww-stylesheet;
|
||||||
|
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
xdg.configFile."eww/eww.yuck".text = ''
|
xdg.configFile."eww/eww.yuck".text = "${eww-config}";
|
||||||
${panel-config}
|
xdg.configFile."eww/eww.scss".text = "${eww-stylesheet}";
|
||||||
'';
|
|
||||||
xdg.configFile."eww/eww.scss".text = ''
|
|
||||||
${panel-stylesheet}
|
|
||||||
'';
|
|
||||||
|
|
||||||
home.packages = [ pkgs.eww-git ];
|
home.packages = [ pkgs.eww-git ];
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{
|
{
|
||||||
panel-stylesheet = ''
|
eww-stylesheet = ''
|
||||||
$bg: rgba(40,40,40,0.8);
|
$bg: rgba(40,40,40,0.8);
|
||||||
$fg: rgb(235,219,178);
|
$fg: rgb(235,219,178);
|
||||||
|
|
||||||
|
@ -15,21 +15,21 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
//Global Styles
|
//Global Styles
|
||||||
.panel {
|
.bar {
|
||||||
background-color: $bg;
|
background-color: $bg;
|
||||||
color: $fg;
|
color: $fg;
|
||||||
font-family: "JetBrainsMono Nerd Font";
|
font-family: "JetBrainsMono Nerd Font";
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.panel-widget-window {
|
.window {
|
||||||
background-color: $box-bg;
|
background-color: $box-bg;
|
||||||
border-radius: 10px;
|
border-radius: 10px;
|
||||||
padding: 0px 10px 0px 10px;
|
padding: 0px 10px 0px 10px;
|
||||||
margin: 5px 0px 5px 10px;
|
margin: 5px 0px 5px 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.panel-widget-volume {
|
.volume {
|
||||||
background-color: $box-bg;
|
background-color: $box-bg;
|
||||||
border-radius: 10px 0px 0px 10px;
|
border-radius: 10px 0px 0px 10px;
|
||||||
margin: 5px 0px 5px 0px;
|
margin: 5px 0px 5px 0px;
|
||||||
|
@ -57,7 +57,7 @@
|
||||||
margin: 5px 10px 5px 0px;
|
margin: 5px 10px 5px 0px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.panel-widget-workspace {
|
.wswidget {
|
||||||
background-color: $box-bg;
|
background-color: $box-bg;
|
||||||
border-radius: 10px;
|
border-radius: 10px;
|
||||||
margin: 5px 0px 5px 10px;
|
margin: 5px 0px 5px 10px;
|
|
@ -122,7 +122,7 @@ in
|
||||||
|
|
||||||
drop_shadow = yes
|
drop_shadow = yes
|
||||||
shadow_range = 8
|
shadow_range = 8
|
||||||
shadow_render_power = 6
|
shadow_render_power = 1
|
||||||
col.shadow = rgba(282828ff)
|
col.shadow = rgba(282828ff)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -208,7 +208,6 @@ in
|
||||||
bind = ${modKey} SHIFT, C, exec, hyprctl reload
|
bind = ${modKey} SHIFT, C, exec, hyprctl reload
|
||||||
|
|
||||||
layerrule = blur, notifications
|
layerrule = blur, notifications
|
||||||
layerrule = ignorezero, notifications
|
|
||||||
layerrule = blur, gtk-layer-shell
|
layerrule = blur, gtk-layer-shell
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -6,9 +6,9 @@
|
||||||
"inode/directory" = "org.kde.dolphin.desktop";
|
"inode/directory" = "org.kde.dolphin.desktop";
|
||||||
"text/plain" = "nvim.desktop";
|
"text/plain" = "nvim.desktop";
|
||||||
|
|
||||||
"image/jpeg" = "imv.desktop";
|
"image/jpeg" = "sxiv.desktop";
|
||||||
"image/png" = "imv.desktop";
|
"image/png" = "sxiv.desktop";
|
||||||
"image/svg" = "imv.desktop";
|
"image/svg" = "sxiv.desktop";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -25,16 +25,14 @@
|
||||||
bottles
|
bottles
|
||||||
bottom
|
bottom
|
||||||
calcurse
|
calcurse
|
||||||
discord
|
|
||||||
gamescope_git
|
gamescope_git
|
||||||
gimp
|
gimp
|
||||||
gnome.gnome-boxes
|
gnome.gnome-boxes
|
||||||
gnome.gnome-settings-daemon
|
|
||||||
gnome.gvfs
|
gnome.gvfs
|
||||||
gnome.seahorse
|
gnome.seahorse
|
||||||
|
gnome.gnome-settings-daemon
|
||||||
gnome.simple-scan
|
gnome.simple-scan
|
||||||
heroic
|
heroic
|
||||||
imv
|
|
||||||
jq
|
jq
|
||||||
libsForQt5.ark
|
libsForQt5.ark
|
||||||
libsForQt5.dolphin
|
libsForQt5.dolphin
|
||||||
|
@ -52,18 +50,20 @@
|
||||||
protontricks
|
protontricks
|
||||||
qbittorrent
|
qbittorrent
|
||||||
qt5ct
|
qt5ct
|
||||||
samba
|
|
||||||
sc-im
|
sc-im
|
||||||
|
samba
|
||||||
signal-desktop
|
signal-desktop
|
||||||
sshfs
|
sshfs
|
||||||
steam-run
|
steam-run
|
||||||
steamtinkerlaunch
|
steamtinkerlaunch
|
||||||
|
sxiv
|
||||||
thunderbird
|
thunderbird
|
||||||
tldr
|
tldr
|
||||||
twemoji-color-font
|
twemoji-color-font
|
||||||
vimv
|
vimv
|
||||||
vulkan-tools
|
vulkan-tools
|
||||||
vulkan-validation-layers
|
vulkan-validation-layers
|
||||||
|
discord
|
||||||
xdg-utils
|
xdg-utils
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
Reference in New Issue