diff --git a/.config/eww/battery.yuck b/.config/eww/battery.yuck index 38d3074..a83913a 100644 --- a/.config/eww/battery.yuck +++ b/.config/eww/battery.yuck @@ -21,7 +21,7 @@ :spacing 5 (button :class "battery-icon" - :onclick "" "") + :onclick "" "󰂂") (box :orientation "v" :space-evenly "false" diff --git a/.config/eww/eww.scss b/.config/eww/eww.scss index 4651710..0ddb5f4 100644 --- a/.config/eww/eww.scss +++ b/.config/eww/eww.scss @@ -108,7 +108,8 @@ tooltip label { .separ { font-size: 5; - padding-bottom: 3px; + padding-bottom: 0px; + padding-top: 1px; } .membar { @@ -138,6 +139,7 @@ tooltip label { .bright_label { color: $base09; + padding-top: 3px; } .bright_icon { @@ -164,6 +166,7 @@ tooltip label { .vol_label { color: $base08; + padding-top: 3px; } .volume_icon { @@ -218,12 +221,16 @@ tooltip label { } .mem_label { color: $base0A; + padding-top: 3px; } .cpu_label { color: $base0D; + padding-top: 3px; } .bat_label { color: $base0E; + padding-top: 3px; + padding-left: 3px; } .bright_icon { font-size: 18; @@ -233,6 +240,7 @@ tooltip label { .disk_label { color: $base09; + padding-top: 3px; } .icondisk { diff --git a/home/home.nix b/home/home.nix index 1a6d2ea..c8bbc5b 100644 --- a/home/home.nix +++ b/home/home.nix @@ -32,7 +32,7 @@ xdg.userDirs.videos = "${config.home.homeDirectory}/vids"; accounts.email = { - maildirBasePath = "$HOME/mail"; + maildirBasePath = "mail"; accounts = { personal = { address = "chris@cochrun.xyz"; @@ -70,13 +70,14 @@ }; maildir.path = "cochrun"; }; + work = { address = "chris@tfcconnection.org"; userName = "chris@tfcconnection.org"; mbsync.enable = true; mu.enable = true; flavor = "outlook.office365.com"; - passwordCommand = "${pkgs.rbw}/bin/rbw get --full 'Office 365' | ${pkgs.ripgrep}/bin/rg 'sylemail' | ${pkgs.gawk}/bin/awk '{print $2}'"; + passwordCommand = "/home/chris/.dotfiles/scripts/mailpass"; realName = "Chris Cochrun"; imap = { host = "outlook.office365.com"; diff --git a/home/modules/hyprland.nix b/home/modules/hyprland.nix index 85c9b2e..02db31f 100644 --- a/home/modules/hyprland.nix +++ b/home/modules/hyprland.nix @@ -1,11 +1,14 @@ { config, lib, pkgs, ... }: +let + laptop = builtins.readFile "/etc/hostname" == "syl\n"; +in { home.file.".config/hypr/hyprpaper.conf" = { - source = if builtins.readFile "/etc/hostname" == "syl\n" then /home/chris/.dotfiles/.config/hypr/hyprpaper.conf else /home/chris/.dotfiles/.config/hypr/hyprpaper.conf; + source = if laptop then /home/chris/.dotfiles/.config/hypr/hyprpaper.conf else /home/chris/.dotfiles/.config/hypr/hyprpaper.conf; }; home.file.".config/hypr/hyprsome" = { - source = if builtins.readFile "/etc/hostname" == "syl\n" then /home/chris/.dotfiles/.config/hypr/hyprsome else /home/chris/.dotfiles/.config/hypr/hyprsome; + source = if laptop then /home/chris/.dotfiles/.config/hypr/hyprsome else /home/chris/.dotfiles/.config/hypr/hyprsome; }; home.file.".config/hypr/hyprland.conf" = { @@ -116,22 +119,22 @@ windowrule=opaque,firefox windowrule=float,dolphin windowrule=size 60% 60%,dolphin - ${if builtins.readFile "/etc/hostname" == "syl\n" then "# this is a kaladin space" else "windowrule=workspace 1,mpv"} + ${if laptop then "# this is a kaladin space" else "windowrule=workspace 1,mpv"} windowrule=float,mpv - windowrule=size ${if builtins.readFile "/etc/hostname" == "syl\n" then "90% 76%" else "85% 85%"},mpv + windowrule=size ${if laptop then "90% 76%" else "85% 85%"},mpv windowrule=center,mpv windowrule=opaque,mpv # windowrule=pin,mpv windowrule=float,pulsemixer - windowrule=workspace ${if builtins.readFile "/etc/hostname" == "syl\n" then "2" else "1"},firefox - windowrule=workspace ${if builtins.readFile "/etc/hostname" == "syl\n" then "1" else "2"},emacs + windowrule=workspace ${if laptop then "2" else "1"},firefox + windowrule=workspace ${if laptop then "1" else "2"},emacs windowrule=float,btop windowrule=size 70% 70%,btop windowrule=center,btop windowrule=float,presenter windowrule=size 80% 80%,presenter windowrule=center,presenter - windowrule=workspace ${if builtins.readFile "/etc/hostname" == "syl\n" then "1" else "3"},title:presentation-window + windowrule=workspace ${if laptop then "1" else "3"},title:presentation-window # example binds bind = SUPER,RETURN,exec,alacritty @@ -140,7 +143,7 @@ bind = SUPERSHIFT,D,exec,dolphin bind = SUPERSHIFT,F,togglefloating, bindr = SUPER,Super_L,exec,/home/chris/bin/launcher.sh - bindr = ALT,Alt_L,exec,/home/chris/bin/window.sh + bindr = ALT,Alt_R,exec,/home/chris/bin/window.sh bind = SUPER,w,exec,/home/chris/bin/window.sh bind = SUPER,E,exec,/home/chris/bin/emacslof bind = SUPER,d,exec,emacsclient -c -e '(dired-jump)' diff --git a/modules/emacs.nix b/modules/emacs.nix index e70db16..55f2c45 100644 --- a/modules/emacs.nix +++ b/modules/emacs.nix @@ -46,6 +46,7 @@ with lib; org-re-reveal org-re-reveal-ref org-re-reveal-citeproc + org-web-tools ox-reveal ox-hugo oer-reveal @@ -120,6 +121,7 @@ with lib; nov elfeed elfeed-org + elfeed-protocol bongo emms transmission diff --git a/scripts/mailpass b/scripts/mailpass new file mode 100755 index 0000000..f3df48e --- /dev/null +++ b/scripts/mailpass @@ -0,0 +1,3 @@ +#!/bin/sh + +rbw get --full 'Office 365' | rg 'sylemail' | awk '{print $2}' \ No newline at end of file diff --git a/systems/syl/configuration.nix b/systems/syl/configuration.nix index 6d1d4a2..65e0c56 100644 --- a/systems/syl/configuration.nix +++ b/systems/syl/configuration.nix @@ -45,7 +45,7 @@ # Enable fingerprint services.fprintd.enable = true; - # Some other things + # Power settings services.thermald.enable = true; services.power-profiles-daemon.enable = false; services.tlp = { @@ -62,9 +62,14 @@ START_CHARGE_THRESH_BAT1=70; STOP_CHARGE_THRESH_BAT1=80; USB_ALLOWLIST="32ac:0002"; + RUNTIME_PM_ON_AC="on"; + RUNTIME_PM_ON_BAT="auto"; }; }; +# SUBSYSTEM=="power_supply", ATTR{online}=="0", RUN+="/usr/bin/at -M -f /lib/udev/power-profiles/power-saver now" +# SUBSYSTEM=="power_supply", ATTR{online}=="1", RUN+="/usr/bin/at -M -f /lib/udev/power-profiles/performance now" + # Enable touchpad support (enabled default in most desktopManager). services.xserver.libinput.enable = true; services.xserver.dpi = 144;