fixing things i guess
This commit is contained in:
parent
01cce2c99b
commit
fce0223ae4
17
flake.nix
17
flake.nix
|
@ -79,6 +79,23 @@
|
||||||
emacs.overlays.default
|
emacs.overlays.default
|
||||||
# rust-overlay.overlays.default
|
# rust-overlay.overlays.default
|
||||||
eww.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('
|
||||||
|
'';
|
||||||
|
});
|
||||||
|
})
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -85,17 +85,17 @@ in {
|
||||||
"audio/opus" = "mpv-slow.desktop";
|
"audio/opus" = "mpv-slow.desktop";
|
||||||
"audio/x-opus" = "mpv-slow.desktop";
|
"audio/x-opus" = "mpv-slow.desktop";
|
||||||
"audio/x-opus+ogg" = "mpv-slow.desktop";
|
"audio/x-opus+ogg" = "mpv-slow.desktop";
|
||||||
"x-scheme-handler/http" = "org.qutebrowser.qutebrowser.desktop";
|
"x-scheme-handler/http" = "librewolf.desktop";
|
||||||
"x-scheme-handler/https" = "org.qutebrowser.qutebrowser.desktop";
|
"x-scheme-handler/https" = "librewolf.desktop";
|
||||||
"text/html" = "org.qutebrowser.qutebrowser.desktop";
|
"text/html" = "librewolf.desktop";
|
||||||
"text/org" = "emacsclient.desktop";
|
"text/org" = "emacsclient.desktop";
|
||||||
"text/md" = "emacsclient.desktop";
|
"text/md" = "emacsclient.desktop";
|
||||||
"text/txt" = "emacsclient.desktop";
|
"text/txt" = "emacsclient.desktop";
|
||||||
"text/rs" = "emacsclient.desktop";
|
"text/rs" = "emacsclient.desktop";
|
||||||
"text/plain" = "emacsclient.desktop";
|
"text/plain" = "emacsclient.desktop";
|
||||||
"application/pdf" = "emacsclient.desktop";
|
"application/pdf" = "emacsclient.desktop";
|
||||||
"x-scheme-handler/about" = "org.qutebrowser.qutebrowser.desktop";
|
"x-scheme-handler/about" = "librewolf.desktop";
|
||||||
"x-scheme-handler/unknown" = "org.qutebrowser.qutebrowser.desktop";
|
"x-scheme-handler/unknown" = "librewolf.desktop";
|
||||||
"x-scheme-handler/magnet" = "torrent.desktop";
|
"x-scheme-handler/magnet" = "torrent.desktop";
|
||||||
};
|
};
|
||||||
defaultApplications = {
|
defaultApplications = {
|
||||||
|
@ -124,17 +124,17 @@ in {
|
||||||
"audio/flac" = "mpv-slow.desktop";
|
"audio/flac" = "mpv-slow.desktop";
|
||||||
"audio/wav" = "mpv-slow.desktop";
|
"audio/wav" = "mpv-slow.desktop";
|
||||||
"audio/opus" = "mpv-slow.desktop";
|
"audio/opus" = "mpv-slow.desktop";
|
||||||
"x-scheme-handler/http" = "org.qutebrowser.qutebrowser.desktop";
|
"x-scheme-handler/http" = "librewolf.desktop";
|
||||||
"x-scheme-handler/https" = "org.qutebrowser.qutebrowser.desktop";
|
"x-scheme-handler/https" = "librewolf.desktop";
|
||||||
"text/html" = "org.qutebrowser.qutebrowser.desktop";
|
"text/html" = "librewolf.desktop";
|
||||||
"text/org" = "emacsclient.desktop";
|
"text/org" = "emacsclient.desktop";
|
||||||
"text/md" = "emacsclient.desktop";
|
"text/md" = "emacsclient.desktop";
|
||||||
"text/txt" = "emacsclient.desktop";
|
"text/txt" = "emacsclient.desktop";
|
||||||
"text/rs" = "emacsclient.desktop";
|
"text/rs" = "emacsclient.desktop";
|
||||||
"text/plain" = "emacsclient.desktop";
|
"text/plain" = "emacsclient.desktop";
|
||||||
"application/pdf" = "emacsclient.desktop";
|
"application/pdf" = "emacsclient.desktop";
|
||||||
"x-scheme-handler/about" = "org.qutebrowser.qutebrowser.desktop";
|
"x-scheme-handler/about" = "librewolf.desktop";
|
||||||
"x-scheme-handler/unknown" = "org.qutebrowser.qutebrowser.desktop";
|
"x-scheme-handler/unknown" = "librewolf.desktop";
|
||||||
"x-scheme-handler/magnet" = "torrent.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" = {
|
home.file.".config/tridactyl" = {
|
||||||
source = ../.config/tridactyl;
|
source = ../.config/tridactyl;
|
||||||
recursive = true;
|
recursive = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.firefox = {
|
programs.librewolf = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgs.firefox-wayland.override {
|
package = pkgs.librewolf-wayland.override {
|
||||||
nativeMessagingHosts =
|
nativeMessagingHosts =
|
||||||
[ pkgs.kdePackages.plasma-browser-integration pkgs.tridactyl-native ];
|
[ pkgs.kdePackages.plasma-browser-integration pkgs.tridactyl-native ];
|
||||||
};
|
};
|
||||||
|
|
|
@ -260,8 +260,8 @@ in
|
||||||
"SUPER,w,exec,rofi -i -show window"
|
"SUPER,w,exec,rofi -i -show window"
|
||||||
"SUPER,E,exec,/home/chris/bin/emacslof"
|
"SUPER,E,exec,/home/chris/bin/emacslof"
|
||||||
"SUPER,d,exec,emacsclient -c -F '`(name . \"dadired\")' -e '(dired-jump)'"
|
"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,v,exec,cliphist list | rofi -p ' ' -dmenu | cliphist decode | wl-copy"
|
||||||
"SUPER,B,exec,/home/chris/bin/qblof"
|
"SUPER,B,exec,/home/chris/bin/fflof"
|
||||||
"SUPER,A,exec,alacritty --class pulsemixer -e pulsemixer"
|
"SUPER,A,exec,alacritty --class pulsemixer -e pulsemixer"
|
||||||
"SUPERCTRL,i,exec,alacritty --class btop -e btop"
|
"SUPERCTRL,i,exec,alacritty --class btop -e btop"
|
||||||
",Print,exec,screenshot"
|
",Print,exec,screenshot"
|
||||||
|
|
|
@ -1,13 +1,17 @@
|
||||||
{ pkgs, lib, config, inputs, ... }:
|
{ pkgs, lib, config, inputs, ... }:
|
||||||
|
|
||||||
{
|
let
|
||||||
|
laptop = builtins.readFile "/etc/hostname" == ''
|
||||||
|
syl
|
||||||
|
'';
|
||||||
|
in {
|
||||||
imports = [ ./cachix.nix ];
|
imports = [ ./cachix.nix ];
|
||||||
|
|
||||||
nix = {
|
nix = {
|
||||||
extraOptions = "experimental-features = nix-command flakes";
|
extraOptions = "experimental-features = nix-command flakes";
|
||||||
gc = {
|
gc = {
|
||||||
automatic = true;
|
automatic = true;
|
||||||
dates = "weekly";
|
dates = "Mon 10:00";
|
||||||
options = "--delete-older-than 20d";
|
options = "--delete-older-than 20d";
|
||||||
};
|
};
|
||||||
settings = { auto-optimise-store = true; };
|
settings = { auto-optimise-store = true; };
|
||||||
|
@ -18,9 +22,9 @@
|
||||||
|
|
||||||
system.autoUpgrade = {
|
system.autoUpgrade = {
|
||||||
enable = true;
|
enable = true;
|
||||||
dates = "02:00";
|
dates = "11:00";
|
||||||
allowReboot = false;
|
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" ];
|
flags = [ "--update-input" "nixpkgs" "--commit-lock-file" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -128,7 +128,7 @@
|
||||||
plasma5Packages.qt5ct
|
plasma5Packages.qt5ct
|
||||||
kdePackages.xdg-desktop-portal-kde
|
kdePackages.xdg-desktop-portal-kde
|
||||||
lxappearance
|
lxappearance
|
||||||
spotdl
|
# spotdl
|
||||||
# rustdesk
|
# rustdesk
|
||||||
kdePackages.kdenlive
|
kdePackages.kdenlive
|
||||||
# davinci-resolve
|
# davinci-resolve
|
||||||
|
@ -154,14 +154,14 @@
|
||||||
sqlite
|
sqlite
|
||||||
fennel
|
fennel
|
||||||
kdePackages.plasma-sdk
|
kdePackages.plasma-sdk
|
||||||
ardour
|
# ardour
|
||||||
qpwgraph
|
qpwgraph
|
||||||
zam-plugins
|
# zam-plugins
|
||||||
tap-plugins
|
# tap-plugins
|
||||||
lsp-plugins
|
# lsp-plugins
|
||||||
ladspaPlugins
|
# ladspaPlugins
|
||||||
calf
|
# calf
|
||||||
carla
|
# carla
|
||||||
esphome
|
esphome
|
||||||
esptool
|
esptool
|
||||||
wireguard-tools
|
wireguard-tools
|
||||||
|
|
|
@ -2,17 +2,17 @@
|
||||||
export MOZ_ENABLE_WAYLAND=1
|
export MOZ_ENABLE_WAYLAND=1
|
||||||
echo $MOZ_ENABLE_WAYLAND
|
echo $MOZ_ENABLE_WAYLAND
|
||||||
|
|
||||||
# Check to see if firefox is running
|
# Check to see if librewolf is running
|
||||||
if [ $(pgrep -c firefox) -gt 0 ]; then
|
if [ $(pgrep -c librewolf) -gt 0 ]; then
|
||||||
echo "ff running"
|
echo "ff running"
|
||||||
|
|
||||||
if [ "$XDG_SESSION_TYPE" = "x11" ]; then
|
if [ "$XDG_SESSION_TYPE" = "x11" ]; then
|
||||||
#X11
|
#X11
|
||||||
ffrg=$(wmctrl -lx | rg firefox | awk '{print $1}')
|
ffrg=$(wmctrl -lx | rg librewolf | awk '{print $1}')
|
||||||
# echo $emacsrg
|
# echo $emacsrg
|
||||||
|
|
||||||
if [ -z $ffrg ]; then
|
if [ -z $ffrg ]; then
|
||||||
exec firefox
|
exec librewolf
|
||||||
exit
|
exit
|
||||||
else
|
else
|
||||||
exec wmctrl -ia $ffrg
|
exec wmctrl -ia $ffrg
|
||||||
|
@ -21,7 +21,7 @@ if [ $(pgrep -c firefox) -gt 0 ]; then
|
||||||
else
|
else
|
||||||
if [ "$KDE_FULL_SESSION" = "true" ]; then
|
if [ "$KDE_FULL_SESSION" = "true" ]; then
|
||||||
echo "KDE"
|
echo "KDE"
|
||||||
exec /home/chris/bin/ww -fa firefox -c librewolf
|
exec /home/chris/bin/ww -fa librewolf -c librewolf
|
||||||
exit
|
exit
|
||||||
else
|
else
|
||||||
# WAYLAND
|
# WAYLAND
|
||||||
|
@ -35,5 +35,5 @@ if [ $(pgrep -c firefox) -gt 0 ]; then
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
exec firefox --name "lw"
|
exec librewolf --name "lw"
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in a new issue