diff --git a/alacritty/alacritty.yml b/alacritty/alacritty.yml index 3b40ad7..e6d8247 100644 --- a/alacritty/alacritty.yml +++ b/alacritty/alacritty.yml @@ -357,7 +357,7 @@ colors: # - (Linux/BSD) user login shell # - (Windows) powershell shell: - program: bash + program: fish # args: # - --login diff --git a/awesome/init.fnl b/awesome/init.fnl index 87abb0d..1b707ea 100644 --- a/awesome/init.fnl +++ b/awesome/init.fnl @@ -703,8 +703,8 @@ (awful.placement.no_offscreen c)) ;; 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") (awful.placement.centered c)) (when (= c.class "imv") (awful.placement.centered c)) (when (= c.class "Sxiv") (awful.placement.centered c)) (when (= c.class "Libre Presenter") (awful.placement.centered c)) diff --git a/modules/desktop.nix b/modules/desktop.nix index 11cdb7c..6e4ae34 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -31,10 +31,10 @@ with lib; services.xserver = { enable = true; autorun = false; - # windowManager.awesome = { - # enable = true; - # package = pkgs.awesome; - # }; + windowManager.awesome = { + enable = true; + package = pkgs.awesome; + }; displayManager = { startx.enable = true; sddm = { @@ -77,7 +77,7 @@ with lib; user = "chris"; }; 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"; }; plasma_session = { diff --git a/modules/emacs.nix b/modules/emacs.nix index 6c1c8aa..7ee23e1 100644 --- a/modules/emacs.nix +++ b/modules/emacs.nix @@ -4,7 +4,7 @@ with lib; { services.emacs = { enable = true; - package = with pkgs; ((emacsPackagesFor emacsPgtk).emacsWithPackages + package = with pkgs; ((emacsPackagesFor emacsNativeComp).emacsWithPackages (epkgs: with epkgs; [ vterm magit diff --git a/user/home.nix b/user/home.nix index 0c210b0..4320839 100644 --- a/user/home.nix +++ b/user/home.nix @@ -83,7 +83,7 @@ IMAPAccount office Host outlook.office365.com 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 SSLType IMAPS