shell.nix: replace shellHook with env

flake.{nix,lock}: bump inputs
common/userdbd: init
2025-07-09 05:43:33 +02:00 · 2025-03-15 03:09:26 +01:00 · 2025-03-15 02:23:16 +01:00 · 2025-03-15 01:47:10 +01:00 · 2025-03-15 01:46:52 +01:00 · 2025-03-15 01:23:15 +01:00
10 changed files with 63 additions and 31 deletions
--- a/base/default.nix
+++ b/base/default.nix
@ -10,6 +10,8 @@

    ./services/acme.nix
    ./services/auto-upgrade.nix
+    ./services/dbus.nix
+    ./services/fwupd.nix
    ./services/irqbalance.nix
    ./services/logrotate.nix
    ./services/nginx.nix
@ -17,9 +19,12 @@
    ./services/postfix.nix
    ./services/smartd.nix
    ./services/thermald.nix
+    ./services/userborn.nix
+    ./services/userdbd.nix
  ];

  boot.tmp.cleanOnBoot = lib.mkDefault true;
+  boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;

  time.timeZone = "Europe/Oslo";

@ -47,6 +52,8 @@

  programs.zsh.enable = true;

+  security.lockKernelModules = true;
+  security.protectKernelImage = true;
  security.sudo.execWheelOnly = true;
  security.sudo.extraConfig = ''
    Defaults lecture = never
--- a/base/nix.nix
+++ b/base/nix.nix
@ -5,10 +5,10 @@
      automatic = true;
      options = "--delete-older-than 2d";
    };
+    optimise.automatic = true;

    settings = {
      allow-dirty = true;
-      auto-optimise-store = true;
      builders-use-substitutes = true;
      experimental-features = [ "nix-command" "flakes" ];
      log-lines = 50;
--- a/base/services/dbus.nix
+++ b/base/services/dbus.nix
@ -0,0 +1,7 @@
+{ ... }:
+{
+  services.dbus = {
+    enable = true;
+    implementation = "broker";
+  };
+}
--- a/base/services/fwupd.nix
+++ b/base/services/fwupd.nix
@ -0,0 +1,4 @@
+{ ... }:
+{
+  services.fwupd.enable = true;
+}
--- a/base/services/userborn.nix
+++ b/base/services/userborn.nix
@ -0,0 +1,4 @@
+{ ... }:
+{
+  services.userborn.enable = true;
+}
--- a/base/services/userdbd.nix
+++ b/base/services/userdbd.nix
@ -0,0 +1,4 @@
+{ ... }:
+{
+  services.userdbd.enable = true;
+}
--- a/flake.lock
+++ b/flake.lock
@ -7,11 +7,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1740485968,
-        "narHash": "sha256-WK+PZHbfDjLyveXAxpnrfagiFgZWaTJglewBWniTn2Y=",
+        "lastModified": 1741786315,
+        "narHash": "sha256-VT65AE2syHVj6v/DGB496bqBnu1PXrrzwlw07/Zpllc=",
        "owner": "nix-community",
        "repo": "disko",
-        "rev": "19c1140419c4f1cdf88ad4c1cfb6605597628940",
+        "rev": "0d8c6ad4a43906d14abd5c60e0ffe7b587b213de",
        "type": "github"
      },
      "original": {
@ -88,16 +88,16 @@
        ]
      },
      "locked": {
-        "lastModified": 1727410897,
-        "narHash": "sha256-tWsyxvf421ieWUJYgjV7m1eTdr2ZkO3vId7vmtvfFpQ=",
+        "lastModified": 1735857245,
+        "narHash": "sha256-AKLLPrgXTxgzll3DqVUMa4QlPlRN3QceutgFBmEf8Nk=",
        "owner": "dali99",
        "repo": "nixos-matrix-modules",
-        "rev": "ff787d410cba17882cd7b6e2e22cc88d4064193c",
+        "rev": "da9dc0479ffe22362793c87dc089035facf6ec4d",
        "type": "github"
      },
      "original": {
        "owner": "dali99",
-        "ref": "v0.6.1",
+        "ref": "0.7.0",
        "repo": "nixos-matrix-modules",
        "type": "github"
      }
@ -110,11 +110,11 @@
        "rev": "1b4087bd3322a2e2ba84271c8fcc013e6b641a58",
        "revCount": 2,
        "type": "git",
