diff --git a/audio.nix b/audio.nix index 12b2997..5c6aa26 100644 --- a/audio.nix +++ b/audio.nix @@ -6,6 +6,11 @@ { environment.systemPackages = with pkgs; [ + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + wireplumber playerctl # Interaction with audioplayers and browsers pavucontrol # GUI diff --git a/catppuccin_high.png b/catppuccin_high.png new file mode 100644 index 0000000..ed5d412 Binary files /dev/null and b/catppuccin_high.png differ diff --git a/configuration.nix b/configuration.nix index ca9d1ca..16ce630 100644 --- a/configuration.nix +++ b/configuration.nix @@ -9,7 +9,7 @@ { imports = [ - # Include the results of the hardware scan. + ./gnome ./hardware-configuration.nix ./terminal ./hyprland @@ -60,20 +60,17 @@ kitty xdg-utils xdg-desktop-portal-gtk - kdePackages.dolphin kdePackages.qtwayland kdePackages.qtsvg kdePackages.qt6ct protonmail-desktop - adw-gtk3 - glib - adwaita-icon-theme stremio fastfetch freetube nextcloud-client discord nix-prefetch-github # Cmd to get rev and hash from GitHub + gimp ]; nix.settings.experimental-features = [ @@ -86,8 +83,6 @@ # programs.mtr.enable = true; programs = { - dconf.enable = true; - gnupg.agent.enable = true; kdeconnect.enable = true; @@ -108,8 +103,6 @@ services = { flatpak.enable = true; - gnome.gnome-keyring.enable = true; - xserver = { enable = true; # Load Nvidia driver for Xorg and Wayland @@ -145,14 +138,6 @@ }; }; - xdg.mime.defaultApplications = { - "text/html" = "io.github.zen_browser.zen.desktop"; - "x-scheme-handler/http" = "io.github.zen_browser.zen.desktop"; - "x-scheme-handler/https" = "io.github.zen_browser.zen.desktop"; - "x-scheme-handler/about" = "io.github.zen_browser.zen.desktop"; - "x-scheme-handler/unknown" = "io.github.zen_browser.zen.desktop"; - }; - # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions # on your system were taken. It‘s perfectly fine and recommended to leave @@ -160,5 +145,4 @@ # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). system.stateVersion = "24.11"; # Did you read the comment? - } diff --git a/gnome/default.nix b/gnome/default.nix new file mode 100644 index 0000000..186b885 --- /dev/null +++ b/gnome/default.nix @@ -0,0 +1,26 @@ +{ pkgs, ... }: + +{ + imports = [ + ./nautilus.nix + ]; + + environment.systemPackages = with pkgs; [ + adw-gtk3 + glib + adwaita-icon-theme + gnomeExtensions.appindicator + gnome-extension-manager + loupe + ]; + + programs = { + dconf.enable = true; # Required for some gnome applications + }; + + services = { + gnome.gnome-keyring.enable = true; + gvfs.enable = true; # Gnome Virtual File-system. Required for various things in nautilus + udev.packages = with pkgs; [ gnome-settings-daemon ]; + }; +} diff --git a/gnome/nautilus.nix b/gnome/nautilus.nix new file mode 100644 index 0000000..3cc81b4 --- /dev/null +++ b/gnome/nautilus.nix @@ -0,0 +1,9 @@ +{ pkgs, ... }: +# TODO file-preview for videos, svgs and other types +{ + environment.systemPackages = with pkgs; [ + nautilus + ]; + + programs.nautilus-open-any-terminal.enable = true; +} diff --git a/home/default-applications.nix b/home/default-applications.nix new file mode 100644 index 0000000..a27eed4 --- /dev/null +++ b/home/default-applications.nix @@ -0,0 +1,23 @@ +{ ... }: + +{ + xdg.mimeApps = { + enable = true; + defaultApplications = + let + browser = "io.github.zen_browser.zen.desktop"; + imageViewer = "org.gnome.Loupe.desktop"; + in + { + "text/html" = browser; + "x-scheme-handler/http" = browser; + "x-scheme-handler/https" = browser; + "x-scheme-handler/about" = browser; + "x-scheme-handler/unknown" = browser; + "image/jpg" = imageViewer; + "image/jpeg" = imageViewer; + "image/png" = imageViewer; + "image/gif" = imageViewer; + }; + }; +} diff --git a/home/default.nix b/home/default.nix index 0a35eba..824ec5c 100644 --- a/home/default.nix +++ b/home/default.nix @@ -9,6 +9,7 @@ in { imports = [ inputs.nixvim.homeManagerModules.nixvim + ./default-applications.nix ./fish.nix ./nixvim ./rofi diff --git a/home/hyprland/hyprland.conf b/home/hyprland/hyprland.conf index 654c8f0..7c49585 100644 --- a/home/hyprland/hyprland.conf +++ b/home/hyprland/hyprland.conf @@ -25,7 +25,7 @@ monitor = DP-3, 2560x1440@59.95, 1920x0, 1 # Set programs that you use $browser = io.github.zen_browser.zen $terminal = kitty -$fileManager = dolphin +$fileManager = nautilus $menu = rofi -show drun diff --git a/sddm.nix b/sddm.nix index 2420052..f010b9a 100644 --- a/sddm.nix +++ b/sddm.nix @@ -6,7 +6,7 @@ flavor = "mocha"; font = "Noto Sans"; fontSize = "9"; - background = "${./catppuccin.png}"; + background = "${./catppuccin_high.png}"; loginBackground = true; }) ];