Merge branch 'main' of https://git.xenia.me.uk/xenia/nixos

home/hyprland/config.nix

@@ -21,9 +21,6 @@ in ''
   env = GRIM_DEFAULT_DIR=${config.xdg.userDirs.pictures}/Grim
 
   exec-once = hyprctl setcursor ${cursorName} ${cursorSize}
-  exec-once = dbus-update-activation-environment --systemd --all
-  exec-once = systemctl --user import-environment WAYLAND_DISPLAY QT_QPA_PLATFORMTHEME
-  exec-once = systemctl --user restart xdg-desktop-portal.service xdg-desktop-portal-hyprland.service avizo.service
 
   gestures:workspace_swipe = true
 
@@ -226,9 +223,11 @@ in ''
   bindm = SUPER, mouse:272, movewindow
   bindm = SUPER, mouse:273, resizewindow
 
-  exec-once = emacs --fg-daemon
+  exec-once = dbus-update-activation-environment --systemd --all
+  exec-once = systemctl --user import-environment WAYLAND_DISPLAY QT_QPA_PLATFORMTHEME
+
+  exec-once = git -C $HOME/.emacs pull --ff-only; emacs --fg-daemon
   exec-once = swaync
   exec-once = ${pkgs.hyprpaper}/bin/hyprpaper
   exec-once = ${pkgs.dex}/bin/dex --autostart
-  exec-once = [workspace name:btm silent] 
 ''

home/hyprland/default.nix

@@ -107,32 +107,5 @@
       '';
       "swaync/style.css".source = ./swaync/style.css;
     };
-    mimeApps = rec {
-      enable = true;
-      defaultApplications = {
-        "application/pdf" = [ "emacs.desktop" ];
-        "application/epub+zip" = [ "emacs.desktop" ];
-        "application/oxps" = [ "emacs.desktop" ];
-        "image/jpeg" = [ "swayimg.desktop" ];
-        "image/png" = [ "swayimg.desktop" ];
-        "video/mp4" = [ "mpv.desktop" ];
-        "text/csv" = [ "emacs.desktop" ];
-        "text/html" = [ "firefox.desktop" ];
-        "x-scheme-handler/http" = [ "firefox.desktop" ];
-        "x-scheme-handler/https" = [ "firefox.desktop" ];
-        "x-scheme-handler/about" = [ "firefox.desktop" ];
-        "x-scheme-handler/chrome" = [ "firefox.desktop" ];
-        "application/x-extension-htm" = [ "firefox.desktop" ];
-        "application/x-extension-html" = [ "firefox.desktop" ];
-        "application/x-extension-shtml" = [ "firefox.desktop" ];
-        "application/xhtml+xml" = [ "firefox.desktop" ];
-        "application/x-extension-xhtml" = [ "firefox.desktop" ];
-        "application/x-extension-xht" = [ "firefox.desktop" ];
-        "application/x-mozilla-bookmarks" = [ "firefox.desktop" ];
-        "x-scheme-handler/msteams" = [ "teams-for-linux.desktop" ];
-        "x-scheme-handler/zoomus" = [ ];
-      };
-      associations.added = defaultApplications;
-    };
   };
 }

home/hyprland/waybar/default.nix

@@ -17,8 +17,8 @@
       "modules-left" = [ "hyprland/window" "mpris" ];
       "modules-center" = [ "hyprland/workspaces" ];
       "modules-right" = [
-        "pulseaudio"
         "custom/notification"
+        "pulseaudio"
         "clock"
         "custom/separator"
         "backlight"
@@ -112,8 +112,8 @@
         format-icons = [ "󱃃" "󰔏" "󱃂" ];
       };
       clock = {
-        format = "{:󰥔 %R}";
+        format = "{:󰃭 %Y-%m-%d 󰥔 %R}";
-        format-alt = "{:󰃭 %Y-%m-%d 󰥔 %R}";
+        format-alt = "{:󰥔 %R}";
         tooltip-format = "<tt><small>{calendar}</small></tt>";
         calendar = {
           mode = "month";

home/hyprland/waybar/style.css

@@ -106,10 +106,10 @@ tooltip {
 	color: @red;
 }
 
-#pulseaudio {
+#custom-notification {
 	color: @red;
 }
-#custom-notification {
+#pulseaudio {
 	color: @green;
 }
 #clock {

system/desktop.nix

@@ -3,6 +3,7 @@
   environment.systemPackages = with pkgs; [
     dex
     libnotify
+    libcamera
     glib
     gsettings-desktop-schemas
   ];
@@ -10,11 +11,8 @@
     polkit.enable = true;
     rtkit.enable = true;
   };
-  sound.enable = true;
+  sound.enable = false;
-  hardware = {
+  hardware.bluetooth.enable = true;
-    pulseaudio.enable = false;
-    bluetooth.enable = true;
-  };
   services = {
     accounts-daemon.enable = true;
     dbus.packages = with pkgs; [ gcr ];
@@ -24,9 +22,14 @@
     };
     pipewire = {
       enable = true;
-      alsa.enable = true;
+      alsa = {
-      alsa.support32Bit = true;
+        enable = true;
+        support32Bit = true;
+      };
+      audio.enable = true;
+      jack.enable = true;
       pulse.enable = true;
+      wireplumber.enable = true;
     };
     xserver = {
       layout = "gb";
@@ -41,4 +44,8 @@
     platformTheme = "gnome";
     style = "adwaita-dark";
   };
+  xdg.portal = {
+    enable = true;
+    xdgOpenUsePortal = true;
+  };
 }

system/hyprland.nix

@@ -38,11 +38,6 @@
       libreoffice
       webcord
       teams-for-linux
-      gst_all_1.gst-libav
-      gst_all_1.gst-plugins-base
-      gst_all_1.gst-plugins-good
-      gst_all_1.gst-plugins-bad
-      gst_all_1.gst-plugins-ugly
     ];
   };
   security.pam.services.swaylock = { };
@@ -58,7 +53,32 @@
       initial_session = { inherit command; };
     };
   };
-  xdg.portal.enable = true;
+  xdg.mime = rec {
+    enable = true;
+    defaultApplications = {
+      "application/pdf" = [ "emacs.desktop" ];
+      "application/epub+zip" = [ "emacs.desktop" ];
+      "application/oxps" = [ "emacs.desktop" ];
+      "image/jpeg" = [ "swayimg.desktop" ];
+      "image/png" = [ "swayimg.desktop" ];
+      "video/mp4" = [ "mpv.desktop" ];
+      "text/csv" = [ "emacs.desktop" ];
+      "text/html" = [ "firefox.desktop" ];
+      "x-scheme-handler/http" = [ "firefox.desktop" ];
+      "x-scheme-handler/https" = [ "firefox.desktop" ];
+      "x-scheme-handler/about" = [ "firefox.desktop" ];
+      "x-scheme-handler/chrome" = [ "firefox.desktop" ];
+      "application/x-extension-htm" = [ "firefox.desktop" ];
+      "application/x-extension-html" = [ "firefox.desktop" ];
+      "application/x-extension-shtml" = [ "firefox.desktop" ];
+      "application/xhtml+xml" = [ "firefox.desktop" ];
+      "application/x-extension-xhtml" = [ "firefox.desktop" ];
+      "application/x-extension-xht" = [ "firefox.desktop" ];
+      "application/x-mozilla-bookmarks" = [ "firefox.desktop" ];
+      "x-scheme-handler/msteams" = [ "teams-for-linux.desktop" ];
+    };
+    addedAssociations = defaultApplications;
+  };
   programs = {
     dconf.enable = true;
     light.enable = true;