From af3d9eb720f6db2e0f4b089d0c2d11efabf7c54d Mon Sep 17 00:00:00 2001 From: Varris Date: Fri, 25 Aug 2023 17:22:02 +0200 Subject: [PATCH] Revert "update" This reverts commit d21e1f9ff9d3762aaed554d3d69ddcdd089f2a6f. --- flake.nix | 5 +++++ system/configuration.nix | 6 ++---- user/configs/neovim/default.nix | 1 - user/configs/wayland/eww/{panel => }/config.nix | 17 ++++++++--------- user/configs/wayland/eww/default.nix | 12 ++++-------- .../configs/wayland/eww/{panel => }/scripts.nix | 0 .../wayland/eww/{panel => }/stylesheet.nix | 10 +++++----- user/configs/wayland/hyprland/default.nix | 3 +-- user/configs/xdg-mime.nix | 6 +++--- user/home.nix | 8 ++++---- 10 files changed, 32 insertions(+), 36 deletions(-) rename user/configs/wayland/eww/{panel => }/config.nix (88%) rename user/configs/wayland/eww/{panel => }/scripts.nix (100%) rename user/configs/wayland/eww/{panel => }/stylesheet.nix (94%) diff --git a/flake.nix b/flake.nix index e284a87..b98aa80 100755 --- a/flake.nix +++ b/flake.nix @@ -75,6 +75,11 @@ flake = false; }; + waybar = { + url = "github:alexays/waybar"; + flake = false; + }; + nvim-hmts = { url = "github:calops/hmts.nvim"; flake = false; diff --git a/system/configuration.nix b/system/configuration.nix index d2f0893..7dbfe67 100755 --- a/system/configuration.nix +++ b/system/configuration.nix @@ -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"; diff --git a/user/configs/neovim/default.nix b/user/configs/neovim/default.nix index d7567c0..66f61f0 100755 --- a/user/configs/neovim/default.nix +++ b/user/configs/neovim/default.nix @@ -31,7 +31,6 @@ null-ls-nvim nvim-lspconfig nvim-treesitter.withAllGrammars - playground trouble-nvim nvim-cmp diff --git a/user/configs/wayland/eww/panel/config.nix b/user/configs/wayland/eww/config.nix similarity index 88% rename from user/configs/wayland/eww/panel/config.nix rename to user/configs/wayland/eww/config.nix index d7e1d9a..a3118bf 100644 --- a/user/configs/wayland/eww/panel/config.nix +++ b/user/configs/wayland/eww/config.nix @@ -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}")) diff --git a/user/configs/wayland/eww/default.nix b/user/configs/wayland/eww/default.nix index a5df255..7cb872e 100644 --- a/user/configs/wayland/eww/default.nix +++ b/user/configs/wayland/eww/default.nix @@ -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 ]; } diff --git a/user/configs/wayland/eww/panel/scripts.nix b/user/configs/wayland/eww/scripts.nix similarity index 100% rename from user/configs/wayland/eww/panel/scripts.nix rename to user/configs/wayland/eww/scripts.nix diff --git a/user/configs/wayland/eww/panel/stylesheet.nix b/user/configs/wayland/eww/stylesheet.nix similarity index 94% rename from user/configs/wayland/eww/panel/stylesheet.nix rename to user/configs/wayland/eww/stylesheet.nix index cdf7c2e..82b0e25 100644 --- a/user/configs/wayland/eww/panel/stylesheet.nix +++ b/user/configs/wayland/eww/stylesheet.nix @@ -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; diff --git a/user/configs/wayland/hyprland/default.nix b/user/configs/wayland/hyprland/default.nix index 9045807..636efa5 100755 --- a/user/configs/wayland/hyprland/default.nix +++ b/user/configs/wayland/hyprland/default.nix @@ -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 diff --git a/user/configs/xdg-mime.nix b/user/configs/xdg-mime.nix index 0ed3e6e..b6aaf6e 100755 --- a/user/configs/xdg-mime.nix +++ b/user/configs/xdg-mime.nix @@ -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"; }; }; } diff --git a/user/home.nix b/user/home.nix index fe89f95..0f2619e 100755 --- a/user/home.nix +++ b/user/home.nix @@ -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 ];