diff --git a/alacritty/alacritty.yml b/alacritty/alacritty.yml index ba88c99..5dd0003 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/modules/desktop.nix b/modules/desktop.nix index 9d98e0e..b50836b 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -73,11 +73,11 @@ with lib; enable = true; settings = rec { initial_session = { - command = "hyprland"; + command = "dbus-run-session startplasma-wayland"; user = "chris"; }; default_session = { - command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time -r --window-padding 2 --cmd 'hyprland' -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/pkgs/base-packages.nix b/pkgs/base-packages.nix index d1dce9a..ef5c290 100644 --- a/pkgs/base-packages.nix +++ b/pkgs/base-packages.nix @@ -26,7 +26,7 @@ ripgrep fd socat - ffmpeg-full + ffmpeg_5-full imagemagick libheif trash-cli diff --git a/pkgs/desktop-packages.nix b/pkgs/desktop-packages.nix index 1ec0086..94ab77e 100644 --- a/pkgs/desktop-packages.nix +++ b/pkgs/desktop-packages.nix @@ -26,7 +26,7 @@ with lib; plasma5Packages.kwallet sierra-breeze-enhanced libimobiledevice - bottles + # bottles # jitsi-meet-electron imv feh @@ -90,7 +90,7 @@ with lib; wmctrl xcape xclip - maim + # maim unclutter-xfixes bluez-tools networkmanager_dmenu @@ -122,7 +122,7 @@ with lib; (callPackage ../ydotool { }) # (libsForQt5.callPackage /home/chris/dev/LightlyShaders {}) # LightlyShaders # (libsForQt5.callPackage /home/chris/.dotfiles/RoundedSBE {}) - (libsForQt5.callPackage /home/chris/dev/church-presenter {}) # librepresenter + # (libsForQt5.callPackage /home/chris/dev/church-presenter {}) # librepresenter nix-index sqlite fennel