From 20a31203f6936193d9c53f1593f70e51a2f13691 Mon Sep 17 00:00:00 2001 From: Mirza Arnaut Date: Sun, 15 Dec 2024 14:56:39 +0100 Subject: [PATCH] Testing madara for CI --- .github/workflows/check.yaml | 2 +- flake.nix | 2 +- hosts/madara/configuration.nix | 94 +++++++++--------------------- modules/nixos/system/nix-utils.nix | 2 + 4 files changed, 30 insertions(+), 70 deletions(-) diff --git a/.github/workflows/check.yaml b/.github/workflows/check.yaml index e3eec6f..dc07cce 100644 --- a/.github/workflows/check.yaml +++ b/.github/workflows/check.yaml @@ -13,7 +13,7 @@ jobs: check-flake: name: Check Flake Setup runs-on: ubuntu-latest - timeout-minutes: 60 + timeout-minutes: 10 steps: - name: Checkout uses: actions/checkout@v4 diff --git a/flake.nix b/flake.nix index 3df6095..416f135 100644 --- a/flake.nix +++ b/flake.nix @@ -128,7 +128,7 @@ "kuchiki" = "mirza"; # New NAS Server "yoruichi" = "mirza"; # Crappy AMD Mini PC "shinji" = "mirza"; # M720q Mini PC - "kenpachi" = "mirza"; # S740 Mini PC + # "kenpachi" = "mirza"; # S740 Mini PC "narouter" = "mirza"; # Firewall "aizen" = "mirza"; # Work diff --git a/hosts/madara/configuration.nix b/hosts/madara/configuration.nix index 8975314..e99f24a 100644 --- a/hosts/madara/configuration.nix +++ b/hosts/madara/configuration.nix @@ -25,75 +25,33 @@ in runners.YASF.enable = true; nfs.enable = true; - # Disable Autosuspend for USB Bluetooth dongles - # boot = { - # kernelModules = ["snd-hda-intel "]; - # extraModprobeConfig = '' - # options btusb enable_autosuspend=n - # ''; - # }; - - # Enable SSH Daemon - services = { - # openssh = { - # enable = true; - # # require public key authentication for better security - # #settings.PasswordAuthentication = false; - # #settings.KbdInteractiveAuthentication = false; - # #settings.PermitRootLogin = "yes"; - # }; - # xrdp = { - # enable = true; - # defaultWindowManager = "gnome-remote-desktop"; - # openFirewall = true; - # }; - gnome.gnome-remote-desktop.enable = true; - }; + # hardware = { + # # Make logitech devices work easier + # logitech.wireless = { + # enable = true; + # enableGraphical = true; + # }; - hardware = { - # Make logitech devices work easier - logitech.wireless = { - enable = true; - enableGraphical = true; - }; + # # Tweaks for keychron + # bluetooth = { + # enable = true; + # settings = { + # General = { + # FastConnect = true; + # Experimental = true; + # }; + # Policy = { + # ReconnectAttempts = 7; + # ReconnectIntervals = "1, 2, 3"; + # }; + # }; + # }; - # Tweaks for keychron - bluetooth = { - enable = true; - settings = { - General = { - FastConnect = true; - Experimental = true; - }; - Policy = { - ReconnectAttempts = 7; - ReconnectIntervals = "1, 2, 3"; - }; - }; - }; - - # OpenGL - # opengl = { - # enable = true; - # driSupport = true; - # driSupport32Bit = true; - # extraPackages = with pkgs; [ - # vulkan-loader - # vulkan-validation-layers - # vulkan-extension-layer - # ]; - # }; - }; - - systemd = { - tmpfiles.rules = [ - "L+ /run/gdm/.config/monitors.xml - - - - ${monitorsConfig}" - ]; + # }; - # services.NetworkManager-wait-online = { - # serviceConfig = { - # ExecStart = ["" "${pkgs.networkmanager}/bin/nm-online -q"]; - # }; - # }; - }; + # systemd = { + # tmpfiles.rules = [ + # "L+ /run/gdm/.config/monitors.xml - - - - ${monitorsConfig}" + # ]; + # }; } diff --git a/modules/nixos/system/nix-utils.nix b/modules/nixos/system/nix-utils.nix index 4a647fc..19a138c 100644 --- a/modules/nixos/system/nix-utils.nix +++ b/modules/nixos/system/nix-utils.nix @@ -38,10 +38,12 @@ "pipe-operators" ]; extra-substituters = [ + "https://nix-community.cachix.org" "https://helix.cachix.org" "https://wezterm.cachix.org" ]; extra-trusted-public-keys = [ + "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" "helix.cachix.org-1:ejp9KQpR1FBI2onstMQ34yogDm4OgU2ru6lIwPvuCVs=" "wezterm.cachix.org-1:kAbhjYUC9qvblTE+s7S+kl5XM1zVa4skO+E/1IDWdH0=" ];