From 01fd04d909b155ab7c2bf1912e74026c3a135420 Mon Sep 17 00:00:00 2001 From: Daniel Langbein Date: Tue, 3 Dec 2024 22:16:26 +0100 Subject: [PATCH] NixOS 24.11: chore --- modules/boxes.nix | 2 +- modules/file-roller.nix | 2 +- modules/games.nix | 10 ++++---- modules/gnome-base.nix | 38 +++++++++++++++--------------- modules/nextcloud-client.nix | 2 +- modules/nitrokey-gpg-smartcard.nix | 2 +- modules/print-and-scan.nix | 2 +- modules/programs-base.nix | 4 ++-- modules/programs.nix | 12 +++++----- modules/uni-vpn.nix | 2 +- 10 files changed, 38 insertions(+), 38 deletions(-) diff --git a/modules/boxes.nix b/modules/boxes.nix index 77e43e6..bf70b55 100644 --- a/modules/boxes.nix +++ b/modules/boxes.nix @@ -9,7 +9,7 @@ users.users.yoda = { packages = with pkgs; [ - gnome.gnome-boxes # Virtual machines + gnome-boxes # Virtual machines ]; }; diff --git a/modules/file-roller.nix b/modules/file-roller.nix index 6160b5e..0ef23a1 100644 --- a/modules/file-roller.nix +++ b/modules/file-roller.nix @@ -2,7 +2,7 @@ { users.users.yoda = { packages = with pkgs; [ - gnome.file-roller # Archive manager: Compress and decompress + file-roller # Archive manager: Compress and decompress lz4 # Add support to extract lz4 archives ]; }; diff --git a/modules/games.nix b/modules/games.nix index 69cce69..f379283 100644 --- a/modules/games.nix +++ b/modules/games.nix @@ -45,13 +45,13 @@ # # Chess # - gnome.gnome-chess # Play the classic two-player boardgame of chess + gnome-chess # Play the classic two-player boardgame of chess gnuchess # GNU Chess engine. Can be used by gnome-chess. # # Mines # - gnome.gnome-mines # Clear hidden mines from a minefield. + gnome-mines # Clear hidden mines from a minefield. libremines # @@ -63,9 +63,9 @@ armagetronad # A multiplayer networked arcade racing game in 3D similar to Tron neverball # Tilt the floor to roll a ball gnujump # 2D jump game - gnome.gnome-nibbles # Guide a worm around a maze - gnome.gnome-taquin # Move tiles so that they reach their places - gnome.gnome-tetravex # Complete the puzzle by matching numbered tiles + gnome-nibbles # Guide a worm around a maze + gnome-taquin # Move tiles so that they reach their places + gnome-tetravex # Complete the puzzle by matching numbered tiles gnugo # GNU Go - A computer go player sweethome3d.application # Design and visualize your future home. Does not start as of 2024-01-21, see https://github.com/NixOS/nixpkgs/issues/270010 diff --git a/modules/gnome-base.nix b/modules/gnome-base.nix index e71bdee..1a57088 100644 --- a/modules/gnome-base.nix +++ b/modules/gnome-base.nix @@ -26,28 +26,28 @@ baobab # Disk usage analyzer snapshot # Camera gnome-connections # Remote desktop client (VNC, RDP) - gnome.gnome-logs # Systemd journal log viewer + gnome-logs # Systemd journal log viewer gnome-photos gnome-tour # Introduction to GNOME gnome-console # Terminal emulator. TODO Can the color scheme be configured with dconf? - gnome.cheese # Webcam viewer - gnome.gnome-music # Music player - gnome.epiphany # Web browser - gnome.geary # Email - gnome.simple-scan # Scanning - gnome.file-roller # Archive manager: Compress and decompress - gnome.gnome-calendar # Calendar - gnome.gnome-weather # Weather forcast - gnome.gnome-clocks # Clock and timer - gnome.gnome-characters # Emoji keyboard/picker - gnome.gnome-contacts # Address book - gnome.gnome-maps # Map and navigation - gnome.gnome-font-viewer # View and install fonts - gnome.gnome-system-monitor # Resource monitor / task manager - gnome.gnome-disk-utility # Partition and format disks. Mount disk images (.ISO) - gnome.gnome-calculator - gnome.totem # Video player - gnome.yelp # GNOME help + cheese # Webcam viewer + gnome-music # Music player + epiphany # Web browser + geary # Email + simple-scan # Scanning + file-roller # Archive manager: Compress and decompress + gnome-calendar # Calendar + gnome-weather # Weather forcast + gnome-clocks # Clock and timer + gnome-characters # Emoji keyboard/picker + gnome-contacts # Address book + gnome-maps # Map and navigation + gnome-font-viewer # View and install fonts + gnome-system-monitor # Resource monitor / task manager + gnome-disk-utility # Partition and format disks. Mount disk images (.ISO) + gnome-calculator + totem # Video player + yelp # GNOME help ]); # Configure keymap in X11. diff --git a/modules/nextcloud-client.nix b/modules/nextcloud-client.nix index 109dc71..04d42d9 100644 --- a/modules/nextcloud-client.nix +++ b/modules/nextcloud-client.nix @@ -7,6 +7,6 @@ nextcloud-client # Python bindings for Nautilus (GNOME Files) extension API. # TODO: If GNOME nautilus is installed - gnome.nautilus-python + nautilus-python ]; } diff --git a/modules/nitrokey-gpg-smartcard.nix b/modules/nitrokey-gpg-smartcard.nix index a3385c9..0f34dd2 100644 --- a/modules/nitrokey-gpg-smartcard.nix +++ b/modules/nitrokey-gpg-smartcard.nix @@ -154,7 +154,7 @@ home.sessionVariables.GSM_SKIP_SSH_AGENT_WORKAROUND = "1"; # Disable gnome-keyring ssh-agent xdg.configFile."autostart/gnome-keyring-ssh.desktop".text = '' - ${lib.fileContents "${pkgs.gnome3.gnome-keyring}/etc/xdg/autostart/gnome-keyring-ssh.desktop"} + ${lib.fileContents "${pkgs.gnome-keyring}/etc/xdg/autostart/gnome-keyring-ssh.desktop"} Hidden=true ''; diff --git a/modules/print-and-scan.nix b/modules/print-and-scan.nix index 4af94ea..7f9d407 100644 --- a/modules/print-and-scan.nix +++ b/modules/print-and-scan.nix @@ -61,7 +61,7 @@ users.users.yoda = { extraGroups = [ "scanner" "lp" ]; packages = with pkgs; [ - gnome.simple-scan + simple-scan ]; }; } diff --git a/modules/programs-base.nix b/modules/programs-base.nix index c33bd65..945e6a9 100644 --- a/modules/programs-base.nix +++ b/modules/programs-base.nix @@ -6,8 +6,8 @@ htop # Terminal resource monitor / task manager colmena - gnome.gnome-tweaks - gnome.dconf-editor + gnome-tweaks + dconf-editor unstable.resources # Resource monitor / task manager #gnome-secrets # Password manager (Native Wayland client), but very slow. diff --git a/modules/programs.nix b/modules/programs.nix index 5c85e91..62384e2 100644 --- a/modules/programs.nix +++ b/modules/programs.nix @@ -24,8 +24,8 @@ identity # Comparing multiple versions of an image or video obs-studio # Video recording and live streaming. # obs-studio-plugins.obs-vaapi # gstreammer based VAAPI for H.264, H.265 and AV1 encoding. On some AMD hardware this may perform bettern than FFmpeg VAAPI. - gnome.gnome-disk-utility # Partition and format disks. Mount disk images (.ISO) - gnome.gnome-calculator + gnome-disk-utility # Partition and format disks. Mount disk images (.ISO) + gnome-calculator #unstable.fractal # Matrix chat client. # Other Matrix clients. @@ -95,10 +95,10 @@ unstable.libreoffice-fresh # TODO Switch to stable NixOS again zotero # Collect, organize, cite, and share your research sources anki-bin # Flashcards. - transmission-gtk # BitTorrent client + transmission_4-gtk # BitTorrent client gnome-solanum # Pomodoro timer - gnome.gnome-contacts # Contacts - gnome.gnome-calendar # Calendar + gnome-contacts # Contacts + gnome-calendar # Calendar #unstable.planify # Tasks #endeavour # Tasks #unstable.errands # Tasks @@ -110,7 +110,7 @@ # GIS # - gnome.gnome-maps # Map and GPX viewer, personal and public navigation + gnome-maps # Map and GPX viewer, personal and public navigation gpxsee # GPX viewer and analyzer #qgis diff --git a/modules/uni-vpn.nix b/modules/uni-vpn.nix index 77b1359..c92d405 100644 --- a/modules/uni-vpn.nix +++ b/modules/uni-vpn.nix @@ -11,7 +11,7 @@ users.users.yoda = { packages = with pkgs; [ - gnome.networkmanager-openconnect # Openconnect VPN + networkmanager-openconnect # Openconnect VPN ]; }; }