From e465dc07c75315104353af5c23343a77e2d17d1c Mon Sep 17 00:00:00 2001 From: Minijackson Date: Sun, 26 Jun 2022 12:56:30 +0200 Subject: desktop/sway: use user-installed rofi, add modis --- usecases/desktop/graphical/sway.nix | 50 +++++++++++++++++++------------------ 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/usecases/desktop/graphical/sway.nix b/usecases/desktop/graphical/sway.nix index 73e9aa4..4e15552 100644 --- a/usecases/desktop/graphical/sway.nix +++ b/usecases/desktop/graphical/sway.nix @@ -1,16 +1,18 @@ -inputs: - -{ config, lib, pkgs, system, ... }: -let +_inputs: { + config, + lib, + pkgs, + system, + ... +}: let globalConfig = config; -in -{ +in { services.greetd = { enable = true; settings.default_session.command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd sway"; }; - home-manager.users.minijackson = { config, ... }: { + home-manager.users.minijackson = {config, ...}: { wayland.windowManager.sway = { enable = true; @@ -35,7 +37,7 @@ in config = { # Using waybar - bars = [ ]; + bars = []; colors = with globalConfig.theme.colors; { focused = { @@ -80,7 +82,7 @@ in }; floating.criteria = [ - { title = "Steam - News"; } + {title = "Steam - News";} ]; input = { @@ -104,7 +106,6 @@ in xkb_numlock = "enabled"; }; - "1133:49948:Logitech_USB_Keyboard" = { xkb_layout = "fr"; xkb_variant = "oss"; @@ -118,10 +119,9 @@ in }; }; - keybindings = - let - modifier = config.wayland.windowManager.sway.config.modifier; - in + keybindings = let + modifier = config.wayland.windowManager.sway.config.modifier; + in lib.mkOptionDefault { "${modifier}+ampersand" = "workspace 1"; "${modifier}+eacute" = "workspace 2"; @@ -153,22 +153,24 @@ in }; menu = '' - ${pkgs.rofi}/bin/rofi -show drun -terminal ${pkgs.alacritty}/bin/alacritty + rofi -show drun -terminal alacritty -modi "drun,run,filebrowser,emoji" ''; modifier = "Mod4"; - output."*".bg = - "${../../../res/wallpapers/wallpaper-1920x1080-kernel-card-black.png} fill"; + output."*".bg = "${../../../res/wallpapers/wallpaper-1920x1080-kernel-card-black.png} fill"; startup = [ - { command = "${pkgs.mako}/bin/mako"; always = true; } + { + command = "${pkgs.mako}/bin/mako"; + always = true; + } { command = "\"systemctl --user import-environment ${ builtins.toString (lib.unique config.xsession.importedVariables) }; systemctl --user start sway-session.target\""; } - { command = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1"; } + {command = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";} ]; terminal = "${pkgs.alacritty}/bin/alacritty"; @@ -248,10 +250,10 @@ in systemd.user.targets.sway-session = { Unit = { Description = "sway compositor session"; - Documentation = [ "man:systemd.special(7)" ]; - BindsTo = [ "graphical-session.target" ]; - Wants = [ "graphical-session-pre.target" ]; - After = [ "graphical-session-pre.target" ]; + Documentation = ["man:systemd.special(7)"]; + BindsTo = ["graphical-session.target"]; + Wants = ["graphical-session-pre.target"]; + After = ["graphical-session-pre.target"]; }; }; }; @@ -266,7 +268,7 @@ in ]; programs.xwayland.enable = true; - security.pam.services.swaylock = { }; + security.pam.services.swaylock = {}; xdg.portal.extraPortals = with pkgs; [ unstable.xdg-desktop-portal-wlr -- cgit v1.2.3