Merge branch 'main' of ssh://grimmauld.de:2222/Grimmauld/grimm-nixos-laptop

common/gaming.nix

@@ -6,7 +6,7 @@
 }:
 let
   inherit (config.grimmShared) enable gaming;
-  inherit (lib) mkIf getExe mkEnableOption;
+  inherit (lib) mkIf getExe mkEnableOption optional;
 in
 {
   config = mkIf (enable && gaming) {
@@ -45,6 +45,8 @@ in
       prismlauncher
       mangohud
       the-powder-toy
+      factorio
+      pactorio
       (symlinkJoin {
         name = "osu";
         paths = [
@@ -54,7 +56,7 @@ in
           osu-lazer-bin
         ];
       })
-    ];
+    ] ++ optional (factorio.passthru.updateScript != null) factorio;
   };
 
   options.grimmShared.gaming = mkEnableOption "enables steam, heroic, prism and gamemoded";

common/graphics/fonts.nix

@@ -14,7 +14,7 @@ in
         noto-fonts
         noto-fonts-cjk
         font-awesome
-#        noto-fonts-emoji
+        #        noto-fonts-emoji
         noto-fonts-monochrome-emoji
         roboto
         liberation_ttf

common/hardware/laptop.nix

@@ -65,7 +65,7 @@ in
         "sd_mod"
       ];
       loader.systemd-boot.enable = true;
-#      extraModulePackages = [ config.boot.kernelPackages.ddcci-driver ];
+      #      extraModulePackages = [ config.boot.kernelPackages.ddcci-driver ];
       kernelModules = [
         "ddcci_backlight"
         "i2c-dev"

common/tooling/git.nix

@@ -47,7 +47,13 @@ in
         push.autoSetupRemote = true;
         core.autocrlf = "input";
         commit.gpgsign = true;
-        pull.rebase = true;
+        core.excludesfile = (pkgs.writeText ".gitignore" ''
+          .idea
+          .obsidian
+          *~
+          result
+        '');
+        pull.rebase = false;
         include.path = "${pkgs.delta.src}/themes.gitconfig";
 
         core.pager = "delta";

common/tooling/python.nix

@@ -35,13 +35,15 @@ in
 
     programs.xonsh = {
       enable = true;
-      config = ''
+      config =
-        execx($(${getExe pkgs.starship} init xonsh))
+        ''
-      '' + concatLines (
+          execx($(${getExe pkgs.starship} init xonsh))
-        mapAttrsToList (
+        ''
-          name: value: "aliases[\"${name}\"] = '''${value}'''"
+        + concatLines (
-        ) config.environment.shellAliases
+          mapAttrsToList (
-      );
+            name: value: "aliases[\"${name}\"] = '''${value}'''"
+          ) config.environment.shellAliases
+        );
       # package = pkgs.xonsh.wrapper.override { extraPackages = pyLibs; };
     };
 

common/tooling/rust.nix

@@ -25,9 +25,7 @@ in
       ]
       ++ optionals graphical [ jetbrains.clion ];
 
