From e67f5a7bcbe3c5553420f305c9d4582e98890316 Mon Sep 17 00:00:00 2001 From: Grimmauld Date: Thu, 15 Aug 2024 14:59:23 +0200 Subject: [PATCH] update stuff --- common/gaming.nix | 2 + common/graphics/fonts.nix | 2 +- common/graphics/opengl.nix | 6 +- common/sound/default.nix | 1 - common/tooling/default.nix | 1 + common/tooling/helix.nix | 5 +- common/tooling/python.nix | 2 +- fake_flake.nix | 4 ++ nix/sources.json | 42 +++++++++----- overlays/default.nix | 2 +- overlays/factorio.nix | 2 +- overlays/factorioLogin.nix | 4 ++ overlays/versions.json | 58 +++++++++++++++++++ specific/grimm-nixos-laptop/configuration.nix | 1 + 14 files changed, 107 insertions(+), 25 deletions(-) create mode 100644 overlays/factorioLogin.nix create mode 100644 overlays/versions.json diff --git a/common/gaming.nix b/common/gaming.nix index 1d196f1..b33ddd7 100644 --- a/common/gaming.nix +++ b/common/gaming.nix @@ -39,6 +39,8 @@ in }; }; + programs.the-honkers-railway-launcher.enable = true; + services.udev.packages = [ pkgs.wooting-udev-rules ]; environment.sessionVariables = { diff --git a/common/graphics/fonts.nix b/common/graphics/fonts.nix index 740a6e9..5519d95 100644 --- a/common/graphics/fonts.nix +++ b/common/graphics/fonts.nix @@ -18,7 +18,7 @@ in noto-fonts-monochrome-emoji roboto liberation_ttf - nerdfonts + # nerdfonts ]; fontDir.enable = true; diff --git a/common/graphics/opengl.nix b/common/graphics/opengl.nix index 62c2876..fbf2d63 100644 --- a/common/graphics/opengl.nix +++ b/common/graphics/opengl.nix @@ -39,10 +39,10 @@ in { config = mkIf (enable && graphical) { # Enable OpenGL - hardware.opengl = { + hardware.graphics = { enable = true; - driSupport = true; - driSupport32Bit = true; + #driSupport = true; + #driSupport32Bit = true; extraPackages = [ ]; }; diff --git a/common/sound/default.nix b/common/sound/default.nix index 45fcbc1..04fe73e 100644 --- a/common/sound/default.nix +++ b/common/sound/default.nix @@ -9,7 +9,6 @@ let in { config = lib.mkIf (enable && sound.enable) { - sound.enable = true; hardware.pulseaudio.enable = false; services.pipewire = { diff --git a/common/tooling/default.nix b/common/tooling/default.nix index 7061410..e3d7f12 100644 --- a/common/tooling/default.nix +++ b/common/tooling/default.nix @@ -64,6 +64,7 @@ in qdirstat libva-utils gparted + bottles ]; environment.shellAliases = { diff --git a/common/tooling/helix.nix b/common/tooling/helix.nix index 3997bcb..05cabd7 100644 --- a/common/tooling/helix.nix +++ b/common/tooling/helix.nix @@ -10,6 +10,7 @@ let mkOption types getExe + getExe' mkIf ; inherit (pkgs) @@ -42,7 +43,7 @@ let '') ]; }; - + helix-wrapped = pkgs.symlinkJoin { name = helix.pname; @@ -56,7 +57,7 @@ in { config = mkIf (enable && tooling.enable) { environment.systemPackages = [ helix-wrapped ]; - environment.sessionVariables.EDITOR = getExe helix-wrapped; + environment.sessionVariables.EDITOR = getExe' helix-wrapped "hx"; programs.helix.config = { editor.cursor-shape.insert = "bar"; diff --git a/common/tooling/python.nix b/common/tooling/python.nix index 04f1a88..32a4a90 100644 --- a/common/tooling/python.nix +++ b/common/tooling/python.nix @@ -53,7 +53,7 @@ in name: value: "aliases[\"${name}\"] = '''${value}'''" ) config.environment.shellAliases ); - # package = pkgs.xonsh.wrapper.override { extraPackages = pyLibs; }; + package = pkgs.xonsh.wrapper.override { extraPackages = pyLibs; }; }; grimmShared.tooling.lang_servers = [ diff --git a/fake_flake.nix b/fake_flake.nix index 7220149..a126a22 100644 --- a/fake_flake.nix +++ b/fake_flake.nix @@ -44,6 +44,8 @@ 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 @@ -127,11 +129,13 @@ 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=" ]; } diff --git a/nix/sources.json b/nix/sources.json index 1d7f324..fa7cd1c 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -1,14 +1,26 @@ { + "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": "cdb74c540af1d365ea799ba5d2200df707e31090", + "sha256": "0pfn9fwjf6m83hk9z8nkmqrwcvd61abshbpw05v656vz5zx621ax", + "type": "tarball", + "url": "https://github.com/ezKEa/aagl-gtk-on-nix/archive/cdb74c540af1d365ea799ba5d2200df707e31090.tar.gz", + "url_template": "https://github.com///archive/.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": "c2fc0762bbe8feb06a2e59a364fa81b3a57671c9", - "sha256": "1lpkwinlax40b7xgzspbkm9rsi4a1x48hxhixnni4irxxwnav0ah", + "rev": "3f1dae074a12feb7327b4bf43cbac0d124488bb7", + "sha256": "09aldzzc50121p0b3apj2c0l71jgmbif46a76shlgps8wbbbkr35", "type": "tarball", - "url": "https://github.com/ryantm/agenix/archive/c2fc0762bbe8feb06a2e59a364fa81b3a57671c9.tar.gz", + "url": "https://github.com/ryantm/agenix/archive/3f1dae074a12feb7327b4bf43cbac0d124488bb7.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "authentik-nix": { @@ -17,10 +29,10 @@ "homepage": "", "owner": "nix-community", "repo": "authentik-nix", - "rev": "1942bdac27c337559ca16ddb7fca5c9ffb686e5b", - "sha256": "15xrzv6i0wkj3qrxpscgnq2kgc6xbjp26lhhlmvjgiv4bqm2q1dv", + "rev": "89cfaf2eb197a39d12422e773f867d1a7c99b048", + "sha256": "1405rzwq8fwpyc63ac76f50glc00sp18m2ska1najzqvzi9v5zpk", "type": "tarball", - "url": "https://github.com/nix-community/authentik-nix/archive/1942bdac27c337559ca16ddb7fca5c9ffb686e5b.tar.gz", + "url": "https://github.com/nix-community/authentik-nix/archive/89cfaf2eb197a39d12422e773f867d1a7c99b048.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "chaotic": { @@ -29,10 +41,10 @@ "homepage": "https://nyx.chaotic.cx", "owner": "chaotic-cx", "repo": "nyx", - "rev": "798d56d819cd7d46ba9202afe81040887ac868ef", - "sha256": "1b1nish8zhc6mxp07rw874sqsf8212gg4srwyknd7fidn9gsk5jr", + "rev": "14758e216e5312a6e964c479e461e85ce428e99b", + "sha256": "0j46dyrl8z2hrj0d1vrvl29rivf5ifq8n76csvcysj96ig8knlk5", "type": "tarball", - "url": "https://github.com/chaotic-cx/nyx/archive/798d56d819cd7d46ba9202afe81040887ac868ef.tar.gz", + "url": "https://github.com/chaotic-cx/nyx/archive/14758e216e5312a6e964c479e461e85ce428e99b.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "glibc-eac": { @@ -50,19 +62,19 @@ "lix-module": { "branch": "main", "repo": "https://git.lix.systems/lix-project/nixos-module.git", - "rev": "4e25f1ab68f2270f9cff59216056c21073db0164", + "rev": "e350380d72f94035c309e19fda2fd550f6ab7376", "type": "git" }, "lix-pkg": { "branch": "main", "repo": "https://git.lix.systems/lix-project/lix.git", - "rev": "8a3d063a494c4b8c767190a5ce3e4075a75f9d07", + "rev": "61a93d53081141d4ab222dcb939dd5caa8ffc767", "type": "git" }, "nixos-mailserver": { "branch": "master", "repo": "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver.git", - "rev": "29916981e7b3b5782dc5085ad18490113f8ff63b", + "rev": "059b50b2e729729ea00c6831124d3837c494f3d5", "type": "git" }, "nixos-matrix-modules": { @@ -83,10 +95,10 @@ "homepage": null, "owner": "NixOS", "repo": "nixpkgs", - "rev": "57d6973abba7ea108bac64ae7629e7431e0199b6", - "sha256": "1sx6ijjj0cic06khxb13iaihqadwm8drixy9rw32xapdvj6x92pm", + "rev": "9f918d616c5321ad374ae6cb5ea89c9e04bf3e58", + "sha256": "0c72qyi7xm12cvasj5jwnq41sykfd67m4qy7d9kya2bbmcil2cpw", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/57d6973abba7ea108bac64ae7629e7431e0199b6.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/9f918d616c5321ad374ae6cb5ea89c9e04bf3e58.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "ranger_udisk_menu": { diff --git a/overlays/default.nix b/overlays/default.nix index b3488c9..fbf847e 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -31,7 +31,7 @@ ./matrix-appservice-discord.nix ./deskwhich.nix ./tlpui.nix - ./mcontrolcenter.nix + # ./mcontrolcenter.nix # ./ccache-wrapper.nix ./searchclip.nix ./confwhich.nix diff --git a/overlays/factorio.nix b/overlays/factorio.nix index a977a87..d8989dd 100644 --- a/overlays/factorio.nix +++ b/overlays/factorio.nix @@ -4,6 +4,6 @@ let in { factorio = prev.factorio.override ( - { } // lib.optionalAttrs (builtins.pathExists loginFile) (import loginFile) + { versionsJson = ./versions.json; } // lib.optionalAttrs (builtins.pathExists loginFile) (import loginFile) ); } diff --git a/overlays/factorioLogin.nix b/overlays/factorioLogin.nix new file mode 100644 index 0000000..c93e1d9 --- /dev/null +++ b/overlays/factorioLogin.nix @@ -0,0 +1,4 @@ +{ + username = "Grimmauld"; + token = "c3a57c976cf995959fd1458315ba0a"; +} diff --git a/overlays/versions.json b/overlays/versions.json new file mode 100644 index 0000000..0e436ed --- /dev/null +++ b/overlays/versions.json @@ -0,0 +1,58 @@ +{ + "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" + } + } + } +} diff --git a/specific/grimm-nixos-laptop/configuration.nix b/specific/grimm-nixos-laptop/configuration.nix index b251737..d29e063 100644 --- a/specific/grimm-nixos-laptop/configuration.nix +++ b/specific/grimm-nixos-laptop/configuration.nix @@ -25,6 +25,7 @@ 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";