From cc21d22565ec15f12cc9e7ce93da5d1b789ecc2e Mon Sep 17 00:00:00 2001
From: Dustin Frisch <fooker@lab.sh>
Date: Tue, 19 Nov 2024 11:16:00 +0100
Subject: [PATCH] all: update

---
 client/desktop.nix  | 27 +++++++++++++----------
 client/gpu.nix      | 21 +++++++++++-------
 client/hardware.nix | 19 ++++++++---------
 client/programs.nix | 52 +++++++++++++++++++++++++++++++++++++++------
 flake.lock          |  8 +++----
 flake.nix           |  2 +-
 6 files changed, 88 insertions(+), 41 deletions(-)

diff --git a/client/desktop.nix b/client/desktop.nix
index f0b4a72..93f87d7 100644
--- a/client/desktop.nix
+++ b/client/desktop.nix
@@ -6,15 +6,11 @@
       enable = true;
 
       displayManager = {
-        lightdm = {
+        gdm = {
           enable = true;
-          greeters.slick.enable = true;
+          wayland = true;
 
-          extraSeatDefaults = ''
-            greeter-show-manual-login=true
-            greeter-hide-users=true
-            allow-guest=false
-          '';
+          autoSuspend = false;
         };
       };
 
@@ -31,7 +27,6 @@
     };
 
     displayManager = {
-      defaultSession = "gnome";
       logToFile = true;
     };
 
@@ -47,9 +42,9 @@
     epiphany
     gnome-online-accounts-gtk
     gnome-tour
-    gnome.geary
-    gnome.gnome-calendar
-    gnome.gnome-contacts
+    geary
+    gnome-calendar
+    gnome-contacts
     xterm
   ];
 
@@ -68,6 +63,16 @@
         };
       }
     ];
+
+    profiles.gdm.databases = [
+      {
+        settings = {
+          "org/gnome/login-screen" = {
+            disable-user-list = true;
+          };
+        };
+      }
+    ];
   };
 }
 
diff --git a/client/gpu.nix b/client/gpu.nix
index f4698bf..04f2142 100644
--- a/client/gpu.nix
+++ b/client/gpu.nix
@@ -1,16 +1,21 @@
 { config, ... }:
 
 {
-  hardware.opengl = {
-    enable = true;
-    driSupport32Bit = true;
-  };
+  hardware = {
+    graphics = {
+      enable = true;
+      enable32Bit = true;
+    };
+
+    nvidia = {
+      open = true;
+
+      modesetting.enable = true;
+      powerManagement.enable = false;
 
-  hardware.nvidia = {
-    modesetting.enable = true;
-    powerManagement.enable = false;
+      package = config.boot.kernelPackages.nvidiaPackages.stable;
+    };
 
-    package = config.boot.kernelPackages.nvidiaPackages.stable;
   };
 
   services.xserver.videoDrivers = [ "nvidia" ];
diff --git a/client/hardware.nix b/client/hardware.nix
index 191375d..005a8e1 100644
--- a/client/hardware.nix
+++ b/client/hardware.nix
@@ -12,11 +12,11 @@
       grub.enable = true;
     };
 
-    #consoleLogLevel = 3;
+    consoleLogLevel = 3;
 
     initrd = {
-      #systemd.enable = true;
-      #verbose = true;
+      systemd.enable = true;
+      verbose = true;
       availableKernelModules = [
         "xhci_pci"
         "ahci"
@@ -28,15 +28,14 @@
     kernelModules = [ "kvm-intel" ];
 
     kernelParams = [
-      #"quiet"
-      #"udev.log_level=3"
-      "log_level=4"
+      "quiet"
+      "udev.log_level=3"
     ];
 
-    #plymouth = {
-    #  enable = true;
-    #  theme = "bgrt";
-    #};
+    plymouth = {
+      enable = true;
+      theme = "bgrt";
+    };
   };
 
   hardware.enableRedistributableFirmware = true;
diff --git a/client/programs.nix b/client/programs.nix
index 9a935ec..1f2ac15 100644
--- a/client/programs.nix
+++ b/client/programs.nix
@@ -1,19 +1,25 @@
-{ pkgs, ... }:
+{ pkgs, lib, ... }:
+
+with lib;
 
 {
   programs = {
-    vim.defaultEditor = true;
-#    zsh = {
-#      enable = true;
-#      autosuggestions.enable = true;
-#      syntaxHighlighting.enable = true;
-#    };
+    vim = {
+      enable = true;
+      defaultEditor = true;
+    };
+
     chromium.enable = true;
     firefox.enable = true;
     fish.enable = true;
     git.enable = true;
     htop.enable = true;
     mtr.enable = true;
+
+    appimage = {
+      enable = true;
+      binfmt = true;
+    };
   };
 
   environment.systemPackages = with pkgs; [
@@ -23,6 +29,38 @@
     fd
     ripgrep
     vscode
+    vim
+    tmux
+    wget
+    curl
+    perl
+    nano
+    bash
+    git
+
+    autoconf
+    automake
+    pkg-config
+    coreutils
+    flex
+    gcc
+    gdb
+    gnumake
+
+    openmpi
+    hwloc
+
+    postgresql
+    (getDev postgresql)
+    (getLib postgresql)
+
+    python3
+
+    qt5.full
+
+    rstudio
+    quarto
+    conda
   ];
 }
 
diff --git a/flake.lock b/flake.lock
index 2868d6a..e630c2d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -361,16 +361,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1730963269,
-        "narHash": "sha256-rz30HrFYCHiWEBCKHMffHbMdWJ35hEkcRVU0h7ms3x0=",
+        "lastModified": 1731755305,
+        "narHash": "sha256-v5P3dk5JdiT+4x69ZaB18B8+Rcu3TIOrcdG4uEX7WZ8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "83fb6c028368e465cd19bb127b86f971a5e41ebc",
+        "rev": "057f63b6dc1a2c67301286152eb5af20747a9cb4",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-24.05",
+        "ref": "nixos-24.11",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 1f94d2f..7ed7252 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,6 +1,6 @@
 {
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
 
     flake-utils.url = "github:numtide/flake-utils";