-        "url": "https://git.pvv.ntnu.no/Drift/minecraft-data.git"
+        "url": "https://git.pvv.ntnu.no/Projects/minecraft-kartverket.git"
      },
      "original": {
        "type": "git",
-        "url": "https://git.pvv.ntnu.no/Drift/minecraft-data.git"
+        "url": "https://git.pvv.ntnu.no/Projects/minecraft-kartverket.git"
      }
    },
    "nix-gitea-themes": {
@ -139,11 +139,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1740782485,
-        "narHash": "sha256-GkDJDqHYlPKZFdyxzZHtljxNRsosKB1GCrblqlvLFgo=",
+        "lastModified": 1741969460,
+        "narHash": "sha256-SCNxTTBfMJV7XuTcLUfdAd6cgCGsazzi+DoPrceQrZ0=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "dd5c2540983641bbaabdfc665931592d4c9989e8",
+        "rev": "68612419aa6c9fd5b178b81e6fabbdf46d300ea4",
        "type": "github"
      },
      "original": {
@ -155,11 +155,11 @@
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1740848276,
-        "narHash": "sha256-bYeI3FEs824X+MJYksKboNlmglehzplqzn+XvcojWMc=",
+        "lastModified": 1741960758,
+        "narHash": "sha256-pSGMbfkxF7TSeco54W+B1q+g22YCVp1qXHgtrdgtyR4=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "e9b0ff70ddc61c42548501b0fafb86bb49cca858",
+        "rev": "845dc1e9cbc2e48640b8968af58b4a19db67aa8f",
        "type": "github"
      },
      "original": {
@ -253,11 +253,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1739262228,
-        "narHash": "sha256-7JAGezJ0Dn5qIyA2+T4Dt/xQgAbhCglh6lzCekTVMeU=",
+        "lastModified": 1741861888,
+        "narHash": "sha256-ynOgXAyToeE1UdLNfrUn/hL7MN0OpIS2BtNdLjpjPf0=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "07af005bb7d60c7f118d9d9f5530485da5d1e975",
+        "rev": "d016ce0365b87d848a57c12ffcfdc71da7a2b55f",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@ -17,7 +17,7 @@
    pvv-calendar-bot.url = "git+https://git.pvv.ntnu.no/Projects/calendar-bot.git";
    pvv-calendar-bot.inputs.nixpkgs.follows = "nixpkgs";

-    matrix-next.url = "github:dali99/nixos-matrix-modules/v0.6.1";
+    matrix-next.url = "github:dali99/nixos-matrix-modules/0.7.0";
    matrix-next.inputs.nixpkgs.follows = "nixpkgs";

    nix-gitea-themes.url = "git+https://git.pvv.ntnu.no/oysteikt/nix-gitea-themes.git";
@ -30,7 +30,7 @@
    grzegorz-clients.url = "git+https://git.pvv.ntnu.no/Grzegorz/grzegorz-clients.git";
    grzegorz-clients.inputs.nixpkgs.follows = "nixpkgs";

-    minecraft-data.url = "git+https://git.pvv.ntnu.no/Drift/minecraft-data.git";
+    minecraft-data.url = "git+https://git.pvv.ntnu.no/Projects/minecraft-kartverket.git";
  };

  outputs = { self, nixpkgs, nixpkgs-unstable, sops-nix, disko, ... }@inputs:
--- a/misc/builder.nix
+++ b/misc/builder.nix
@ -2,4 +2,10 @@

 {
  nix.settings.trusted-users = [ "@nix-builder-users" ];
+  nix.daemonCPUSchedPolicy = "batch";
+
+  boot.binfmt.emulatedSystems = [
+    "aarch64-linux"
+    "armv7l-linux"
+  ];
 }
--- a/shell.nix
+++ b/shell.nix
@ -11,14 +11,14 @@ pkgs.mkShellNoCC {
    editorconfig-checker
  ];

-  shellHook = ''
-    export OS_AUTH_URL=https://api.stack.it.ntnu.no:5000
-    export OS_PROJECT_ID=b78432a088954cdc850976db13cfd61c
-    export OS_PROJECT_NAME="STUDORG_Programvareverkstedet"
-    export OS_USER_DOMAIN_NAME="NTNU"
-    export OS_PROJECT_DOMAIN_ID="d3f99bcdaf974685ad0c74c2e5d259db"
-    export OS_REGION_NAME="NTNU-IT"
-    export OS_INTERFACE=public
-    export OS_IDENTITY_API_VERSION=3
-  '';
+  env = {
+    OS_AUTH_URL = "https://api.stack.it.ntnu.no:5000";
+    OS_PROJECT_ID = "b78432a088954cdc850976db13cfd61c";
+    OS_PROJECT_NAME = "STUDORG_Programvareverkstedet";
+    OS_USER_DOMAIN_NAME = "NTNU";
+    OS_PROJECT_DOMAIN_ID = "d3f99bcdaf974685ad0c74c2e5d259db";
+    OS_REGION_NAME = "NTNU-IT";
+    OS_INTERFACE = "public";
+    OS_IDENTITY_API_VERSION = "3";
+  };
 }
Author	SHA1	Message	Date
h7x4	069da36895	shell.nix: replace shellHook with env	2025-03-15 03:09:26 +01:00
h7x4	83f83a91b7	flake.{nix,lock}: bump inputs	2025-03-15 02:23:16 +01:00
h7x4	6372a4111e	common/userdbd: init	2025-03-15 01:47:10 +01:00
h7x4	bdfb7384c2	common/userborn: init	2025-03-15 01:46:52 +01:00
h7x4	ace351c0a7	misc/builder: add binfmt systems	2025-03-15 01:23:15 +01:00
h7x4	cd5c2c0e01	misc/builder: set cpu sched policy batch	2025-03-15 01:21:57 +01:00
h7x4	2be9eb16fe	base/nix: defer store optimization	2025-03-15 01:20:34 +01:00
h7x4	64bd33a213	base: enable fwupd	2025-03-15 01:19:59 +01:00
h7x4	7b5e114944	base: use dbus-broker as dbus implementation	2025-03-15 01:19:33 +01:00
h7x4	ee8965e18c	base: use latest kernel by default	2025-03-15 01:18:28 +01:00