From a789b7ca257999b42f64a8638b9e4c643124bf3a Mon Sep 17 00:00:00 2001 From: prescientmoon Date: Sun, 25 Feb 2024 05:31:20 +0100 Subject: [PATCH] Add lazygit, remove unused stuff Removes: - eww - khal --- home/features/cli/khal.nix | 25 ------- home/features/desktop/eww/default.nix | 21 ------ home/features/desktop/eww/template.yuck | 16 ----- home/features/desktop/eww/widgets/bar.yuck | 84 ---------------------- home/features/desktop/eww/widgets/eww.yuck | 1 - home/tethys.nix | 2 + 6 files changed, 2 insertions(+), 147 deletions(-) delete mode 100644 home/features/cli/khal.nix delete mode 100644 home/features/desktop/eww/default.nix delete mode 100644 home/features/desktop/eww/template.yuck delete mode 100644 home/features/desktop/eww/widgets/bar.yuck delete mode 120000 home/features/desktop/eww/widgets/eww.yuck diff --git a/home/features/cli/khal.nix b/home/features/cli/khal.nix deleted file mode 100644 index 2d1e035..0000000 --- a/home/features/cli/khal.nix +++ /dev/null @@ -1,25 +0,0 @@ -# TODO: sync theme with global theme -{ pkgs, ... }: -let calendarsHome = "productivity/calendars"; -in -{ - home.packages = with pkgs; [ khal ]; - xdg.configFile."khal/config".text = '' - [calendars] - [[calendars]] - path = ~/${calendarsHome}/* - type = discover - color = dark magenta - - [locale] - timeformat = %H:%M - dateformat = %d/%m/%Y - - [view] - theme = light - ''; - - satellite.persistence.at.data.apps.khal.directories = [ - calendarsHome - ]; -} diff --git a/home/features/desktop/eww/default.nix b/home/features/desktop/eww/default.nix deleted file mode 100644 index 7c333a1..0000000 --- a/home/features/desktop/eww/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ config, ... }: -let - base16-eww = config.lib.stylix.colors { - template = builtins.readFile ./template.yuck; - }; - - widgets = config.satellite.dev.path "home/features/desktop/eww/widgets"; -in -{ - programs.eww-hyprland = { - enable = true; - autoReload = true; - extraConfig = '' - ; Color scheme - (include "${base16-eww}") - - ; My widgets - (include "${widgets}/bar.yuck") - ''; - }; -} diff --git a/home/features/desktop/eww/template.yuck b/home/features/desktop/eww/template.yuck deleted file mode 100644 index 748d5f5..0000000 --- a/home/features/desktop/eww/template.yuck +++ /dev/null @@ -1,16 +0,0 @@ -(defvar base00 "{{base00-hex}}") -(defvar base01 "{{base01-hex}}") -(defvar base02 "{{base02-hex}}") -(defvar base03 "{{base03-hex}}") -(defvar base04 "{{base04-hex}}") -(defvar base05 "{{base05-hex}}") -(defvar base06 "{{base06-hex}}") -(defvar base07 "{{base07-hex}}") -(defvar base08 "{{base08-hex}}") -(defvar base09 "{{base09-hex}}") -(defvar base0A "{{base0A-hex}}") -(defvar base0B "{{base0B-hex}}") -(defvar base0C "{{base0C-hex}}") -(defvar base0D "{{base0D-hex}}") -(defvar base0E "{{base0E-hex}}") -(defvar base0F "{{base0F-hex}}") diff --git a/home/features/desktop/eww/widgets/bar.yuck b/home/features/desktop/eww/widgets/bar.yuck deleted file mode 100644 index 0650d3d..0000000 --- a/home/features/desktop/eww/widgets/bar.yuck +++ /dev/null @@ -1,84 +0,0 @@ -(defwindow bar - :monitor 0 - :stacking "fg" - :focusable false - :exclusive true - - :geometry (geometry - :width "80px" - :height "96%" - :x "20px" - :anchor "center left") - - (bar-layout)) - -(defwidget bar-layout [] - (centerbox - :orientation "v" - :style "background:transparent" - (bar-start) - (bar-center) - (bar-end))) - -(defwidget bar-start [] - (box - :orientation "v" - :valign "start" - (workspaces))) - -(defwidget bar-center [] - (box - :orientation "v" - :valign "fill" - :space-evenly false - :style "background:blue" - (time) - (date))) - -(defwidget bar-end [] - (box - :orientation "v" - :valign "end" - :style "background:red" - :height 400 - :spacing 20 - (volume) - (battery) - (cpu-usage))) - -(defwidget workspaces [] - (box - :class "workspaces" - :orientation "v" - :space-evenly true - :spacing 10 - (button 1) - (button 2) - (button 3) - (button 4) - (button 5) - (button 6))) - -(defwidget date [] - (label :text "today")) - -(defwidget time [] - (label :text "time")) - -(defwidget volume [] - (circular-progress - :orientation "v" - :value 60 - :thickness 5)) - -(defwidget battery [] - (circular-progress - :orientation "v" - :value 60 - :thickness 5)) - -(defwidget cpu-usage [] - (circular-progress - :orientation "v" - :value 60 - :thickness 5)) diff --git a/home/features/desktop/eww/widgets/eww.yuck b/home/features/desktop/eww/widgets/eww.yuck deleted file mode 120000 index 865ce3b..0000000 --- a/home/features/desktop/eww/widgets/eww.yuck +++ /dev/null @@ -1 +0,0 @@ -/nix/store/jfni99vrwsgh0i4i2kjiv953aa0gqp2m-home-manager-files/.config/eww/eww.yuck \ No newline at end of file diff --git a/home/tethys.nix b/home/tethys.nix index 5b1d446..c782195 100644 --- a/home/tethys.nix +++ b/home/tethys.nix @@ -52,6 +52,8 @@ # }}} ]; + programs.lazygit.enable = true; + home.sessionVariables.QT_SCREEN_SCALE_FACTORS = 1.4; # Bigger text in qt apps satellite = {