bascht
/
dotfiles
1
0
Fork 0
Code Issues 5 Pull Requests 1 Actions Packages Projects 1 Releases Activity

[sway] Revert back to plain ol stable 22.11 with proper GL

This commit is contained in:
Sebastian Schulze 2023-04-17 17:08:20 +02:00
parent 4b674f1346
commit ec36b7b4dc
Signed by: bascht
GPG Key ID: 5BCB1D3B4D38A35A
3 changed files with 58 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bin/executable_autostart
View File

@ -5,6 +5,9 @@ systemctl --user import-environment WAYLAND_DISPLAY DISPLAY PATH
systemctl --user start gnome-keyring.service
systemctl --user start graphical-session.target
dbus-sway-environment
configure-gtk
swaymsg workspace "4 "
swaymsg exec -- "emacsclient --create-frame -e '(org-agenda-list)'"
sleep 0.5

71
dot_config/nixpkgs/home.nix
View File

@ -2,6 +2,38 @@
{ config, lib, pkgs, systemd, inputs, services, ... }:
let
unstable = import <nixpkgs-unstable> { config = { allowUnfree = true; }; };
# Via https://nixos.wiki/wiki/Sway
dbus-sway-environment = pkgs.writeTextFile {
name = "dbus-sway-environment";
destination = "/bin/dbus-sway-environment";
executable = true;
text = ''
dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway
systemctl --user stop pipewire pipewire-media-session xdg-desktop-portal xdg-desktop-portal-wlr
systemctl --user start pipewire pipewire-media-session xdg-desktop-portal xdg-desktop-portal-wlr
'';
};
#
# currently, there is some friction between sway and gtk:
# https://github.com/swaywm/sway/wiki/GTK-3-settings-on-Wayland
# the suggested way to set gtk settings is with gsettings
# for gsettings to work, we need to tell it where the schemas are
# using the XDG_DATA_DIR environment variable
# run at the end of sway config
configure-gtk = pkgs.writeTextFile {
name = "configure-gtk";
destination = "/bin/configure-gtk";
executable = true;
text = let
schema = pkgs.gsettings-desktop-schemas;
datadir = "${schema}/share/gsettings-schemas/${schema.name}";
in ''
export XDG_DATA_DIRS=${datadir}:$XDG_DATA_DIRS
gnome_schema=org.gnome.desktop.interface
gsettings set $gnome_schema gtk-theme 'Dracula'
'';
};
in
{
programs.home-manager.enable = true;
@ -57,13 +89,15 @@ in
};
home.packages = [
dbus-sway-environment
configure-gtk
pkgs.btop
pkgs.android-tools
pkgs.vale
pkgs.kubectx
unstable.pkgs.openscad
unstable.pkgs.freecad
unstable.pkgs.cura
pkgs.openscad
pkgs.freecad
pkgs.cura
pkgs.blender
pkgs.envsubst
pkgs.wpa_supplicant_gui
@ -71,7 +105,9 @@ in
pkgs.vulkan-validation-layers
pkgs.darktable
pkgs.foot
unstable.pkgs.qutebrowser-qt6
pkgs.mesa
pkgs.mesa_drivers
pkgs.qutebrowser
pkgs.delta
pkgs.any-nix-shell
pkgs.socat
@ -142,8 +178,8 @@ in
pkgs.brightnessctl
pkgs.capitaine-cursors
pkgs.chezmoi
unstable.pkgs.chromium
unstable.pkgs.openarena
pkgs.chromium
pkgs.openarena
pkgs.clipman
pkgs.cmake
pkgs.dmenu
@ -210,10 +246,10 @@ in
pkgs.libvterm
pkgs.lsof
pkgs.lxappearance
unstable.pkgs.mako # notification daemon
pkgs.mako # notification daemon
pkgs.material-design-icons
pkgs.mpc_cli
unstable.pkgs.mpv
pkgs.mpv
pkgs.ffmpeg-full
pkgs.msmtp
pkgs.mtr
@ -253,7 +289,7 @@ in
pkgs.upower
pkgs.weather-icons
unstable.pkgs.wf-recorder
pkgs.wl-clipboard
unstable.pkgs.wl-clipboard
pkgs.python38Packages.youtube-dl
pkgs.python38Packages.pip
pkgs.python38Packages.setuptools
@ -263,7 +299,7 @@ in
pkgs.xfce.thunar
pkgs.xfce.thunar
pkgs.xfce.thunar-volman
unstable.pkgs.xwayland
pkgs.xwayland
pkgs.yubikey-manager
pkgs.yubikey-personalization
pkgs.zathura
@ -297,19 +333,9 @@ in
'';
};
programs.atuin = {
package = unstable.pkgs.atuin;
programs.fzf = {
enable = true;
enableBashIntegration = true;
# flags = ["--disable-up-arrow"]; # does not yet work in 22.11
settings = {
auto_sync = false;
update_check = false;
dialect = "uk";
style = "compact";
# inline_height = 10;
show_preview = true;
};
};
programs.fish.package = pkgs.fish;
@ -418,6 +444,9 @@ in
enable = true;
enableFishIntegration = true;
};
nixpkgs.config.allowUnfree = true;
nixpkgs.config.chromium.commandLineArgs = "--enable-features=UseOzonePlatform --ozone-platform=wayland";
programs.vscode = {
enable = true;
package = pkgs.vscode;

9
dot_config/private_qutebrowser/config.py
View File

@ -22,8 +22,9 @@ c.prompt.filebrowser = False
c.completion.height = "40%"
c.downloads.location.directory = '/home/bascht/Downloads/'
c.qt.args = ['ignore-gpu-blocklist', '--enable-zero-copy', '--enable-features=VaapiVideoDecoder', '--use-gl=egl', 'enable-accelerated-video-decode', 'enable-gpu-rasterization']
c.qt.args = ['ignore-gpu-blocklist', 'untrusted-args', 'enable-zero-copy', 'enable-features=VaapiVideoEncoder,VaapiVideoDecoder,CanvasOopRasterization,RawDraw,WebGPU', 'use-gl=egl', 'enable-accelerated-video-decode', 'enable-gpu-rasterization', 'disable-gpu-driver-bug-workarounds']
#c.qt.args = ['untrusted-args','enable-features=VaapiVideoDecoder']
c.content.webgl = False
c.content.autoplay = False
c.content.geolocation = False
@ -65,7 +66,7 @@ config.bind(',su', 'spawn -u send-url')
config.bind(',sp', 'spawn -u send-url baschtfon')
config.bind(',aw', 'set content.webgl true')
config.bind(',ac', 'set content.javascript.clipboard access')
config.bind(',ac', 'set content.javascript.can_access_clipboard true')
config.bind(',b', 'open https://read.yakshed.org/bookmarklet?url={url}')
config.bind(',y', 'open https://social.yakshed.org/authorize_interaction?uri={url}')
@ -89,12 +90,12 @@ config.bind('ygm', 'spawn get-gitlab-shortcode-as-markdown {url}')
# per Domain settings
## WebGL
for domain in ['www.windy.com', "experience.arcgis.com", "figma.com"]:
for domain in ['www.windy.com', "experience.arcgis.com", "www.figma.com", "figma.com"]:
config.set('content.webgl', True, domain)
## JS Clipboard Access
for domain in ['wordle.at', 'https://www.nytimes.com/games/wordle/index.html']:
config.set('content.javascript.clipboard', "access", domain)
config.set('content.javascript.can_access_clipboard', True, domain)
# base16-qutebrowser (https://github.com/theova/base16-qutebrowser)
# Base16 qutebrowser template by theova and Daniel Mulford