diff --git a/flake.lock b/flake.lock index fb3a89a..a96a1a4 100644 --- a/flake.lock +++ b/flake.lock @@ -296,16 +296,16 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1721743106, - "narHash": "sha256-adRZhFpBTnHiK3XIELA3IBaApz70HwCYfv7xNrHjebA=", + "lastModified": 1721821769, + "narHash": "sha256-PhmkdTJs2SfqKzSyDB74rDKp1MH4mGk0pG/+WqrnGEw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dc14ed91132ee3a26255d01d8fd0c1f5bff27b2f", + "rev": "d0907b75146a0ccc1ec0d6c3db287ec287588ef6", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index d2d75d8..1d86dc1 100644 --- a/flake.nix +++ b/flake.nix @@ -7,7 +7,7 @@ # Import the desired Nix channel. Defaults to unstable, which uses a fully tested rolling release model. # You can find a list of channels at https://wiki.nixos.org/wiki/Nix_channels # To follow a different channel, replace `nixos-unstable` with the channel name, e.g. `nixos-24.05`. - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; # Use Lix in place of Nix. # If you'd rather use regular Nix, remove `lix-module.nixosModules.default` from the `modules` section below. diff --git a/modules/ui/desktops/gnome.nix b/modules/ui/desktops/gnome.nix index b5a1e1a..7c079f0 100644 --- a/modules/ui/desktops/gnome.nix +++ b/modules/ui/desktops/gnome.nix @@ -66,26 +66,25 @@ in gnomeExtensions.extension-list gedit # text editor ]) - ++ (with pkgs; [ - cheese # webcam tool - gnome.gnome-music + ++ (with pkgs.gnome; [ + gnome-music gnome-calendar epiphany # web browser geary # email reader evince # document viewer - gnome.gnome-characters - gnome.gnome-software + gnome-characters + gnome-software totem # video player - gnome.tali # poker game - gnome.iagno # go game - gnome.hitori # sudoku game - gnome.atomix # puzzle game + tali # poker game + iagno # go game + hitori # sudoku game + atomix # puzzle game ]); # Install additional packages systemPackages = with pkgs; [ # Gnome tweak tools - gnome-tweaks + gnome.gnome-tweaks # Gnome extensions gnomeExtensions.alphabetical-app-grid gnomeExtensions.another-window-session-manager @@ -94,7 +93,7 @@ in gnomeExtensions.forge gnomeExtensions.random-wallpaper # Themeing - gnome-themes-extra + gnome.gnome-themes-extra papirus-icon-theme qogir-icon-theme ];