nix on kil

kili/configuration.nix

@@ -1,27 +1,20 @@
-# Edit this configuration file to define what should be installed on
-# your system.  Help is available in the configuration.nix(5) man page
-# and in the NixOS manual (accessible by running ‘nixos-help’).
-
-{ config, pkgs, ... }:
-
 {
-  imports =
-    [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
-    ];
+  pkgs,
+  flakes,
+  config,
+  ...
+}:
+{
+  imports = [
+    ./hardware-configuration.nix
+    ../default-machine-config.nix
+    ../programs/kanata/system.nix
+  ];
 
-  # Bootloader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
-  networking.hostName = "nixos"; # Define your hostname.
-  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
-
-  # Configure network proxy if necessary
-  # networking.proxy.default = "http://user:password@proxy:port/";
-  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
-
-  # Enable networking
+  networking.hostName = "kili";
   networking.networkmanager.enable = true;
 
   # Set your time zone.
@@ -42,58 +35,133 @@
     LC_TIME = "nl_NL.UTF-8";
   };
 
-  # Configure keymap in X11
   services.xserver.xkb = {
     layout = "us";
     variant = "";
   };
 
-  # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.jana = {
     isNormalUser = true;
     description = "jana";
-    extraGroups = [ "networkmanager" "wheel" ];
-    packages = with pkgs; [];
+    extraGroups = [
+      "networkmanager"
+      "wheel"
+    ];
+    packages = with pkgs; [ ];
   };
 
-  # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
 
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
-    vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
-    wget
-    git
+
+    firefox
+    kitty
+    pkgs.custom.niri
+    zed-editor
+    signal-desktop
+    discord
+    nautilus
+
+    adwaita-icon-theme
+    (pkgs.callPackage (
+      { stdenv }:
+      stdenv.mkDerivation {
+        name = "global-cursor-theme";
+        unpackPhase = "true";
+        outputs = [ "out" ];
+        installPhase = ''
+          mkdir -p $out/share/icons/default
+          cat << EOF > $out/share/icons/default/index.theme
+          [Icon Theme]
+          Name=Default
+          Comment=Default Cursor Theme
+          Inherits=Adwaita
+          EOF
+        '';
+      }
+    ) { })
   ];
 
-  nix.settings.experimental-features = ["nix-command" "flakes"];
+  services.xserver.enable = true;
+  services.displayManager.gdm.enable = true;
+  services.desktopManager.gnome.enable = true;
+
+  services.gnome.gnome-keyring.enable = true;
+  services.gvfs.enable = true;
+  services.displayManager.sessionPackages = [ pkgs.custom.niri ];
+  programs.dconf.enable = true;
+
+  nix.settings.experimental-features = [
+    "nix-command"
+    "flakes"
+  ];
+
+  services.xserver.videoDrivers = [
+    "modesetting"
+    "nvidia"
+  ];
+
+  hardware.graphics.enable = true;
+  hardware.graphics.extraPackages = [ pkgs.libva-vdpau-driver ];
+  hardware.nvidia = {
+    modesetting.enable = true;
+    powerManagement.enable = true;
+    powerManagement.finegrained = false;
+
+    # use nvidia opensource driver (not nouveau!!)
+    open = true;
+    nvidiaSettings = true;
+
+    prime = {
+      offload = {
+        enable = true;
+        enableOffloadCmd = true;
+      };
+
+      intelBusId = "PCI:0@00:02:0";
+      nvidiaBusId = "PCI:0@01:00:0";
+    };
+
+    package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
+      version = "580.95.05";
+      sha256_64bit = "sha256-hJ7w746EK5gGss3p8RwTA9VPGpp2lGfk5dlhsv4Rgqc=";
+      sha256_aarch64 = "sha256-zLRCbpiik2fGDa+d80wqV3ZV1U1b4lRjzNQJsLLlICk=";
+      openSha256 = "sha256-RFwDGQOi9jVngVONCOB5m/IYKZIeGEle7h0+0yGnBEI=";
+      settingsSha256 = "sha256-F2wmUEaRrpR1Vz0TQSwVK4Fv13f3J9NJLtBe4UP2f14=";
+      persistencedSha256 = "sha256-QCwxXQfG/Pa7jSTBB0xD3lsIofcerAWWAHKvWjWGQtg=";
+      patchesOpen = [
+        (pkgs.fetchpatch {
+          name = "get_dev_pagemap.patch";
+          url = "https://github.com/NVIDIA/open-gpu-kernel-modules/commit/3e230516034d29e84ca023fe95e284af5cd5a065.patch";
+          hash = "sha256-BhL4mtuY5W+eLofwhHVnZnVf0msDj7XBxskZi8e6/k8=";
+        })
+      ];
+    };
+  };
 
-  # Some programs need SUID wrappers, can be configured further or are
-  # started in user sessions.
   # programs.mtr.enable = true;
   # programs.gnupg.agent = {
   #   enable = true;
   #   enableSSHSupport = true;
   # };
 
-  # List services that you want to enable:
+  nix.settings = {
+    # users that can interact with nix
+    trusted-users = [
+      "jana"
+      "root"
+    ];
+  };
 
-  # Enable the OpenSSH daemon.
-  # services.openssh.enable = true;
-
-  # Open ports in the firewall.
-  # networking.firewall.allowedTCPPorts = [ ... ];
-  # networking.firewall.allowedUDPPorts = [ ... ];
-  # Or disable the firewall altogether.
-  # networking.firewall.enable = false;
-
-  # This value determines the NixOS release from which the default
-  # settings for stateful data, like file locations and database versions
-  # on your system were taken. It‘s perfectly fine and recommended to leave
-  # this value at the release version of the first install of this system.
-  # Before changing this value read the documentation for this option
-  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "25.11"; # Did you read the comment?
+  home-manager = {
+    useGlobalPkgs = true;
+    useUserPackages = true;
+    users.jana = ./home.nix;
 
+    extraSpecialArgs = {
+      inherit flakes;
+    };
+  };
 }