Compare commits
No commits in common. "9bfa21d6ea80da2516edccb4283e0089490f8844" and "ba837aaa1723bba1cecc8c4061c255d2fbf39bfa" have entirely different histories.
9bfa21d6ea
...
ba837aaa17
12 changed files with 36 additions and 61 deletions
|
|
@ -6,7 +6,7 @@
|
|||
}:
|
||||
let
|
||||
inherit (config.grimmShared) enable gaming;
|
||||
inherit (lib) mkIf getExe mkEnableOption optional;
|
||||
inherit (lib) mkIf getExe mkEnableOption;
|
||||
in
|
||||
{
|
||||
config = mkIf (enable && gaming) {
|
||||
|
|
@ -45,8 +45,6 @@ in
|
|||
prismlauncher
|
||||
mangohud
|
||||
the-powder-toy
|
||||
factorio
|
||||
pactorio
|
||||
(symlinkJoin {
|
||||
name = "osu";
|
||||
paths = [
|
||||
|
|
@ -56,7 +54,7 @@ in
|
|||
osu-lazer-bin
|
||||
];
|
||||
})
|
||||
] ++ optional (factorio.passthru.updateScript != null) factorio;
|
||||
];
|
||||
};
|
||||
|
||||
options.grimmShared.gaming = mkEnableOption "enables steam, heroic, prism and gamemoded";
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -47,13 +47,7 @@ in
|
|||
push.autoSetupRemote = true;
|
||||
core.autocrlf = "input";
|
||||
commit.gpgsign = true;
|
||||
core.excludesfile = (pkgs.writeText ".gitignore" ''
|
||||
.idea
|
||||
.obsidian
|
||||
*~
|
||||
result
|
||||
'');
|
||||
pull.rebase = false;
|
||||
pull.rebase = true;
|
||||
include.path = "${pkgs.delta.src}/themes.gitconfig";
|
||||
|
||||
core.pager = "delta";
|
||||
|
|
|
|||
|
|
@ -35,15 +35,13 @@ in
|
|||
|
||||
programs.xonsh = {
|
||||
enable = true;
|
||||
config =
|
||||
''
|
||||
execx($(${getExe pkgs.starship} init xonsh))
|
||||
''
|
||||
+ concatLines (
|
||||
mapAttrsToList (
|
||||
name: value: "aliases[\"${name}\"] = '''${value}'''"
|
||||
) config.environment.shellAliases
|
||||
);
|
||||
config = ''
|
||||
execx($(${getExe pkgs.starship} init xonsh))
|
||||
'' + concatLines (
|
||||
mapAttrsToList (
|
||||
name: value: "aliases[\"${name}\"] = '''${value}'''"
|
||||
) config.environment.shellAliases
|
||||
);
|
||||
# package = pkgs.xonsh.wrapper.override { extraPackages = pyLibs; };
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -25,7 +25,9 @@ in
|
|||
]
|
||||
++ optionals graphical [ jetbrains.clion ];
|
||||
|
||||
grimmShared.tooling.nvim.plugins = with pkgs.vimPlugins; [ rustaceanvim ];
|
||||
grimmShared.tooling.nvim.plugins = with pkgs.vimPlugins; [
|
||||
rustaceanvim
|
||||
];
|
||||
|
||||
grimmShared.tooling.lang_servers = [
|
||||
{
|
||||
|
|
|
|||
|
|
@ -103,15 +103,11 @@ in
|
|||
in
|
||||
{
|
||||
hostPlatform = system;
|
||||
pkgs =
|
||||
if (nixpkgs_patches != [ ]) then
|
||||
(import (applyPatches {
|
||||
name = "nixpkgs-patched";
|
||||
inherit src;
|
||||
patches = map fetchpatch nixpkgs_patches;
|
||||
}) { inherit config; })
|
||||
else
|
||||
unpatched;
|
||||
pkgs = if (nixpkgs_patches != []) then (import (applyPatches {
|
||||
name = "nixpkgs-patched";
|
||||
inherit src;
|
||||
patches = map fetchpatch nixpkgs_patches;
|
||||
}) { inherit config; }) else unpatched;
|
||||
|
||||
overlays = [
|
||||
(import (
|
||||
|
|
|
|||
|
|
@ -75,14 +75,11 @@ in
|
|||
in
|
||||
{
|
||||
enable = true;
|
||||
urlList = [
|
||||
"ldap:///"
|
||||
"ldapi:///"
|
||||
];
|
||||
urlList = [ "ldap:///" "ldapi:///" ];
|
||||
|
||||
# declarativeContents = {
|
||||
# "${localDc}" = import ./ldapConf.nix { inherit localDc; };
|
||||
# };
|
||||
# declarativeContents = {
|
||||
# "${localDc}" = import ./ldapConf.nix { inherit localDc; };
|
||||
# };
|
||||
|
||||
settings = {
|
||||
attrs = {
|
||||
|
|
@ -108,7 +105,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 = [
|
||||
|
|
|
|||
|
|
@ -29,10 +29,10 @@
|
|||
"homepage": "https://nyx.chaotic.cx",
|
||||
"owner": "chaotic-cx",
|
||||
"repo": "nyx",
|
||||
"rev": "a6f43e450d97eece8757e6cb6136f4cd4f141a3b",
|
||||
"sha256": "1l38vn7hahnl5x0m8kk4x1rqiig1divhja8cs9iqq466h7q1prdv",
|
||||
"rev": "fef678d1e1dbefdfbbf72eb6ef28b534af0bc403",
|
||||
"sha256": "0sic6ick1pc7xicyyjwfbcgc0lynd1kc2plffxa9iskcl6czpw61",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/chaotic-cx/nyx/archive/a6f43e450d97eece8757e6cb6136f4cd4f141a3b.tar.gz",
|
||||
"url": "https://github.com/chaotic-cx/nyx/archive/fef678d1e1dbefdfbbf72eb6ef28b534af0bc403.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": "38f31ee7c1a60adae58833789dd855c128b056c6",
|
||||
"rev": "18fa4a89e208cb8e881f5f71c75bbd4c1c2fd37d",
|
||||
"type": "git"
|
||||
},
|
||||
"lix-pkg": {
|
||||
"branch": "main",
|
||||
"repo": "https://git.lix.systems/lix-project/lix.git",
|
||||
"rev": "71b32bb87cd48dbbd672c8ca6b041ed36f3bae11",
|
||||
"rev": "dd53bce476805b41f2e9858e64e38574a88db77f",
|
||||
"type": "git"
|
||||
},
|
||||
"nixos-mailserver": {
|
||||
|
|
|
|||
|
|
@ -31,6 +31,5 @@
|
|||
./confwhich.nix
|
||||
./rfindup.nix
|
||||
./glibc-eac.nix
|
||||
./factorio.nix
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +0,0 @@
|
|||
{ lib, prev, ... }:
|
||||
let
|
||||
loginFile = ./factorioLogin.nix;
|
||||
in
|
||||
{
|
||||
factorio = prev.factorio.override (
|
||||
{ } // lib.optionalAttrs (builtins.pathExists loginFile) (import loginFile)
|
||||
);
|
||||
}
|
||||
|
|
@ -1,12 +1,12 @@
|
|||
{ prev, ... }:
|
||||
let
|
||||
{ prev, ... }: let
|
||||
nivSources = import ../nix/sources.nix;
|
||||
glibc_patches = [ "rogue_company_reverts.patch" ];
|
||||
glibc_patches = [
|
||||
"rogue_company_reverts.patch"
|
||||
];
|
||||
in
|
||||
{
|
||||
glibc-eac = prev.glibc.overrideAttrs (old: {
|
||||
patches =
|
||||
(
|
||||
glibc-eac = prev.glibc.overrideAttrs(old: {
|
||||
patches = (
|
||||
let
|
||||
oldPatches = old.patches or [ ];
|
||||
in
|
||||
|
|
|
|||
Loading…
Reference in a new issue