Grimmauld/grimm-nixos-laptop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Grimmauld:2bff480d764270c6f771e43c1e2178d7746ebab9
Branches Tags
Grimmauld:main
Grimmauld:server-migration
..
compare: Grimmauld:9524fabb8586b180e9d9595d902cd3810e67401c
Branches Tags
Grimmauld:main
Grimmauld:server-migration

No commits in common. "2bff480d764270c6f771e43c1e2178d7746ebab9" and "9524fabb8586b180e9d9595d902cd3810e67401c" have entirely different histories.
2bff480d76 ... 9524fabb85

15 changed files with 31 additions and 127 deletions
Show Stats Expand all files Collapse all files

2
common/gaming.nix
View File

@ -39,8 +39,6 @@ in
};
};
programs.the-honkers-railway-launcher.enable = true;
services.udev.packages = [ pkgs.wooting-udev-rules ];
environment.sessionVariables = {

2
common/graphics/fonts.nix
View File

@ -18,7 +18,7 @@ in
noto-fonts-monochrome-emoji
roboto
liberation_ttf
# nerdfonts
nerdfonts
];
fontDir.enable = true;

6
common/graphics/opengl.nix
View File

@ -39,10 +39,10 @@ in
{
config = mkIf (enable && graphical) {
# Enable OpenGL
hardware.graphics = {
hardware.opengl = {
enable = true;
#driSupport = true;
#driSupport32Bit = true;
driSupport = true;
driSupport32Bit = true;
extraPackages = [ ];
};

5
common/network/default.nix
View File

@ -9,10 +9,7 @@ let
in
{
config = lib.mkIf (enable && network) {
networking.networkmanager = {
enable = true;
plugins = with pkgs; [ networkmanager-openvpn ];
};
networking.networkmanager.enable = true;
networking.useDHCP = lib.mkDefault true;
hardware.bluetooth.enable = lib.mkDefault laptop_hardware.enable;

1
common/sound/default.nix
View File

@ -9,6 +9,7 @@ let
in
{
config = lib.mkIf (enable && sound.enable) {
sound.enable = true;
hardware.pulseaudio.enable = false;
services.pipewire = {

2
common/tooling/default.nix
View File

@ -58,14 +58,12 @@ in
parted
expect
gptfdisk
]
++ optionals graphical [
wev
qdirstat
libva-utils
gparted
bottles
];
environment.shellAliases = {

3
common/tooling/helix.nix
View File

@ -10,7 +10,6 @@ let
mkOption
types
getExe
getExe'
mkIf
;
inherit (pkgs)
@ -57,7 +56,7 @@ in
{
config = mkIf (enable && tooling.enable) {
environment.systemPackages = [ helix-wrapped ];
environment.sessionVariables.EDITOR = getExe' helix-wrapped "hx";
environment.sessionVariables.EDITOR = getExe helix-wrapped;
programs.helix.config = {
editor.cursor-shape.insert = "bar";

2
common/tooling/python.nix
View File

@ -53,7 +53,7 @@ in
name: value: "aliases[\"${name}\"] = '''${value}'''"
) config.environment.shellAliases
);
package = pkgs.xonsh.override { extraPackages = pyLibs; };
# package = pkgs.xonsh.wrapper.override { extraPackages = pyLibs; };
};
grimmShared.tooling.lang_servers = [

10
fake_flake.nix
View File

@ -44,8 +44,6 @@ in
"${nivSources.nixos-mailserver}/default.nix"
"${nivSources.nixos-matrix-modules}/module.nix"
(builtins.getFlake (asGithubRef nivSources.aagl-gtk-on-nix)).nixosModules.default
# fixme: ideally we'd not rely on the flake syntax to load the module
(builtins.getFlake (asGithubRef nivSources.chaotic)).nixosModules.default
# (builtins.getFlake (asGithubRef nivSources.nixos-matrix-modules)).nixosModules.default
@ -101,10 +99,6 @@ in
config = {
allowUnfree = true;
permittedInsecurePackages = [
"olm-3.2.16"
"jitsi-meet-1.0.8043"
];
};
in
{
@ -120,7 +114,7 @@ in
unpatched;
overlays = [
# (import "${nivSources.lix-module}/overlay.nix" { lix = nivSources.lix-pkg; })
(import "${nivSources.lix-module}/overlay.nix" { lix = nivSources.lix-pkg; })
(final: prev: { agenix = final.callPackage "${nivSources.agenix}/pkgs/agenix.nix" { }; })
];
};
@ -133,13 +127,11 @@ in
nix.settings.extra-substituters = [
"https://cache.lix.systems"
"https://nyx.chaotic.cx/"
"https://ezkea.cachix.org"
];
nix.settings.trusted-public-keys = [
"cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="
"nyx.chaotic.cx-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8="
"chaotic-nyx.cachix.org-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8="
"ezkea.cachix.org-1:ioBmUbJTZIKsHmWWXPe1FSFbeVe+afhfgqgTSNd34eI="
];
}

48
nix/sources.json
View File

@ -1,26 +1,14 @@
{
"aagl-gtk-on-nix": {
"branch": "main",
"description": "Run an-anime-game-launcher GTK version on Nix/NixOS!",
"homepage": null,
"owner": "ezKEa",
"repo": "aagl-gtk-on-nix",
"rev": "49e1dd54d3ac9b858d3be597a2fbc48ab67fa6e8",
"sha256": "1275gl2ly0iaqapxwimsbnky9fzwa0x3miscz372qa74gcc0wjwv",
"type": "tarball",
"url": "https://github.com/ezKEa/aagl-gtk-on-nix/archive/49e1dd54d3ac9b858d3be597a2fbc48ab67fa6e8.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"agenix": {
"branch": "main",
"description": "age-encrypted secrets for NixOS and Home manager",
"homepage": "https://matrix.to/#/#agenix:nixos.org",
"owner": "ryantm",
"repo": "agenix",
"rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41",
"sha256": "1x8nd8hvsq6mvzig122vprwigsr3z2skanig65haqswn7z7amsvg",
"rev": "3a56735779db467538fb2e577eda28a9daacaca6",
"sha256": "1h66zapc6im07k3kcgvhy3lhzahb70vd6m2ijhz4i0v6mn5l3fk9",
"type": "tarball",
"url": "https://github.com/ryantm/agenix/archive/f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41.tar.gz",
"url": "https://github.com/ryantm/agenix/archive/3a56735779db467538fb2e577eda28a9daacaca6.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"authentik-nix": {
@ -29,10 +17,10 @@
"homepage": "",
"owner": "nix-community",
"repo": "authentik-nix",
"rev": "f1bd855c23e73e04597695ca37ae54671a7e07b1",
"sha256": "1dkp86mr2n0h4hq74wj3b0b9ka8x2xkwv8pcbwk5knhrv26qajwb",
"rev": "bb756751b02b3138a2cba58064a28ddc6f2648df",
"sha256": "118jnqj0pxvwx7kaz6im9g4ys8sgm1xslz4figqq4nq417vjh86p",
"type": "tarball",
"url": "https://github.com/nix-community/authentik-nix/archive/f1bd855c23e73e04597695ca37ae54671a7e07b1.tar.gz",
"url": "https://github.com/nix-community/authentik-nix/archive/bb756751b02b3138a2cba58064a28ddc6f2648df.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"chaotic": {
@ -41,10 +29,10 @@
"homepage": "https://nyx.chaotic.cx",
"owner": "chaotic-cx",
"repo": "nyx",
"rev": "38451822a144faa53a7ee96d4f0478d94945b67a",
"sha256": "08rcfarlda0fxgc02xdfyk8dsp18bmiyf0n39sfd5nq1s5513awy",
"rev": "0e99464b8956307678b60ec7540e6cad730ee825",
"sha256": "1ksi4pssnxaa1pmxdk25gpbciaffjr5py3hdw0ifr0zcs8z22hyy",
"type": "tarball",
"url": "https://github.com/chaotic-cx/nyx/archive/38451822a144faa53a7ee96d4f0478d94945b67a.tar.gz",
"url": "https://github.com/chaotic-cx/nyx/archive/0e99464b8956307678b60ec7540e6cad730ee825.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"glibc-eac": {
@ -62,19 +50,19 @@
"lix-module": {
"branch": "main",
"repo": "https://git.lix.systems/lix-project/nixos-module.git",
"rev": "cecf70b77539c1a593f60ec9d0305b5e537ab6a9",
"rev": "5d9d94089fb1ca96222a34bfe245ef5c5ebefd37",
"type": "git"
},
"lix-pkg": {
"branch": "main",
"repo": "https://git.lix.systems/lix-project/lix.git",
"rev": "f2a49032a698bd96b37e8df8f02ec403fd0bed0f",
"rev": "865a3732faca16a79bf24982011adf100de04463",
"type": "git"
},
"nixos-mailserver": {
"branch": "master",
"repo": "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver.git",
"rev": "af7d3bf5daeba3fc28089b015c0dd43f06b176f2",
"rev": "290a995de5c3d3f08468fa548f0d55ab2efc7b6b",
"type": "git"
},
"nixos-matrix-modules": {
@ -83,10 +71,10 @@
"homepage": null,
"owner": "dali99",
"repo": "nixos-matrix-modules",
"rev": "f4e20d03605c21aebb325c936f3283c322d7e975",
"sha256": "1jj0rxahi3f9ypb3csz3q7jcr556iqbqifb4h9p632hl5prac9rl",
"rev": "d7dc42c9bbb155c5e4aa2f0985d0df75ce978456",
"sha256": "10q5is4fkmiqqfrmvvv92qkfv1iizariklbvazx00n9qvi2qlp1h",
"type": "tarball",
"url": "https://github.com/dali99/nixos-matrix-modules/archive/f4e20d03605c21aebb325c936f3283c322d7e975.tar.gz",
"url": "https://github.com/dali99/nixos-matrix-modules/archive/d7dc42c9bbb155c5e4aa2f0985d0df75ce978456.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"nixpkgs": {
@ -95,10 +83,10 @@
"homepage": null,
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c",
"sha256": "0s6h7r9jin9sd8l85hdjwl3jsvzkddn3blggy78w4f21qa3chymz",
"rev": "2741b4b489b55df32afac57bc4bfd220e8bf617e",
"sha256": "19z8yxgjm9jx7dls8942k6d8vp4dgh52azj1d6jgsy1vb27rw56k",
"type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/574d1eac1c200690e27b8eb4e24887f8df7ac27c.tar.gz",
"url": "https://github.com/NixOS/nixpkgs/archive/2741b4b489b55df32afac57bc4bfd220e8bf617e.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"ranger_udisk_menu": {

2
overlays/default.nix
View File

@ -31,7 +31,7 @@
./matrix-appservice-discord.nix
./deskwhich.nix
./tlpui.nix
# ./mcontrolcenter.nix
./mcontrolcenter.nix
# ./ccache-wrapper.nix
./searchclip.nix
./confwhich.nix

2
overlays/factorio.nix
View File

@ -4,6 +4,6 @@ let
in
{
factorio = prev.factorio.override (
{ versionsJson = ./versions.json; } // lib.optionalAttrs (builtins.pathExists loginFile) (import loginFile)
{ } // lib.optionalAttrs (builtins.pathExists loginFile) (import loginFile)
);
}

4
overlays/factorioLogin.nix
View File

@ -1,4 +0,0 @@
{
username = "Grimmauld";
token = "c3a57c976cf995959fd1458315ba0a";
}

58
overlays/versions.json
View File

@ -1,58 +0,0 @@
{
"x86_64-linux": {
"alpha": {
"experimental": {
"name": "factorio_alpha_x64-1.1.109.tar.xz",
"needsAuth": true,
"sha256": "1fmgh5b4sq9lcbjz0asvq5zcwf25cqdn5jc2ickind2lnkhd557h",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.109/alpha/linux64",
"version": "1.1.109"
},
"stable": {
"name": "factorio_alpha_x64-1.1.109.tar.xz",
"needsAuth": true,
"sha256": "1fmgh5b4sq9lcbjz0asvq5zcwf25cqdn5jc2ickind2lnkhd557h",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.109/alpha/linux64",
"version": "1.1.109"
}
},
"demo": {
"experimental": {
"name": "factorio_demo_x64-1.1.109.tar.xz",
"needsAuth": false,
"sha256": "1222jg22dmj4pby9y5axybqv0dmwxh8r9h2507f87za3jsv15fsx",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.109/demo/linux64",
"version": "1.1.109"
},
"stable": {
"name": "factorio_demo_x64-1.1.109.tar.xz",
"needsAuth": false,
"sha256": "1222jg22dmj4pby9y5axybqv0dmwxh8r9h2507f87za3jsv15fsx",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.109/demo/linux64",
"version": "1.1.109"
}
},
"headless": {
"experimental": {
"name": "factorio_headless_x64-1.1.109.tar.xz",
"needsAuth": false,
"sha256": "0gxzfz074833fjm4s3528y05c5n1jf7zxfdj5xpfcvwi7i9khnhh",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.109/headless/linux64",
"version": "1.1.109"
},
"stable": {
"name": "factorio_headless_x64-1.1.109.tar.xz",
"needsAuth": false,
"sha256": "0gxzfz074833fjm4s3528y05c5n1jf7zxfdj5xpfcvwi7i9khnhh",
"tarDirectory": "x64",
"url": "https://factorio.com/get-download/1.1.109/headless/linux64",
"version": "1.1.109"
}
}
}
}

9
specific/grimm-nixos-laptop/configuration.nix
View File

@ -1,4 +1,4 @@
{ config, lib, ... }:
{ config, ... }:
{
imports = [
# Include the results of the hardware scan.
@ -9,12 +9,6 @@
age.identityPaths = [ "/home/grimmauld/.ssh/id_ed25519" ];
services.zfs.trim.enable = true;
boot.supportedFilesystems.zfs = true;
networking.hostId = "2ea79333";
boot.kernelPackages = lib.mkForce config.boot.zfs.package.latestCompatibleLinuxPackages;
grimmShared = {
tooling = {
pass = true;
@ -31,7 +25,6 @@
enable = true;
plugins = {
"uBlock0@raymondhill.net" = "ublock-origin";
"{1e6672b5-a286-4217-83ec-81cc872debcf}" = "youtube-control-fix";
"gdpr@cavi.au.dk" = "consent-o-matic";
"{41f9e51d-35e4-4b29-af66-422ff81c8b41}" = "disable-javascript";
"{7a7a4a92-a2a0-41d1-9fd7-1e92480d612d}" = "styl-us";