Revert "update"

This reverts commit d21e1f9ff9.
This commit is contained in:
Varris 2023-08-25 17:22:02 +02:00
parent d21e1f9ff9
commit af3d9eb720
10 changed files with 32 additions and 36 deletions

View File

@ -75,6 +75,11 @@
flake = false;
};
waybar = {
url = "github:alexays/waybar";
flake = false;
};
nvim-hmts = {
url = "github:calops/hmts.nvim";
flake = false;

View File

@ -13,10 +13,6 @@
"amd_pstate=active"
];
# kernelPackages = pkgs.linuxPackages_latest;
supportedFilesystems = [ "bcachefs" ];
kernelModules = [ "i2c-dev" "i2c-piix4" ];
loader = {
efi = {
canTouchEfiVariables = true;
@ -37,6 +33,8 @@
};
};
kernelPackages = pkgs.linuxPackages_latest;
kernelModules = [ "i2c-dev" "i2c-piix4" ];
};
powerManagement.cpuFreqGovernor = "schedutil";

View File

@ -31,7 +31,6 @@
null-ls-nvim
nvim-lspconfig
nvim-treesitter.withAllGrammars
playground
trouble-nvim
nvim-cmp

View File

@ -3,12 +3,11 @@ let
inherit (import ./scripts.nix { inherit pkgs; }) workspaces mpd-current-song get-volume;
in
{
panel-config =
''
eww-config = ''
;; ----------------------------- right monitor
(defwidget bar0 []
(centerbox
:class "panel"
:class "bar"
:orientation "h"
(left_side0)
(center)
@ -29,7 +28,7 @@ in
)
(box
:class { window0 != "" ? "panel-widget-window" : "" }
:class "window"
window0)
)
)
@ -38,7 +37,7 @@ in
(defwidget bar1 []
(centerbox
:class "panel"
:class "bar"
:orientation "h"
(left_side1)
(center)
@ -59,7 +58,7 @@ in
)
(box
:class { window1 != "" ? "panel-widget-window" : "" }
:class "window"
window1)
)
)
@ -75,7 +74,7 @@ in
:onscroll "pamixer `echo {} | sed 's/up/\-i/\' | sed 's/down/\-d/'` 10"
(box
:space-evenly false
:class "panel-widget-volume"
:class "volume"
volume))
(box
@ -119,8 +118,8 @@ in
;; ---------------------------- 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 window1 "${pkgs.eww-hyprland-activewindow}/bin/hyprland-activewindow `${pkgs.hyprland}/bin/hyprctl monitors -j | ${pkgs.jq}/bin/jq -r \".[1].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 `hyprctl monitors -j | jq -r \".[1].name\"`")
(defwidget title0 []
(label :text "''${window0}"))

View File

@ -1,17 +1,13 @@
{ pkgs, ... }:
let
inherit (import ./panel/config.nix { inherit pkgs; }) panel-config;
inherit (import ./panel/stylesheet.nix) panel-stylesheet;
inherit (import ./config.nix { inherit pkgs; }) eww-config;
inherit (import ./stylesheet.nix) eww-stylesheet;
in
{
xdg.configFile."eww/eww.yuck".text = ''
${panel-config}
'';
xdg.configFile."eww/eww.scss".text = ''
${panel-stylesheet}
'';
xdg.configFile."eww/eww.yuck".text = "${eww-config}";
xdg.configFile."eww/eww.scss".text = "${eww-stylesheet}";
home.packages = [ pkgs.eww-git ];
}

View File

@ -1,5 +1,5 @@
{
panel-stylesheet = ''
eww-stylesheet = ''
$bg: rgba(40,40,40,0.8);
$fg: rgb(235,219,178);
@ -15,21 +15,21 @@
}
//Global Styles
.panel {
.bar {
background-color: $bg;
color: $fg;
font-family: "JetBrainsMono Nerd Font";
font-size: 12px;
}
.panel-widget-window {
.window {
background-color: $box-bg;
border-radius: 10px;
padding: 0px 10px 0px 10px;
margin: 5px 0px 5px 10px;
}
.panel-widget-volume {
.volume {
background-color: $box-bg;
border-radius: 10px 0px 0px 10px;
margin: 5px 0px 5px 0px;
@ -57,7 +57,7 @@
margin: 5px 10px 5px 0px;
}
.panel-widget-workspace {
.wswidget {
background-color: $box-bg;
border-radius: 10px;
margin: 5px 0px 5px 10px;

View File

@ -122,7 +122,7 @@ in
drop_shadow = yes
shadow_range = 8
shadow_render_power = 6
shadow_render_power = 1
col.shadow = rgba(282828ff)
}
@ -208,7 +208,6 @@ in
bind = ${modKey} SHIFT, C, exec, hyprctl reload
layerrule = blur, notifications
layerrule = ignorezero, notifications
layerrule = blur, gtk-layer-shell

View File

@ -6,9 +6,9 @@
"inode/directory" = "org.kde.dolphin.desktop";
"text/plain" = "nvim.desktop";
"image/jpeg" = "imv.desktop";
"image/png" = "imv.desktop";
"image/svg" = "imv.desktop";
"image/jpeg" = "sxiv.desktop";
"image/png" = "sxiv.desktop";
"image/svg" = "sxiv.desktop";
};
};
}

View File

@ -25,16 +25,14 @@
bottles
bottom
calcurse
discord
gamescope_git
gimp
gnome.gnome-boxes
gnome.gnome-settings-daemon
gnome.gvfs
gnome.seahorse
gnome.gnome-settings-daemon
gnome.simple-scan
heroic
imv
jq
libsForQt5.ark
libsForQt5.dolphin
@ -52,18 +50,20 @@
protontricks
qbittorrent
qt5ct
samba
sc-im
samba
signal-desktop
sshfs
steam-run
steamtinkerlaunch
sxiv
thunderbird
tldr
twemoji-color-font
vimv
vulkan-tools
vulkan-validation-layers
discord
xdg-utils
];