better actions, fixed build issues

nyadiia · Oct 23, 2024 · 107f25b · 107f25b
1 parent 1fe17ae
commit 107f25b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/.github/workflows/flake-check.yml b/.github/workflows/flake-check.yml
@@ -4,6 +4,10 @@ jobs:
   checks:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Check Nix flake Nixpkgs inputs
-        uses: DeterminateSystems/flake-checker-action@main
+        uses: DeterminateSystems/flake-checker-action@v9
+      - name: Install Nix
+        uses: DeterminateSystems/nix-installer-action@v14
+      - name: Check everything
+        run: nix flake check . --all-systems
diff --git a/modules/system.nix b/modules/system.nix
@@ -65,7 +65,7 @@
               EDITOR = "nvim";
               VISUAL = "nvim";
             }
-            ++ (lib.mkIf (config.custom.deviceType != "server")) {
+            // (lib.mkIf (config.custom.deviceType != "server")) {
               SSH_ASKPASS = "${pkgs.seahorse}/libexec/seahorse/ssh-askpass";
             };
         };

diff --git a/packages/nixvim/default.nix b/packages/nixvim/default.nix
@@ -4,6 +4,10 @@
     nixfmt-rfc-style
     typstyle
   ];
+  extraPlugins = with pkgs.vimPlugins; [
+    gruvbox-material-nvim
+    quick-scope
+  ];
   colorscheme = "gruvbox-material";
   extraConfigLuaPre = ''
     require('gruvbox-material').setup({
@@ -89,10 +93,6 @@
     );
   globals.mapleader = " ";
   plugins = {
-    extraPlugins = with pkgs.vimPlugins; [
-      gruvbox-material-nvim
-      quick-scope
-    ];
 
     barbar.enable = true;
     cmp-nvim-lsp.enable = true;