Merge branch 'nixos-24.05' into consensus

default.nix

@@ -13,7 +13,7 @@ with import ./nix args; {
       alejandraUnstable # The Uncompromising Nix Code Formatter
       cardanoNodeProject.cardano-cli # required for KES key rotation
       niv
-      nixops_unstable # work around for issue #127423
+      nixops_unstable_minimal # work around for issue #127423
       tea # Gitea official CLI client
       treefmt # one CLI to format the code tree
     ];

nix/sources.json

@@ -80,16 +80,16 @@
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs": {
-        "branch": "nixos-23.11",
+        "branch": "nixos-24.05",
         "builtin": false,
         "description": "A read-only mirror of NixOS/nixpkgs tracking the released channels. Send issues and PRs to",
         "homepage": "https://github.com/NixOS/nixpkgs",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9d29cd266cebf80234c98dd0b87256b6be0af44e",
+        "rev": "805a384895c696f802a9bf5bf4720f37385df547",
-        "sha256": "0bkrjx4x6sy4g9kmcddhlwrl4cpm4yvj7cljd7b8crf7kxpvaaf6",
+        "sha256": "1q7y5ygr805l5axcjhn0rn3wj8zrwbrr0c6a8xd981zh8iccmx0p",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/9d29cd266cebf80234c98dd0b87256b6be0af44e.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/805a384895c696f802a9bf5bf4720f37385df547.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgsUnstable": {
@@ -98,10 +98,10 @@
         "homepage": "",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "062ca2a9370a27a35c524dc82d540e6e9824b652",
+        "rev": "ad57eef4ef0659193044870c731987a6df5cf56b",
-        "sha256": "0gdi0awmqd14ii472ghxh1f2q6br0qq359i35jsw9zd30d8l1ian",
+        "sha256": "1fz2yjr8as12g9qhixwc8vzd294v3q5jzmrk5dwp8w44qz3clc2b",
         "type": "tarball",
-        "url": "https://github.com/nixos/nixpkgs/archive/062ca2a9370a27a35c524dc82d540e6e9824b652.tar.gz",
+        "url": "https://github.com/nixos/nixpkgs/archive/ad57eef4ef0659193044870c731987a6df5cf56b.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     }
 }

profiles/desktop_common.nix

@@ -47,6 +47,16 @@
       true; # A daemon for delivering ACPI events to userspace programs
     blueman.enable = true; # GTK-based Bluetooth Manager
     devmon.enable = true; # Enable external device automounting.`
+    displayManager = {
+      defaultSession = "pantheon"; # Set GNOME as the default session
+    };
+    libinput = {
+      enable = true; # Enable touchpad support.
+      touchpad = {
+        tapping = true;
+        tappingButtonMap = "lrm"; # Set the touchpad button mappeing
+      };
+    };
     udev.packages = [
       pkgs.android-udev-rules # Android udev rules list
     ];
@@ -64,17 +74,9 @@
         pantheon.enable = true; # Enable Pantheon desktop environment
       };
       displayManager = {
-        defaultSession = "pantheon"; # Set GNOME as the default session
         gdm.enable = false; # Enable the GNOME display manager
         lightdm.greeters.pantheon.enable = true;
       };
-      libinput = {
-        enable = true; # Enable touchpad support.
-        touchpad = {
-          tapping = true;
-          tappingButtonMap = "lrm"; # Set the touchpad button mappeing
-        };
-      };
     };
 
     pipewire = {

profiles/iog.nix

@@ -6,7 +6,7 @@
   ...
 }: let
   sources = import ../nix/sources.nix;
-  nixVersion = (import sources.nixpkgs {}).nixVersions.nix_2_13;
+  nixVersion = (import sources.nixpkgs {}).nixVersions.latest;
 in {
   imports = [../profiles/terminal-recording.nix ../profiles/nix-direnv.nix];
 

profiles/neovim.nix

@@ -25,12 +25,10 @@
             nerdtree-git-plugin # Plugin for nerdtree showing git status
             nvim-treesitter # configurations and abstraction layer for Neovim.
             onedarkpro-nvim # Dark and light themes for Neovim
-            #statix                # Lints and suggestions for the nix programming language
             supertab # Allows you to use <Tab> for all your insert completion
             syntastic # Syntax checking hacks
             vim-terraform # tab completion, syntax highlighting, indentation
             vim-terraform-completion
-            vim-addon-nix # Scripts assisting writing .nix files
             vim-cue # Cue filetype plugin for Vim
             vim-lastplace
             vim-markdown-toc # Generate table of contents for Markdown files

profiles/nextcloud.nix

@@ -20,19 +20,20 @@
       dbpassFile = "/run/keys/nextcloud-dbpass"; # Where to find the database password
       adminpassFile = "/run/keys/nextcloud-admin"; # Where to find the admin password
       adminuser = "root"; # Set the admin user name
-      overwriteProtocol = "https"; # Force Nextcloud to always use HTTPS
-      defaultPhoneRegion = "AU"; # Country code for automatic phone-number detection
     };
     autoUpdateApps = {
       enable = true; # Run regular auto update of all apps installed
       startAt = "01:00:00"; # When to run the update
     };
-    package = pkgs.nextcloud27;
+    package = pkgs.nextcloud29;
     extraApps = with config.services.nextcloud.package.packages.apps; {
-      inherit calendar contacts deck news notes tasks twofactor_webauthn;
+      inherit calendar contacts deck gpoddersync notes tasks twofactor_webauthn;
     };
     extraAppsEnable = true;
-    appstoreEnable = true;
+    settings = {
+      default_phone_region = "AU"; # Country code for automatic phone-number detection
+      overwriteprotocol = "https"; # Force Nextcloud to always use HTTPS
+    };
   };
 
   systemd = {

profiles/nixpkgs-dev.nix

@@ -15,7 +15,7 @@
   environment = {
     systemPackages = with pkgs; [
       cabal2nix # Convert Cabal files into Nix build instructions
-      nixfmt # An opinionated formatter for Nix
+      nixfmt-rfc-style # An opinionated formatter for Nix
       nix-prefetch-github # Prefetch sources from github
       nix-prefetch-git # Prefetch sources from git
       nixpkgs-review # Review pull-requests on https://github.com/NixOS/nixpkgs

profiles/pantheon.nix

@@ -5,6 +5,7 @@
   ...
 }: {
   services = {
+    libinput.enable = true; # Enable touchpad support.
     pantheon = {
       apps.enable = true;
       contractor.enable = true;
@@ -14,7 +15,6 @@
       desktopManager = {
         pantheon.enable = true;
       };
-      libinput.enable = true; # Enable touchpad support.
     };
   };
   programs = {

profiles/xmonad.nix

@@ -8,6 +8,17 @@
 
   services = {
     devmon.enable = true; # Enable external device automounting.
+    displayManager = {
+      defaultSession = "none+xmonad"; # Set to use xmonad as default
+      sddm.enable = false; # Enable the Plasma display manager
+    };
+    libinput = {
+      enable = true; # Enable touchpad support.
+      touchpad = {
+        tapping = true;
+        tappingButtonMap = "lrm"; # Set the touchpad button mappeing
+      };
+    };
     udisks2.enable = true; # Enable udisks2.
 
     xserver = {
@@ -18,19 +29,9 @@
         plasma5.enable = true; # Enable Plasma desktop environment
       };
       displayManager = {
-        defaultSession = "none+xmonad"; # Set to use xmonad as default
         gdm.enable = false; # Enable the GNOME display manager
-        sddm.enable = false; # Enable the Plasma display manager
         lightdm.greeters.pantheon.enable = true;
       };
-      layout = "us"; # Set your preferred keyboard layout.
-      libinput = {
-        enable = true; # Enable touchpad support.
-        touchpad = {
-          tapping = true;
-          tappingButtonMap = "lrm"; # Set the touchpad button mappeing
-        };
-      };
       windowManager = {
         # Open configuration for the window manager.
         xmonad.enable = true; # Enable xmonad.
@@ -44,6 +45,7 @@
           haskellPackages.xmonad
         ];
       };
+      xkb.layout = "us"; # Set your preferred keyboard layout.
     };
   };
 

profiles/yubikey.nix

@@ -57,10 +57,10 @@
 
   programs = {
     ssh.startAgent = false; # Disable the SSH Agent
-    gnupg.agent = {
+    gnupg.agent = with pkgs; {
       enable = true; # Enable GPG Agent
       enableSSHSupport = true; # Enable SSH agent support in GnuPG agent
-      pinentryFlavor = "qt";
+      pinentryPackage = pinentry-qt;
     };
   };
 }