profiles/desktop_common.nix

@@ -47,16 +47,6 @@
       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
     ];
@@ -74,9 +64,17 @@
         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/neovim.nix

@@ -25,10 +25,12 @@
             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,6 +20,8 @@
       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
@@ -31,10 +33,6 @@
     };
     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 = {