Merge remote-tracking branch 'origin/master'

This commit is contained in:
Chris Cochrun 2023-01-31 16:51:25 -06:00
commit 2e8b8b98a2
5 changed files with 9 additions and 9 deletions

View file

@ -357,7 +357,7 @@ colors:
# - (Linux/BSD) user login shell # - (Linux/BSD) user login shell
# - (Windows) powershell # - (Windows) powershell
shell: shell:
program: bash program: fish
# args: # args:
# - --login # - --login

View file

@ -703,8 +703,8 @@
(awful.placement.no_offscreen c)) (awful.placement.no_offscreen c))
;; MPV wasn't centering right ;; MPV wasn't centering right
(when (= c.class "mpv") (awful.placement.centered c))
(when (= c.class "mpv") (set c.height (dpi 900))) (when (= c.class "mpv") (set c.height (dpi 900)))
(when (= c.class "mpv") (awful.placement.centered c))
(when (= c.class "imv") (awful.placement.centered c)) (when (= c.class "imv") (awful.placement.centered c))
(when (= c.class "Sxiv") (awful.placement.centered c)) (when (= c.class "Sxiv") (awful.placement.centered c))
(when (= c.class "Libre Presenter") (awful.placement.centered c)) (when (= c.class "Libre Presenter") (awful.placement.centered c))

View file

@ -31,10 +31,10 @@ with lib;
services.xserver = { services.xserver = {
enable = true; enable = true;
autorun = false; autorun = false;
# windowManager.awesome = { windowManager.awesome = {
# enable = true; enable = true;
# package = pkgs.awesome; package = pkgs.awesome;
# }; };
displayManager = { displayManager = {
startx.enable = true; startx.enable = true;
sddm = { sddm = {
@ -77,7 +77,7 @@ with lib;
user = "chris"; user = "chris";
}; };
default_session = { default_session = {
command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time -r --window-padding 2 --cmd dbus-run-session startplasma-wayland -s /etc/greetd/environments"; command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time -r --window-padding 2 --cmd 'dbus-run-session startplasma-wayland' -s /etc/greetd/environments";
user = "greeter"; user = "greeter";
}; };
plasma_session = { plasma_session = {

View file

@ -4,7 +4,7 @@ with lib;
{ {
services.emacs = { services.emacs = {
enable = true; enable = true;
package = with pkgs; ((emacsPackagesFor emacsPgtk).emacsWithPackages package = with pkgs; ((emacsPackagesFor emacsNativeComp).emacsWithPackages
(epkgs: with epkgs; [ (epkgs: with epkgs; [
vterm vterm
magit magit

View file

@ -83,7 +83,7 @@
IMAPAccount office IMAPAccount office
Host outlook.office365.com Host outlook.office365.com
User chris@tfcconnection.org User chris@tfcconnection.org
PassCmd "rbw get --full 'Office 365' | rg mbsync | awk '{print $3}'" PassCmd "rbw get --full 'Office 365' | rg 'mbsync pass' | awk '{print $3}'"
AuthMechs LOGIN AuthMechs LOGIN
SSLType IMAPS SSLType IMAPS