feat: swayfx fixes
This commit is contained in:
parent
b4cfeb3ebb
commit
02ff41c4fe
7 changed files with 67 additions and 22 deletions
|
@ -52,7 +52,7 @@ in
|
||||||
settings = {
|
settings = {
|
||||||
lat = config.location.latitude;
|
lat = config.location.latitude;
|
||||||
lng = config.location.longitude;
|
lng = config.location.longitude;
|
||||||
useGeoclue = false;
|
usegeoclue = false;
|
||||||
};
|
};
|
||||||
lightModeScripts = {
|
lightModeScripts = {
|
||||||
gtk-theme = ''
|
gtk-theme = ''
|
||||||
|
|
|
@ -68,7 +68,7 @@ in
|
||||||
"ctrl+s>m" = "detach_window ask";
|
"ctrl+s>m" = "detach_window ask";
|
||||||
|
|
||||||
# show index for easier switching, show number of panes
|
# show index for easier switching, show number of panes
|
||||||
"ctrl+s>c" = "new_tab";
|
"ctrl+s>c" = "launch --type=tab --cwd=current";
|
||||||
"ctrl+s>n" = "next_tab";
|
"ctrl+s>n" = "next_tab";
|
||||||
"ctrl+s>p" = "previous_tab";
|
"ctrl+s>p" = "previous_tab";
|
||||||
"ctrl+s>1" = "goto_tab 1";
|
"ctrl+s>1" = "goto_tab 1";
|
||||||
|
@ -80,6 +80,18 @@ in
|
||||||
"ctrl+s>7" = "goto_tab 7";
|
"ctrl+s>7" = "goto_tab 7";
|
||||||
"ctrl+s>8" = "goto_tab 8";
|
"ctrl+s>8" = "goto_tab 8";
|
||||||
"ctrl+s>9" = "goto_tab 9";
|
"ctrl+s>9" = "goto_tab 9";
|
||||||
|
"ctrl+s>0" = "goto_tab -1";
|
||||||
|
|
||||||
|
"super+1" = "goto_tab 1";
|
||||||
|
"super+2" = "goto_tab 2";
|
||||||
|
"super+3" = "goto_tab 3";
|
||||||
|
"super+4" = "goto_tab 4";
|
||||||
|
"super+5" = "goto_tab 5";
|
||||||
|
"super+6" = "goto_tab 6";
|
||||||
|
"super+7" = "goto_tab 7";
|
||||||
|
"super+8" = "goto_tab 8";
|
||||||
|
"super+9" = "goto_tab 9";
|
||||||
|
"super+0" = "goto_tab -1";
|
||||||
|
|
||||||
"alt+enter" = "toggle_fullscreen";
|
"alt+enter" = "toggle_fullscreen";
|
||||||
};
|
};
|
||||||
|
|
|
@ -88,8 +88,9 @@ in
|
||||||
{ command = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1"; }
|
{ command = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1"; }
|
||||||
];
|
];
|
||||||
workspaceAutoBackAndForth = true;
|
workspaceAutoBackAndForth = true;
|
||||||
terminal = "${config.programs.wezterm.package}/bin/wezterm";
|
# TODO: change this back to wezterm whenever it works on sway
|
||||||
menu = "${config.programs.rofi.package}/bin/rofi";
|
terminal = lib.getExe config.programs.kitty.package;
|
||||||
|
menu = lib.getExe config.programs.rofi.package;
|
||||||
defaultWorkspace = "workspace number 1";
|
defaultWorkspace = "workspace number 1";
|
||||||
input."type:keyboard".xkb_options = "ctrl:nocaps,compose:ralt";
|
input."type:keyboard".xkb_options = "ctrl:nocaps,compose:ralt";
|
||||||
output."*" = {
|
output."*" = {
|
||||||
|
@ -103,9 +104,9 @@ in
|
||||||
modFocus = "${mod}+Ctrl";
|
modFocus = "${mod}+Ctrl";
|
||||||
hyper = "Mod4+Mod1+Shift+Ctrl";
|
hyper = "Mod4+Mod1+Shift+Ctrl";
|
||||||
|
|
||||||
filebrowser = "${pkgs.nautilus}/bin/nautilus";
|
filebrowser = lib.getExe pkgs.nautilus;
|
||||||
screenshot = "${pkgs.sway-contrib.grimshot}/bin/grimshot copy area";
|
screenshot = "${lib.getExe pkgs.sway-contrib.grimshot} copy area";
|
||||||
playerctl = "${pkgs.playerctl}/bin/playerctl";
|
playerctl = lib.getExe pkgs.playerctl;
|
||||||
swayosd = pkgs.swayosd + "/bin/swayosd-client";
|
swayosd = pkgs.swayosd + "/bin/swayosd-client";
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
./cosmic.nix
|
./cosmic.nix
|
||||||
./gnome.nix
|
./gnome.nix
|
||||||
./greeter.nix
|
./greeter.nix
|
||||||
|
./hyprland.nix
|
||||||
./input.nix
|
./input.nix
|
||||||
./network.nix
|
./network.nix
|
||||||
./podman.nix
|
./podman.nix
|
||||||
|
|
|
@ -4,18 +4,42 @@
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
|
let
|
||||||
|
condition = (
|
||||||
|
builtins.elem config.dotfiles.desktop [
|
||||||
|
"hyprland"
|
||||||
|
"sway"
|
||||||
|
]
|
||||||
|
);
|
||||||
|
in
|
||||||
{
|
{
|
||||||
config = lib.mkIf (config.dotfiles.desktop == "sway") {
|
config = lib.mkIf condition {
|
||||||
services.greetd = {
|
programs.regreet = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings.default_session = {
|
settings = {
|
||||||
command = lib.concatStringsSep " " [
|
background = {
|
||||||
"${pkgs.greetd.tuigreet}/bin/tuigreet"
|
path = ../../../home/wallpapers/dhm_1610.png;
|
||||||
"--remember"
|
fit = "Cover";
|
||||||
"--remember-user-session"
|
};
|
||||||
"--sessions=${config.programs.sway.package}/share/wayland-sessions:${config.programs.hyprland.package}/share/wayland-sessions"
|
GTK = {
|
||||||
];
|
cursor_theme_name = "macOS-Monterey";
|
||||||
user = "greeter";
|
font_name = "IBM Plex Sans 16";
|
||||||
|
icon_theme_name = "WhiteSur";
|
||||||
|
theme_name = "WhiteSur-Dark";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
font.name = "IBM Plex Sans";
|
||||||
|
cursorTheme = {
|
||||||
|
name = "macOS-Monterey";
|
||||||
|
package = pkgs.apple-cursor;
|
||||||
|
};
|
||||||
|
iconTheme = {
|
||||||
|
name = "WhiteSur-Dark";
|
||||||
|
package = pkgs.whitesur-icon-theme;
|
||||||
|
};
|
||||||
|
theme = {
|
||||||
|
name = "WhiteSur-Dark";
|
||||||
|
package = pkgs.whitesur-gtk-theme;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
8
machines/common/linux/hyprland.nix
Normal file
8
machines/common/linux/hyprland.nix
Normal file
|
@ -0,0 +1,8 @@
|
||||||
|
{ config, lib, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
config = lib.mkIf (config.dotfiles.desktop == "hyprland") {
|
||||||
|
programs.hyprland.enable = true;
|
||||||
|
services.hypridle.enable = true;
|
||||||
|
};
|
||||||
|
}
|
|
@ -26,8 +26,6 @@
|
||||||
environment.pathsToLink = [ "/share/nautilus-python/extensions" ];
|
environment.pathsToLink = [ "/share/nautilus-python/extensions" ];
|
||||||
environment.sessionVariables.NAUTILUS_4_EXTENSION_DIR = "${config.system.path}/lib/nautilus/extensions-4";
|
environment.sessionVariables.NAUTILUS_4_EXTENSION_DIR = "${config.system.path}/lib/nautilus/extensions-4";
|
||||||
|
|
||||||
programs.hyprland.enable = true;
|
|
||||||
|
|
||||||
programs.sway = {
|
programs.sway = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.swayfx;
|
package = pkgs.swayfx;
|
||||||
|
@ -56,16 +54,17 @@
|
||||||
services.dbus.packages = with pkgs; [
|
services.dbus.packages = with pkgs; [
|
||||||
darkman
|
darkman
|
||||||
nautilus-open-any-terminal
|
nautilus-open-any-terminal
|
||||||
# gcr needed for gnome3 pinentry, managed in Home-Manager
|
|
||||||
gcr
|
|
||||||
];
|
];
|
||||||
xdg.portal = {
|
xdg.portal = {
|
||||||
enable = true;
|
enable = true;
|
||||||
wlr.enable = true;
|
config.sway = {
|
||||||
|
"org.freedesktop.impl.portal.Settings" = [ "darkman" ];
|
||||||
|
};
|
||||||
extraPortals = with pkgs; [
|
extraPortals = with pkgs; [
|
||||||
darkman
|
darkman
|
||||||
xdg-desktop-portal-gtk
|
xdg-desktop-portal-gtk
|
||||||
];
|
];
|
||||||
|
wlr.enable = true;
|
||||||
xdgOpenUsePortal = true;
|
xdgOpenUsePortal = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue