diff --git a/profiles/xdg/default.nix b/profiles/xdg/default.nix index 4a8f40b..523cb2a 100644 --- a/profiles/xdg/default.nix +++ b/profiles/xdg/default.nix @@ -6,7 +6,7 @@ services.pipewire.enable = true; environment.sessionVariables = { MOZ_ENABLE_WAYLAND = "1"; - XDG_CURRENT_DESKTOP = "sway"; # https://github.com/emersion/xdg-desktop-portal-wlr/issues/20 - XDG_SESSION_TYPE = "wayland"; # https://github.com/emersion/xdg-desktop-portal-wlr/pull/11 + #XDG_CURRENT_DESKTOP = "sway"; # https://github.com/emersion/xdg-desktop-portal-wlr/issues/20 + #XDG_SESSION_TYPE = "wayland"; # https://github.com/emersion/xdg-desktop-portal-wlr/pull/11 }; } diff --git a/users/profiles/qutebrowser/default.nix b/users/profiles/qutebrowser/default.nix index 7980927..0fe7688 100644 --- a/users/profiles/qutebrowser/default.nix +++ b/users/profiles/qutebrowser/default.nix @@ -1,5 +1,19 @@ { programs.qutebrowser = { enable = true; + keyBindings = { + normal = { + "" = "spawn mpv {url}"; + ",l" = ''config-cycle spellcheck.languages ["it-IT"] ["en-US"]''; + }; + }; + settings = { + editor.command = [ + "emacsclient" + "+{line}:{column}" + "{file}" + "-c" + ]; + }; }; } diff --git a/users/profiles/sway/default.nix b/users/profiles/sway/default.nix index aa10dab..43097c8 100644 --- a/users/profiles/sway/default.nix +++ b/users/profiles/sway/default.nix @@ -59,7 +59,7 @@ in lib.mkOptionDefault { "${modifier}+x" = "exec emacsclient -c"; - "${modifier}+b" = "exec firefox"; + "${modifier}+b" = "exec qutebrowser"; "${modifier}+s" = "exec ${screenshotScript}"; "XF86MonBrightnessUp" = "exec ${pkgs.brightnessctl}/bin/brightnessctl s +5%"; "XF86MonBrightnessDown" = "exec ${pkgs.brightnessctl}/bin/brightnessctl s 5%-"; diff --git a/users/profiles/zsh/default.nix b/users/profiles/zsh/default.nix index f541ff4..f4e946c 100644 --- a/users/profiles/zsh/default.nix +++ b/users/profiles/zsh/default.nix @@ -41,7 +41,8 @@ "pass-clone" = "[ -d .password-store ] && echo 'Password store archive already exists' || git clone git@git.sr.ht:~zrsk/pass ~/.password-store"; "getpass" = "pass show $(find .password-store/ -name \"*.gpg\" | sed \"s/\\.password-store\\/\\(.*\\)\\.gpg$/\\1/g\" | fzf) | wl-copy; ((sleep 60 && wl-copy --clear) &)"; "cat" = "bat"; - "em" = "emacsclient -c"; + "em" = "[[ -z \$XDG_CURRENT_DESKTOP ]] && emacsclient -c -nw || emacsclient -c"; + "emw" = "emacsclient -c"; "emnw" = "emacsclient -c -nw"; }; localVariables = { @@ -49,7 +50,7 @@ SPACESHIP_TIME_SHOW = "true"; SPACESHIP_USER_SHOW = "always"; SPACESHIP_HOST_SHOW = "always"; - EDITOR = "vim"; + EDITOR = "em"; NIX_BUILD_SHELL = "${pkgs.zsh-nix-shell}/scripts/buildShellShim.zsh"; PROMPT = "\\\${IN_NIX_SHELL:+[nix-shell] }$PROMPT"; };