diff --git a/configuration.nix b/configuration.nix index fc3e18a..d47d292 100644 --- a/configuration.nix +++ b/configuration.nix @@ -12,10 +12,12 @@ { imports = [ ./hardware-configuration.nix - ./modules/packages.nix - ./modules/services.nix + ./modules/flatpak.nix ./modules/gdm-monitors.nix + ./modules/gnome.nix + ./modules/packages.nix ./modules/programs.nix + ./modules/services.nix ]; chaotic.mesa-git.enable = true; @@ -41,7 +43,7 @@ windows = { "w" = { title = "Windows"; - efiDeviceHandle = "HD(1,GPT,ee23cd4d-b501-4b9d-9ca0-971fa6be44cf,0x800,0x32000)"; # ????????? + efiDeviceHandle = "HD3b"; }; }; }; @@ -123,6 +125,20 @@ "ventoy-gtk3-1.1.07" ]; }; + overlays = [ + (final: prev: { + nautilus = prev.nautilus.overrideAttrs (nprev: { + buildInputs = + nprev.buildInputs + ++ (with pkgs.gst_all_1; [ + gst-plugins-good + gst-plugins-bad + gst-plugins-ugly + gst-plugins-base + ]); + }); + }) + ]; }; environment = { @@ -130,6 +146,11 @@ NIXOS_OZONE_WL = "1"; LIBVIRT_DEFAULT_URI = "qemu:///system"; }; + systemPackages = [ + pkgs.libheif + pkgs.libheif.out + ]; + pathsToLink = [ "share/thumbnailers" ]; }; hardware = { diff --git a/flake.lock b/flake.lock index b32f861..ddd68f5 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1762525922, - "narHash": "sha256-DX0/D0o/lUQRMCuoAoJiXkDqoISLSgkQAlsPqPS4i6M=", + "lastModified": 1762966292, + "narHash": "sha256-WJtAHPDOJRd/ecQJBFyuyqBIbDG0ocdQuBGPBRRsgew=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "863eed9a7967cb307ecdcdba0c7b87db6a314865", + "rev": "037d0bb4a6b51609e66fab2221d3bca2d3b5fa3b", "type": "github" }, "original": { @@ -45,11 +45,11 @@ ] }, "locked": { - "lastModified": 1762463325, - "narHash": "sha256-33YUsWpPyeBZEWrKQ2a1gkRZ7i0XCC/2MYpU6BVeQSU=", + "lastModified": 1762787259, + "narHash": "sha256-t2U/GLLXHa2+kJkwnFNRVc2fEJ/lUfyZXBE5iKzJdcs=", "owner": "nix-community", "repo": "home-manager", - "rev": "0562fef070a1027325dd4ea10813d64d2c967b39", + "rev": "37a3d97f2873e0f68711117c34d04b7c7ead8f4e", "type": "github" }, "original": { @@ -67,11 +67,11 @@ ] }, "locked": { - "lastModified": 1762452596, - "narHash": "sha256-Iaga+mkwWnWa6FxsAYknpHzeP344VCKGkdudX420LgA=", + "lastModified": 1762856455, + "narHash": "sha256-x7zgteJWIlbVexL2ubOadUXKlHSjh0RAjLO1KfWdgpU=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "99919fd35e70c1b18ce948d5329928d751031312", + "rev": "29a671ae20223d182eaf54b963a735230497c2f9", "type": "github" }, "original": { @@ -120,11 +120,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1762363567, - "narHash": "sha256-YRqMDEtSMbitIMj+JLpheSz0pwEr0Rmy5mC7myl17xs=", + "lastModified": 1762844143, + "narHash": "sha256-SlybxLZ1/e4T2lb1czEtWVzDCVSTvk9WLwGhmxFmBxI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ae814fd3904b621d8ab97418f1d0f2eb0d3716f4", + "rev": "9da7f1cf7f8a6e2a7cb3001b048546c92a8258b4", "type": "github" }, "original": { @@ -136,11 +136,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1762616480, - "narHash": "sha256-vLjEPWbntbVNKIDbQW7fUj6y3bkIJaSCuy6sJ2cXeNI=", + "lastModified": 1763101017, + "narHash": "sha256-Vr92WyDB5r7b5M8FtSevqoMi1jUbTplILUIWbWvQpYk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8ea611305a7db12c49446f9c40c609614419ec4b", + "rev": "534d5ee716a5f547efa4f3563d3592527e30329c", "type": "github" }, "original": { @@ -165,11 +165,11 @@ ] }, "locked": { - "lastModified": 1762483116, - "narHash": "sha256-Z8EVsTH10BjCdFyPxbUu5jBV+HGL39rh9+beQcnNRm0=", + "lastModified": 1762915112, + "narHash": "sha256-d9j1g8nKmYDHy+/bIOPQTh9IwjRliqaTM0QLHMV92Ic=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "9de55b59b6aaadbd9dbf223765a835239b767ee5", + "rev": "aa1e85921cfa04de7b6914982a94621fbec5cc02", "type": "github" }, "original": { diff --git a/modules/flatpak.nix b/modules/flatpak.nix new file mode 100644 index 0000000..c0513f5 --- /dev/null +++ b/modules/flatpak.nix @@ -0,0 +1,48 @@ +{ + config, + pkgs, + lib, + ... +}: + +{ + services.flatpak = { + enable = true; + remotes = [ + { + name = "flathub"; + location = "https://dl.flathub.org/repo/flathub.flatpakrepo"; + } + ]; + packages = [ + { + appId = "com.mattjakeman.ExtensionManager"; + origin = "flathub"; + } + { + appId = "com.prusa3d.PrusaSlicer"; + origin = "flathub"; + } + { + appId = "com.github.tchx84.Flatseal"; + origin = "flathub"; + } + { + appId = "org.gtk.Gtk3theme.Adwaita-dark"; + origin = "flathub"; + } + { + appId = "org.gtk.Gtk3theme.Flat-Remix-GTK-Red-Darkest"; + origin = "flathub"; + } + { + appId = "com.github.iwalton3.jellyfin-media-player"; + origin = "flathub"; + } + { + appId = "org.freecad.FreeCAD"; + origin = "flathub"; + } + ]; + }; +} diff --git a/modules/gnome.nix b/modules/gnome.nix new file mode 100644 index 0000000..defd856 --- /dev/null +++ b/modules/gnome.nix @@ -0,0 +1,43 @@ +{ + config, + pkgs, + lib, + ... +}: + +{ + environment = { + gnome.excludePackages = with pkgs; [ + decibels + epiphany + geary + gnome-connections + gnome-contacts + gnome-logs + gnome-maps + gnome-music + gnome-software + gnome-system-monitor + snapshot + totem + yelp + ]; + + systemPackages = with pkgs.gnomeExtensions; [ + # thanatophobia + alphabetical-app-grid + appindicator + blur-my-shell + control-monitor-brightness-and-volume-with-ddcutil + bubblemail + color-picker + dash-to-dock + # Not for G49 yet + # favorites-to-applications-grid + middle-click-to-close-in-overview + undecorate + user-themes + window-is-ready-remover + ]; + }; +} diff --git a/modules/packages.nix b/modules/packages.nix index 657253a..b7d8b19 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -6,155 +6,131 @@ }: { - environment.gnome.excludePackages = with pkgs; [ - decibels - epiphany - geary - gnome-connections - gnome-contacts - gnome-logs - gnome-maps - gnome-music - gnome-software - gnome-system-monitor - snapshot - totem - yelp - ]; - - environment.systemPackages = lib.flatten [ - (with pkgs.gnomeExtensions; [ - # thanatophobia - alphabetical-app-grid - appindicator - blur-my-shell - control-monitor-brightness-and-volume-with-ddcutil - bubblemail - color-picker - dash-to-dock - favorites-to-applications-grid - middle-click-to-close-in-overview - undecorate - user-themes - ]) - (with pkgs; [ - abootimg - amdgpu_top - android-tools - appstream - arch-install-scripts - bibata-cursors - binwalk - brscan4 - brscan5 - btrfs-progs - bubblemail - bzip2 - ccache - curl - czkawka - ddcutil - discord-krisp - distrobox - docker-compose - dog - eza - ffmpeg - ffmpegthumbnailer - file - flat-remix-gnome - flat-remix-gtk - flatpak-xdg-utils - freerdp - fuse - fuse3 - fwupd - gimp - gnome-tweaks - gnome.gvfs - gotop - gparted - gvfs - gzip - htop - i2c-tools - iftop - inkscape - iotop - jq - killall - kooha - krita - lact - libnotify - libreoffice - linux-firmware - lm_sensors - lrzip - lsof - lz4 - lzip - lzop - mangohud - mesa-demos - mission-center - ncdu - nil - nixfmt-rfc-style - noisetorch - ntfs3g - nvtopPackages.amd - openrgb-with-all-plugins - papirus-icon-theme - pbzip2 - pigz - plymouth - poppler-utils - prismlauncher-unwrapped - protonup-qt - radeontop - rquickshare - scrcpy - screen - seafile-client - smartmontools - starship - sushi - swtpm - telegram-desktop - testdisk - thunderbird - tidal-hifi - tldr - tree - unrar - unzip - ventoy-full-gtk - vesktop - vkbasalt - vlc - vscode-fhs - wev - weylus - wget - which - wine - wireshark - xfce.tumbler - xz - yt-dlp - zenmonitor - zip - zram-generator - zsh-autosuggestions - zsh-completions - zsh-history-substring-search - zsh-syntax-highlighting - zstd - zulu8 - zulu17 - zulu23 - ]) + environment.systemPackages = with pkgs; [ + abootimg + amdgpu_top + android-tools + appstream + arch-install-scripts + bibata-cursors + binwalk + brscan4 + brscan5 + btrfs-progs + bubblemail + bzip2 + ccache + curl + czkawka + ddcutil + discord-krisp + distrobox + docker-buildx + docker-compose + dog + eza + ffmpeg + ffmpegthumbnailer + file + flat-remix-gnome + flat-remix-gtk + flatpak-xdg-utils + freerdp + fuse + fuse3 + fwupd + gimp + gnome-tweaks + gnome.gvfs + gotop + gparted + gst_all_1.gstreamer + gst_all_1.gst-vaapi + gst_all_1.gst-libav + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-ugly + gst_all_1.gst-plugins-base + gvfs + gzip + htop + i2c-tools + iftop + inkscape + iotop + jq + killall + kooha + krita + lact + libnotify + libreoffice + linux-firmware + lm_sensors + lrzip + lsof + lz4 + lzip + lzop + mangohud + mesa-demos + mission-center + ncdu + nil + nixfmt-rfc-style + noisetorch + ntfs3g + nvtopPackages.amd + openrgb-with-all-plugins + papirus-icon-theme + pbzip2 + pigz + plymouth + poppler-utils + prismlauncher-unwrapped + protonup-qt + radeontop + rquickshare + scrcpy + screen + seafile-client + smartmontools + starship + sushi + swtpm + telegram-desktop + testdisk + thunderbird + tidal-hifi + tldr + tree + unrar + unzip + ventoy-full-gtk + vesktop + vkbasalt + vlc + vscode-fhs + wev + weylus + wget + which + wine + wireshark + xfce.tumbler + xz + yt-dlp + zenmonitor + zip + zram-generator + zsh-autosuggestions + zsh-completions + zsh-history-substring-search + zsh-syntax-highlighting + zstd + zulu8 + zulu17 + zulu23 ]; fonts = { diff --git a/modules/programs.nix b/modules/programs.nix index 6a4c470..65deaa4 100644 --- a/modules/programs.nix +++ b/modules/programs.nix @@ -83,44 +83,4 @@ }; virt-manager.enable = true; }; - - services.flatpak = { - enable = true; - remotes = [ - { - name = "flathub"; - location = "https://dl.flathub.org/repo/flathub.flatpakrepo"; - } - ]; - packages = [ - { - appId = "com.mattjakeman.ExtensionManager"; - origin = "flathub"; - } - { - appId = "com.prusa3d.PrusaSlicer"; - origin = "flathub"; - } - { - appId = "com.github.tchx84.Flatseal"; - origin = "flathub"; - } - { - appId = "org.gtk.Gtk3theme.Adwaita-dark"; - origin = "flathub"; - } - { - appId = "org.gtk.Gtk3theme.Flat-Remix-GTK-Red-Darkest"; - origin = "flathub"; - } - { - appId = "com.github.iwalton3.jellyfin-media-player"; - origin = "flathub"; - } - { - appId = "org.freecad.FreeCAD"; - origin = "flathub"; - } - ]; - }; } diff --git a/modules/services.nix b/modules/services.nix index 409d50b..cf10308 100644 --- a/modules/services.nix +++ b/modules/services.nix @@ -86,26 +86,4 @@ interval = "weekly"; }; }; - - systemd = { - services."nix-prune-generations" = { - description = "Keep only 5 system generations and run nix-collect-garbage"; - serviceConfig = { - Type = "oneshot"; - ExecStart = '' - ${pkgs.nix}/bin/nix-env -p /nix/var/nix/profiles/system --delete-generations +5 || true - ${pkgs.nix}/bin/nix-collect-garbage -d || true - ''; - Nice = "10"; - }; - }; - - timers."nix-prune-generations" = { - wantedBy = [ "timers.target" ]; - timerConfig = { - OnCalendar = "weekly"; - Persistent = true; - }; - }; - }; }