fixing things i guess

This commit is contained in:
Chris Cochrun 2025-04-08 10:05:00 -05:00
parent 01cce2c99b
commit fce0223ae4
6 changed files with 90 additions and 32 deletions

View file

@ -79,6 +79,23 @@
emacs.overlays.default
# rust-overlay.overlays.default
eww.overlays.default
(final: prev: {
python312 = prev.python312.override {
packageOverrides = final: prev: {
pysaml2 = final.toPythonModule final.emptyDirectory;
};
};
matrix-synapse-unwrapped = prev.matrix-synapse-unwrapped.overrideAttrs (old: {
postPatch = (old.postPatch or "") + ''
substituteInPlace tests/storage/databases/main/test_events_worker.py --replace-fail \
$' def test_recovery(' \
$' from tests.unittest import skip_unless\n'\
$' @skip_unless(False, "broken")\n'\
$' def test_recovery('
'';
});
})
];
};

View file

@ -85,17 +85,17 @@ in {
"audio/opus" = "mpv-slow.desktop";
"audio/x-opus" = "mpv-slow.desktop";
"audio/x-opus+ogg" = "mpv-slow.desktop";
"x-scheme-handler/http" = "org.qutebrowser.qutebrowser.desktop";
"x-scheme-handler/https" = "org.qutebrowser.qutebrowser.desktop";
"text/html" = "org.qutebrowser.qutebrowser.desktop";
"x-scheme-handler/http" = "librewolf.desktop";
"x-scheme-handler/https" = "librewolf.desktop";
"text/html" = "librewolf.desktop";
"text/org" = "emacsclient.desktop";
"text/md" = "emacsclient.desktop";
"text/txt" = "emacsclient.desktop";
"text/rs" = "emacsclient.desktop";
"text/plain" = "emacsclient.desktop";
"application/pdf" = "emacsclient.desktop";
"x-scheme-handler/about" = "org.qutebrowser.qutebrowser.desktop";
"x-scheme-handler/unknown" = "org.qutebrowser.qutebrowser.desktop";
"x-scheme-handler/about" = "librewolf.desktop";
"x-scheme-handler/unknown" = "librewolf.desktop";
"x-scheme-handler/magnet" = "torrent.desktop";
};
defaultApplications = {
@ -124,17 +124,17 @@ in {
"audio/flac" = "mpv-slow.desktop";
"audio/wav" = "mpv-slow.desktop";
"audio/opus" = "mpv-slow.desktop";
"x-scheme-handler/http" = "org.qutebrowser.qutebrowser.desktop";
"x-scheme-handler/https" = "org.qutebrowser.qutebrowser.desktop";
"text/html" = "org.qutebrowser.qutebrowser.desktop";
"x-scheme-handler/http" = "librewolf.desktop";
"x-scheme-handler/https" = "librewolf.desktop";
"text/html" = "librewolf.desktop";
"text/org" = "emacsclient.desktop";
"text/md" = "emacsclient.desktop";
"text/txt" = "emacsclient.desktop";
"text/rs" = "emacsclient.desktop";
"text/plain" = "emacsclient.desktop";
"application/pdf" = "emacsclient.desktop";
"x-scheme-handler/about" = "org.qutebrowser.qutebrowser.desktop";
"x-scheme-handler/unknown" = "org.qutebrowser.qutebrowser.desktop";
"x-scheme-handler/about" = "librewolf.desktop";
"x-scheme-handler/unknown" = "librewolf.desktop";
"x-scheme-handler/magnet" = "torrent.desktop";
};
};
@ -588,14 +588,51 @@ in {
'';
};
home.file.".librewolf/nw77o6yc.default/chrome" = {
source = ../.config/firefox/chrome;
recursive = true;
};
home.file.".librewolf/nw77o6yc.default/user.js" = {
text = ''
// userchrome.css usercontent.css activate
user_pref("toolkit.legacyUserProfileCustomizations.stylesheets", true);
// disable new sidebar
user_pref("sidebar.revamp", false);
// Fill SVG Color
user_pref("svg.context-properties.content.enabled", true);
// CSS's `:has()` selector
user_pref("layout.css.has-selector.enabled", true);
// Integrated calculator at urlbar
user_pref("browser.urlbar.suggest.calculator", true);
// Integrated unit convertor at urlbar
user_pref("browser.urlbar.unitConversion.enabled", true);
// Trim URL
user_pref("browser.urlbar.trimHttps", true);
user_pref("browser.urlbar.trimURLs", true);
// GTK rounded corners
user_pref("widget.gtk.rounded-bottom-corners.enabled", true);
// Who is bogus? (fixes Sidebery tab dragging on Linux)
user_pref("widget.gtk.ignore-bogus-leave-notify", 1);
'';
};
home.file.".config/tridactyl" = {
source = ../.config/tridactyl;
recursive = true;
};
programs.firefox = {
programs.librewolf = {
enable = true;
package = pkgs.firefox-wayland.override {
package = pkgs.librewolf-wayland.override {
nativeMessagingHosts =
[ pkgs.kdePackages.plasma-browser-integration pkgs.tridactyl-native ];
};

View file

@ -260,8 +260,8 @@ in
"SUPER,w,exec,rofi -i -show window"
"SUPER,E,exec,/home/chris/bin/emacslof"
"SUPER,d,exec,emacsclient -c -F '`(name . \"dadired\")' -e '(dired-jump)'"
"SUPER,v,exec,cliphist list | rofi -p '󱃔 ' -dmenu -theme ~/.config/rofi/launchers-git/laptop-rbw-wayland.rasi | cliphist decode | wl-copy"
"SUPER,B,exec,/home/chris/bin/qblof"
"SUPER,v,exec,cliphist list | rofi -p '󱃔 ' -dmenu | cliphist decode | wl-copy"
"SUPER,B,exec,/home/chris/bin/fflof"
"SUPER,A,exec,alacritty --class pulsemixer -e pulsemixer"
"SUPERCTRL,i,exec,alacritty --class btop -e btop"
",Print,exec,screenshot"

View file

@ -1,13 +1,17 @@
{ pkgs, lib, config, inputs, ... }:
{
let
laptop = builtins.readFile "/etc/hostname" == ''
syl
'';
in {
imports = [ ./cachix.nix ];
nix = {
extraOptions = "experimental-features = nix-command flakes";
gc = {
automatic = true;
dates = "weekly";
dates = "Mon 10:00";
options = "--delete-older-than 20d";
};
settings = { auto-optimise-store = true; };
@ -18,9 +22,9 @@
system.autoUpgrade = {
enable = true;
dates = "02:00";
dates = "11:00";
allowReboot = false;
flake = "${config.users.users.chris.home}/conf";
flake = "${config.users.users.chris.home}/${if laptop then ".dotfiles" else "conf"}";
flags = [ "--update-input" "nixpkgs" "--commit-lock-file" ];
};

View file

@ -128,7 +128,7 @@
plasma5Packages.qt5ct
kdePackages.xdg-desktop-portal-kde
lxappearance
spotdl
# spotdl
# rustdesk
kdePackages.kdenlive
# davinci-resolve
@ -154,14 +154,14 @@
sqlite
fennel
kdePackages.plasma-sdk
ardour
# ardour
qpwgraph
zam-plugins
tap-plugins
lsp-plugins
ladspaPlugins
calf
carla
# zam-plugins
# tap-plugins
# lsp-plugins
# ladspaPlugins
# calf
# carla
esphome
esptool
wireguard-tools

View file

@ -2,17 +2,17 @@
export MOZ_ENABLE_WAYLAND=1
echo $MOZ_ENABLE_WAYLAND
# Check to see if firefox is running
if [ $(pgrep -c firefox) -gt 0 ]; then
# Check to see if librewolf is running
if [ $(pgrep -c librewolf) -gt 0 ]; then
echo "ff running"
if [ "$XDG_SESSION_TYPE" = "x11" ]; then
#X11
ffrg=$(wmctrl -lx | rg firefox | awk '{print $1}')
ffrg=$(wmctrl -lx | rg librewolf | awk '{print $1}')
# echo $emacsrg
if [ -z $ffrg ]; then
exec firefox
exec librewolf
exit
else
exec wmctrl -ia $ffrg
@ -21,7 +21,7 @@ if [ $(pgrep -c firefox) -gt 0 ]; then
else
if [ "$KDE_FULL_SESSION" = "true" ]; then
echo "KDE"
exec /home/chris/bin/ww -fa firefox -c librewolf
exec /home/chris/bin/ww -fa librewolf -c librewolf
exit
else
# WAYLAND
@ -35,5 +35,5 @@ if [ $(pgrep -c firefox) -gt 0 ]; then
fi
fi
else
exec firefox --name "lw"
exec librewolf --name "lw"
fi