diff --git a/checks.nix b/checks.nix new file mode 100644 index 0000000..980d783 --- /dev/null +++ b/checks.nix @@ -0,0 +1,9 @@ +{ hooks, system, ... }: + +{ + pre-commit-check = hooks.lib.${system}.run { + src = ./.; + hooks = { + }; + }; +} diff --git a/flake.nix b/flake.nix index 6685ad3..f6104c7 100644 --- a/flake.nix +++ b/flake.nix @@ -76,14 +76,16 @@ modules = import ./modules; }; - perSystem = { config, self', pkgs', system, ... }: { - _module.args.pkgs = import inputs.nixpkgs { + perSystem = { pkgs, system, ... }: { + _module.args.pkgs = import inputs.nixstable { inherit system overlays; }; + checks = import ./checks.nix { inherit system; inherit (inputs) hooks; }; + devShells = { - default = pkgs'.mkShell { - buildInputs = with pkgs'; [ + default = pkgs.mkShell { + buildInputs = with pkgs; [ bashInteractive curl git diff --git a/home/home.nix b/home/home.nix index ab46346..4b002c4 100644 --- a/home/home.nix +++ b/home/home.nix @@ -1,12 +1,8 @@ { pkgs, lib, - inputs, host ? "most", nixvim, ...}: -let - system = pkgs.system; -in { nixpkgs.config.allowUnfreePredicate = (_: true); imports = [ diff --git a/home/modules/baseline/vim.nix b/home/modules/baseline/vim.nix index 37492eb..45d84f9 100644 --- a/home/modules/baseline/vim.nix +++ b/home/modules/baseline/vim.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ lib, pkgs, config, ... }: let vim-xonsh = pkgs.vimUtils.buildVimPlugin { @@ -126,7 +126,7 @@ in neo-tree.enable = true; notify.enable = true; web-devicons.enable = true; - }; + } // (lib.mkIf (lib.versionAtLeast config.system.nixos.release "24.11") {}); extraConfigLua = builtins.replaceStrings [ "@git@" ] [ "${pkgs.git}/bin/git" ] (builtins.readFile ./vim/extra.lua); extraConfigVim = builtins.readFile ./vim/extra.vimrc; extraPlugins = with pkgs.vimPlugins; [ diff --git a/hosts/jeremiah/default.nix b/hosts/jeremiah/default.nix index c9c33c9..7553178 100644 --- a/hosts/jeremiah/default.nix +++ b/hosts/jeremiah/default.nix @@ -86,7 +86,7 @@ shell = { executor = "shell"; limit = 5; - registrationConfigFile = config.age.secrets.runner-reg.path; + authenticationTokenConfigFile = config.age.secrets.runner-reg.path; environmentVariables = { EFI_DIR = "${pkgs.OVMF.fd}/FV/"; STORAGE_URL = "http://s3.thehellings.lan:9000"; diff --git a/hosts/jude/default.nix b/hosts/jude/default.nix index 88ba281..ee05293 100644 --- a/hosts/jude/default.nix +++ b/hosts/jude/default.nix @@ -111,7 +111,7 @@ nvidia = { modesetting.enable = true; nvidiaSettings = true; - #open = true; + open = true; }; pulseaudio.enable = false; # This conflicts with pipewire system76.enableAll = true; diff --git a/hosts/jude/virt.nix b/hosts/jude/virt.nix index 26fcc46..4479188 100644 --- a/hosts/jude/virt.nix +++ b/hosts/jude/virt.nix @@ -29,7 +29,7 @@ services.vbox = { executor = "shell"; limit = 5; - registrationConfigFile = config.age.secrets.runner-reg.path; + authenticationTokenConfigFile = config.age.secrets.runner-reg.path; environmentVariables = { EFI_DIR = "${pkgs.OVMF.fd}/FV/"; }; diff --git a/hosts/linode/default.nix b/hosts/linode/default.nix index 8493590..9906df5 100644 --- a/hosts/linode/default.nix +++ b/hosts/linode/default.nix @@ -43,7 +43,7 @@ enable = true; services.deployer = { executor = "shell"; - registrationConfigFile = config.age.secrets.runner-deployer.path; + authenticationTokenConfigFile = config.age.secrets.runner-deployer.path; }; }; diff --git a/hosts/myself/container-runner.nix b/hosts/myself/container-runner.nix index 090690f..cad42cb 100644 --- a/hosts/myself/container-runner.nix +++ b/hosts/myself/container-runner.nix @@ -51,7 +51,7 @@ lib.attrsets.recursiveUpdate { shell = { executor = "shell"; limit = 5; - registrationConfigFile = config.age.secrets.runner-reg.path; + authenticationTokenConfigFile = config.age.secrets.runner-reg.path; environmentVariables = { EFI_DIR = "${pkgs.OVMF.fd}/FV/"; STORAGE_URL = "http://s3.thehellings.lan:9000"; diff --git a/hosts/myself/git.nix b/hosts/myself/git.nix index ee58a74..410d032 100644 --- a/hosts/myself/git.nix +++ b/hosts/myself/git.nix @@ -87,7 +87,7 @@ in { services = { default = { executor = "docker"; - registrationConfigFile = config.age.secrets.runner-reg.path; + authenticationTokenConfigFile = config.age.secrets.runner-reg.path; dockerImage = "gitlab.shire-zebra.ts.net:5000/greg/ci-images/fedora:latest"; dockerAllowedImages = [ "alpine:*" @@ -118,7 +118,7 @@ in { qemu = { executor = "shell"; limit = 5; - registrationConfigFile = config.age.secrets.runner-qemu.path; + authenticationTokenConfigFile = config.age.secrets.runner-qemu.path; environmentVariables = { EFI_DIR = "${pkgs.OVMF.fd}/FV/"; STORAGE_URL = "http://s3.thehellings.lan:9000"; diff --git a/modules/nixos/gnome.nix b/modules/nixos/gnome.nix index 505d6b1..9ad3c54 100644 --- a/modules/nixos/gnome.nix +++ b/modules/nixos/gnome.nix @@ -24,7 +24,7 @@ in with lib; { }; udev.packages = with pkgs; [ - gnome3.gnome-settings-daemon + gnome-settings-daemon ]; pipewire.enable = true;