Merge branch 'master' of github.com:mrjones2014/dotfiles

.github/workflows/check-flake.yml

@@ -10,7 +10,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: cachix/install-nix-action@v23
+      - uses: DeterminateSystems/nix-installer-action@main
+      - uses: DeterminateSystems/magic-nix-cache-action@main
       - name: Check Nix flake inputs
         uses: DeterminateSystems/flake-checker-action@v5
         with:

.github/workflows/update-flake.yml

@@ -10,12 +10,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - uses: cachix/install-nix-action@v23
-    - uses: cachix/cachix-action@v12
-      with:
-        name: nix-community
-    - name: add nix-community cache
-      run: cachix use nix-community
+    - uses: DeterminateSystems/nix-installer-action@main
+    - uses: DeterminateSystems/magic-nix-cache-action@main
     - name: update flake.lock
       run: nix flake update
     - name: Create Pull Request

flake.nix

@@ -11,6 +11,7 @@
       url = "github:neovim/neovim?dir=contrib";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    arkenfox.url = "github:dwarfmaster/arkenfox-nixos";
   };
 
   outputs = inputs@{ self, nixpkgs, home-manager, ... }: {

home-manager/home.nix

@@ -76,6 +76,7 @@ in {
   };
 
   imports = [
+    # ./modules/arkenfox.nix # TODO figure out how to load the arkenfox flake module
     ./modules/nvim.nix
     ./modules/fish.nix
     ./modules/fzf.nix

home-manager/modules/arkenfox.nix

@@ -0,0 +1,26 @@
+{
+  programs.firefox = {
+    enable = true;
+    arkenfox = {
+      enable = true;
+      version = "118.0";
+    };
+
+    profiles.Default.arkenfox = {
+      enable = true;
+      "0000".enable = true;
+      "0100".enable = true;
+      "0200".enable = true;
+      "0300".enable = true;
+      "0400".enable = true;
+      "0600".enable = true;
+      "0800".enable = true;
+      "0900".enable = true;
+      "1200".enable = true;
+      "1600".enable = true;
+      "2600".enable = true;
+      "2700".enable = true;
+      "2800".enable = true;
+    };
+  };
+}

nvim/lua/my/configure/heirline/init.lua

@@ -50,6 +50,7 @@ return {
           shared.FileIcon('black'),
           wb.UniqueFilename,
           wb.Diagnostics,
+          shared.Trunc,
           wb.Navic,
         },
         statuscolumn = { ---@diagnostic disable-line:missing-fields

nvim/lua/my/configure/heirline/shared.lua

@@ -84,4 +84,8 @@ function M.Diagnostics(is_winbar, bg)
   )
 end
 
+M.Trunc = {
+  provider = '%<',
+}
+
 return M

nvim/lua/my/configure/heirline/winbar.lua

@@ -106,9 +106,6 @@ M.Navic = {
     return string.format(' %s', require('nvim-navic').get_location())
   end,
   hl = { bg = 'bg_statusline' },
-  {
-    provider = '%<',
-  },
 }
 
 return M