diff --git a/nate/desktop-configuration.nix b/nate/desktop-configuration.nix index f52045c..db61386 100644 --- a/nate/desktop-configuration.nix +++ b/nate/desktop-configuration.nix @@ -29,6 +29,7 @@ in imports = [ modules/user/main_user.nix modules/sway/sway_conf.nix + ../shared/modules/services/motu-m4-combined.nix # inputs.nur.hmModules.nur ]; @@ -70,12 +71,15 @@ in enable = true; useNonFree = true; installGaming = deskCfg.installGaming; - systemPackages = with pkgs; [ - libreoffice - rpi-imager - ]; + systemPackages = []; }; - + + services.motu-m4-combined = { + enable = true; + user = deskCfg.userName; + latencyMs = 10; + }; + system.stateVersion = "23.11"; # Did you read the comment? }; } diff --git a/nate/dotfiles/sway/config.d/autostart_applications b/nate/dotfiles/sway/config.d/autostart_applications index f2a341e..7167f60 100644 --- a/nate/dotfiles/sway/config.d/autostart_applications +++ b/nate/dotfiles/sway/config.d/autostart_applications @@ -8,9 +8,9 @@ exec mako exec nm-applet --indicator # GTK3 applications take a long time to start -exec systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK +exec systemctl --user import-environment PATH DISPLAY WAYLAND_DISPLAY SWAYSOCK exec hash dbus-update-activation-environment 2>/dev/null && \ - dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK + dbus-update-activation-environment --systemd PATH DISPLAY WAYLAND_DISPLAY SWAYSOCK # Sway Fader # exec python3 ~/.config/sway/scripts/swayfader.py diff --git a/nate/modules/home-manager/home.nix b/nate/modules/home-manager/home.nix index 7a75c1d..d3ddb65 100644 --- a/nate/modules/home-manager/home.nix +++ b/nate/modules/home-manager/home.nix @@ -52,30 +52,18 @@ home.packages = with pkgs; [ # nur.repos.crazazy.js.eslint - chromium # # Dev Tools # - dbeaver-bin helix docker - docker-compose unstable.godot jq - python310 ### LSP's nil # Nix LSP nodePackages_latest.bash-language-server - openscad-lsp vscode-langservers-extracted # provides eslint, markdown, json, css, and html lsp python311Packages.python-lsp-server - ## Clojure - leiningen - jre17_minimal - clojure - clojure-lsp - cljfmt - emacs # zls ### Misc @@ -83,37 +71,27 @@ # android-tools # sdkmanager unstable.claude-code - usbutils - cli-visualizer - openscad # # Gaming # - amdgpu_top + mumble mangohud - r2modman wine-wayland - webcord # # Better Unix # bat duf - du-dust fd fzf lsd ripgrep - tre-command gtop htop - neofetch # Normies unzip - llpp - nmap # # Photo / Video @@ -122,32 +100,16 @@ # davinciDesktop imv mpv - gimp ffmpeg - tenacity - yt-dlp - libimobiledevice - ifuse # # Communication # - mumble - slack # # Other # - keepassxc - obs-studio - prusa-slicer - yubioath-flutter - gnome-disk-utility - handbrake kdePackages.filelight - hugo - prismlauncher simple-scan - code-cursor # # Style @@ -207,6 +169,19 @@ General.theme = "catppuccin-macchiato-lavender"; }; }; + + # Configure default applications for opening links + xdg.mimeApps = { + enable = true; + defaultApplications = { + "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/unknown" = "firefox.desktop"; + }; + }; + # For applying custom styles # home.file.".mozilla/firefox/default" = { # source = ../../misc/firefox_styles; diff --git a/nate/modules/sway/sway_conf.nix b/nate/modules/sway/sway_conf.nix index 970e138..74e13a9 100644 --- a/nate/modules/sway/sway_conf.nix +++ b/nate/modules/sway/sway_conf.nix @@ -70,7 +70,6 @@ man-pages man-pages-posix nautilus - ncspot networkmanagerapplet pavucontrol slurp