-    grimmShared.tooling.nvim.plugins = with pkgs.vimPlugins; [
+    grimmShared.tooling.nvim.plugins = with pkgs.vimPlugins; [ rustaceanvim ];
-      rustaceanvim
-    ];
 
     grimmShared.tooling.lang_servers = [
       {

fake_flake.nix

@@ -103,11 +103,15 @@ in
     in
     {
       hostPlatform = system;
-      pkgs = if (nixpkgs_patches != []) then (import (applyPatches {
+      pkgs =
-        name = "nixpkgs-patched";
+        if (nixpkgs_patches != [ ]) then
-        inherit src;
+          (import (applyPatches {
-        patches = map fetchpatch nixpkgs_patches;
+            name = "nixpkgs-patched";
-      }) { inherit config; }) else unpatched;
+            inherit src;
+            patches = map fetchpatch nixpkgs_patches;
+          }) { inherit config; })
+        else
+          unpatched;
 
       overlays = [
         (import (

modules/auth.nix

@@ -75,11 +75,14 @@ in
     in
     {
       enable = true;
-      urlList = [ "ldap:///" "ldapi:///" ];
+      urlList = [
+        "ldap:///"
+        "ldapi:///"
+      ];
 
-#      declarativeContents = {
+      #      declarativeContents = {
-#        "${localDc}" = import ./ldapConf.nix { inherit localDc; };
+      #        "${localDc}" = import ./ldapConf.nix { inherit localDc; };
-#      };
+      #      };
 
       settings = {
         attrs = {
@@ -105,7 +108,7 @@ in
             olcSuffix = localDc;
 
             olcRootDN = "cn=admin,${localDc}";
-#            olcRootPW.path = config.age.secrets.openldap_admin.path;
+            #            olcRootPW.path = config.age.secrets.openldap_admin.path;
             olcRootPW = "{SSHA}D1U1E6Xz07DGYLjke1YcCsVF6ddSLyLr";
 
             olcAccess = [

nix/sources.json

@@ -29,10 +29,10 @@
         "homepage": "https://nyx.chaotic.cx",
         "owner": "chaotic-cx",
         "repo": "nyx",
-        "rev": "fef678d1e1dbefdfbbf72eb6ef28b534af0bc403",
+        "rev": "a6f43e450d97eece8757e6cb6136f4cd4f141a3b",
-        "sha256": "0sic6ick1pc7xicyyjwfbcgc0lynd1kc2plffxa9iskcl6czpw61",
+        "sha256": "1l38vn7hahnl5x0m8kk4x1rqiig1divhja8cs9iqq466h7q1prdv",
         "type": "tarball",
-        "url": "https://github.com/chaotic-cx/nyx/archive/fef678d1e1dbefdfbbf72eb6ef28b534af0bc403.tar.gz",
+        "url": "https://github.com/chaotic-cx/nyx/archive/a6f43e450d97eece8757e6cb6136f4cd4f141a3b.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "glibc-eac": {
@@ -50,13 +50,13 @@
     "lix-module": {
         "branch": "main",
         "repo": "https://git.lix.systems/lix-project/nixos-module.git",
-        "rev": "18fa4a89e208cb8e881f5f71c75bbd4c1c2fd37d",
+        "rev": "38f31ee7c1a60adae58833789dd855c128b056c6",
         "type": "git"
     },
     "lix-pkg": {
         "branch": "main",
         "repo": "https://git.lix.systems/lix-project/lix.git",
-        "rev": "dd53bce476805b41f2e9858e64e38574a88db77f",
+        "rev": "71b32bb87cd48dbbd672c8ca6b041ed36f3bae11",
         "type": "git"
     },
     "nixos-mailserver": {

overlays/default.nix

@@ -31,5 +31,6 @@
         ./confwhich.nix
         ./rfindup.nix
         ./glibc-eac.nix
+        ./factorio.nix
       ];
 }

overlays/factorio.nix

@@ -0,0 +1,9 @@
+{ lib, prev, ... }:
+let
+  loginFile = ./factorioLogin.nix;
+in
+{
+  factorio = prev.factorio.override (
+    { } // lib.optionalAttrs (builtins.pathExists loginFile) (import loginFile)
+  );
+}

overlays/glibc-eac.nix

@@ -1,12 +1,12 @@
-{ prev, ... }: let
+{ prev, ... }:
+let
   nivSources = import ../nix/sources.nix;
-  glibc_patches = [
+  glibc_patches = [ "rogue_company_reverts.patch" ];
-    "rogue_company_reverts.patch"
-  ];
 in
 {
-  glibc-eac = prev.glibc.overrideAttrs(old: {
+  glibc-eac = prev.glibc.overrideAttrs (old: {
-    patches = (
+    patches =
+      (
         let
           oldPatches = old.patches or [ ];
         in