diff --git a/home/home.nix b/home/home.nix index 6881303..b38488d 100644 --- a/home/home.nix +++ b/home/home.nix @@ -47,11 +47,11 @@ in { configPackages = [ pkgs.cosmic-session pkgs.xdg-desktop-portal-cosmic pkgs.kdePackages.kwallet ]; config = { common = { - default = [ "kde" ]; - "org.freedesktop.impl.portal.FileChooser" = [ "kde" ]; + default = [ "cosmic" ]; + "org.freedesktop.impl.portal.FileChooser" = [ "cosmic" ]; "org.freedesktop.impl.portal.Access" = [ "kde" ]; - "org.freedesktop.impl.portal.OpenUri" = [ "kde" ]; - "org.freedesktop.impl.portal.Desktop" = [ "kde" ]; + "org.freedesktop.impl.portal.OpenUri" = [ "cosmic" ]; + "org.freedesktop.impl.portal.Desktop" = [ "cosmic" ]; }; }; extraPortals = [ pkgs.kdePackages.xdg-desktop-portal-kde pkgs.xdg-desktop-portal-gtk pkgs.xdg-desktop-portal-cosmic ]; @@ -99,7 +99,17 @@ in { "x-scheme-handler/about" = "org.qutebrowser.qutebrowser.desktop"; "x-scheme-handler/unknown" = "org.qutebrowser.qutebrowser.desktop"; "x-scheme-handler/magnet" = "torrent.desktop"; + "x-scheme-handler/element" = "im.riot.Riot.desktop"; + "x-scheme-handler/io.element" = "im.riot.Riot.desktop"; "application/vnd.openxmlformats-officedocuments.spreadsheetml.sheet" = "libreoffice.desktop"; + "x-scheme-handler/ftp" = "org.qutebrowser.qutebrowser.desktop"; + "x-scheme-handler/chrome" = "org.qutebrowser.qutebrowser.desktop"; + "application/x-extension-htm" = "org.qutebrowser.qutebrowser.desktop"; + "application/x-extension-html" = "org.qutebrowser.qutebrowser.desktop"; + "application/x-extension-shtml" = "org.qutebrowser.qutebrowser.desktop"; + "application/xhtml+xml" = "org.qutebrowser.qutebrowser.desktop"; + "application/x-extension-xhtml" = "org.qutebrowser.qutebrowser.desktop"; + "application/x-extension-xht" = "org.qutebrowser.qutebrowser.desktop"; }; defaultApplications = { "video/mp4" = "mpv.desktop"; @@ -127,6 +137,8 @@ in { "audio/flac" = "mpv-slow.desktop"; "audio/wav" = "mpv-slow.desktop"; "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"; @@ -139,12 +151,44 @@ in { "x-scheme-handler/about" = "org.qutebrowser.qutebrowser.desktop"; "x-scheme-handler/unknown" = "org.qutebrowser.qutebrowser.desktop"; "x-scheme-handler/magnet" = "torrent.desktop"; + "x-scheme-handler/element" = "im.riot.Riot.desktop"; + "x-scheme-handler/io.element" = "im.riot.Riot.desktop"; "application/vnd.openxmlformats-officedocuments.spreadsheetml.sheet" = "libreoffice.desktop"; + "x-scheme-handler/ftp" = "org.qutebrowser.qutebrowser.desktop"; + "x-scheme-handler/chrome" = "org.qutebrowser.qutebrowser.desktop"; + "application/x-extension-htm" = "org.qutebrowser.qutebrowser.desktop"; + "application/x-extension-html" = "org.qutebrowser.qutebrowser.desktop"; + "application/x-extension-shtml" = "org.qutebrowser.qutebrowser.desktop"; + "application/xhtml+xml" = "org.qutebrowser.qutebrowser.desktop"; + "application/x-extension-xhtml" = "org.qutebrowser.qutebrowser.desktop"; + "application/x-extension-xht" = "org.qutebrowser.qutebrowser.desktop"; }; }; }; + programs.element-desktop = { + enable = true; + settings = { + default_server_config = { + "m.homeserver" = { + base_url = "https://matrix.tfcconnection.org"; + server_name = "TFC"; + }; + "m.identity_server" = { + base_url = "https://vector.im"; + }; + }; + disable_custom_urls = false; + disable_guests = false; + disable_login_language_selector = false; + disable_3pid_login = false; + force_verification = false; + brand = "Element"; + integrations_ui_url = "https://scalar.vector.im/"; + integrations_rest_url = "https://scalar.vector.im/api"; + }; + }; # home.file.".config/xdg-desktop-portal/portals.conf" = { # text = '' # [preferred] @@ -1512,7 +1556,7 @@ in { enable = true; settings = { window = { - opacity = 0.9; + opacity = 0.95; dynamic_title = true; padding.x = 10; padding.y = 10; diff --git a/pkgs/base-packages.nix b/pkgs/base-packages.nix index de15870..0f7ed01 100644 --- a/pkgs/base-packages.nix +++ b/pkgs/base-packages.nix @@ -19,15 +19,6 @@ recutils exfat exfatprogs - guile - guile-sqlite3 - guile-config - guile-sjson - guile-json - guile-lib - guile-zlib - guile-zstd - guile-quickcheck # scsh # radicle-node # unrar @@ -70,12 +61,6 @@ du-dust dysk sbcl - - babashka - clojure - clojure-lsp - clj-kondo - leiningen ]; } diff --git a/pkgs/desktop-packages.nix b/pkgs/desktop-packages.nix index 7a300f6..16d0c97 100644 --- a/pkgs/desktop-packages.nix +++ b/pkgs/desktop-packages.nix @@ -11,7 +11,7 @@ openssh openssl cyrus-sasl-xoauth2 - kdePackages.ark + # kdePackages.ark harper mumble niri @@ -22,7 +22,7 @@ dash luanti kdePackages.breeze - kdePackages.dolphin + # kdePackages.dolphin geticons pdfmixtool localsend @@ -32,14 +32,14 @@ # kdePackages.kio-extras # kdePackages.qtsvg # kdePackages.qtwayland - kdePackages.ffmpegthumbs - kdePackages.kdegraphics-thumbnailers - kdePackages.kdesdk-thumbnailers - xfce.thunar - xfce.tumbler - xfce.thunar-media-tags-plugin - xfce.thunar-archive-plugin - xfce.xfconf + # kdePackages.ffmpegthumbs + # kdePackages.kdegraphics-thumbnailers + # kdePackages.kdesdk-thumbnailers + # xfce.thunar + # xfce.tumbler + # xfce.thunar-media-tags-plugin + # xfce.thunar-archive-plugin + # xfce.xfconf zathura kdePackages.okular just @@ -78,7 +78,7 @@ ani-cli # mov-cli nerd-fonts.victor-mono - kdePackages.plasma-browser-integration + # kdePackages.plasma-browser-integration alacritty libnotify rofi @@ -99,8 +99,8 @@ aha glxinfo vulkan-tools - vivaldi - vivaldi-ffmpeg-codecs + # vivaldi + # vivaldi-ffmpeg-codecs wayland-utils nextcloud-client swww @@ -109,31 +109,31 @@ plocate papirus-icon-theme phinger-cursors - kdePackages.kde-cli-tools + # kdePackages.kde-cli-tools gzip qrrs virt-manager virt-viewer # kdialog inkscape - libreoffice-qt6-fresh - vlc + libreoffice-fresh + # vlc haskellPackages.greenclip wiremix any-nix-shell wtype - xdotool - wmctrl - xcape - xclip - lapce + # xdotool + # wmctrl + # xcape + # xclip + # lapce # maim - unclutter-xfixes + # unclutter-xfixes bluez-tools networkmanager_dmenu plasma5Packages.qt5ct - kdePackages.xdg-desktop-portal-kde - lxappearance + # kdePackages.xdg-desktop-portal-kde + # lxappearance # spotdl # rustdesk kdePackages.kdenlive @@ -159,7 +159,7 @@ python3 nix-index sqlite - fennel + # fennel kdePackages.plasma-sdk # ardour qpwgraph diff --git a/qmk/qmk_firmware b/qmk/qmk_firmware index 63ec2f6..ff5879f 160000 --- a/qmk/qmk_firmware +++ b/qmk/qmk_firmware @@ -1 +1 @@ -Subproject commit 63ec2f6b300977b057400584b0de8082015eaaa9 +Subproject commit ff5879f6200db4f3ceddd12b8d3683985f41da98 diff --git a/systems/nixbook/configuration.nix b/systems/nixbook/configuration.nix index e172722..d9d4cde 100644 --- a/systems/nixbook/configuration.nix +++ b/systems/nixbook/configuration.nix @@ -19,8 +19,8 @@ # boot.initrd.kernelModules = [ "i915" ]; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - hardware.cpu.intel.updateMicrocode = - lib.mkDefault config.hardware.enableRedistributableFirmware; + # hardware.cpu.intel.updateMicrocode = + # lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.acpilight.enable = lib.mkDefault true; # networking.interfaces.wlp170s0.useDHCP = true; @@ -48,7 +48,7 @@ wayland.enable = true; settings = { Autologin = { - Session = "plasma.desktop"; + Session = "cosmic.desktop"; User = "abbie"; }; }; diff --git a/systems/nixbook/pkgs.nix b/systems/nixbook/pkgs.nix index 16ce978..38041dd 100644 --- a/systems/nixbook/pkgs.nix +++ b/systems/nixbook/pkgs.nix @@ -57,7 +57,6 @@ kdePackages.kwallet-pam aria2 kdePackages.kwallet - # nerd-fonts.victor-mono glxinfo vulkan-tools wayland-utils @@ -73,17 +72,14 @@ kdePackages.discover kdePackages.kdegraphics-thumbnailers kdePackages.kdesdk-thumbnailers - libreoffice-qt6-fresh + libreoffice-fresh vlc any-nix-shell wtype - xdotool bluez-tools - lxappearance mediainfo libmediainfo rubberband - # texlive.combined.scheme-full pamixer playerctl gimp diff --git a/systems/syl/configuration.nix b/systems/syl/configuration.nix index b2c255f..98da0ee 100644 --- a/systems/syl/configuration.nix +++ b/systems/syl/configuration.nix @@ -80,7 +80,7 @@ # SUBSYSTEM=="power_supply", ATTR{online}=="1", RUN+="/usr/bin/at -M -f /lib/udev/power-profiles/performance now" # Enable touchpad support (enabled default in most desktopManager). - services.xserver.libinput.enable = true; + services.libinput.enable = true; services.xserver.dpi = 144; # Define a user account. Don't forget to set a password with ‘passwd’.