diff --git a/.github/workflows/check-flake.yml b/.github/workflows/check-flake.yml index bab2fd02..55df5928 100644 --- a/.github/workflows/check-flake.yml +++ b/.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: diff --git a/.github/workflows/update-flake.yml b/.github/workflows/update-flake.yml index e52a331c..5e70e575 100644 --- a/.github/workflows/update-flake.yml +++ b/.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 diff --git a/flake.lock b/flake.lock index 50a46dc6..d74811ad 100644 --- a/flake.lock +++ b/flake.lock @@ -1,9 +1,98 @@ { "nodes": { + "arkenfox": { + "inputs": { + "flake-compat": "flake-compat", + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs", + "pre-commit": "pre-commit" + }, + "locked": { + "lastModified": 1698052066, + "narHash": "sha256-KnSOyt4Ro66kNf2UIVfIy5Qj5idR9+3QrxJmbo3kzrQ=", + "owner": "dwarfmaster", + "repo": "arkenfox-nixos", + "rev": "f787d60c3308f067d5f68abbe85083f8a169d72c", + "type": "github" + }, + "original": { + "owner": "dwarfmaster", + "repo": "arkenfox-nixos", + "type": "github" + } + }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems" }, + "locked": { + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { + "inputs": { + "systems": "systems_3" + }, "locked": { "lastModified": 1685518550, "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", @@ -18,6 +107,28 @@ "type": "github" } }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "arkenfox", + "pre-commit", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1660459072, + "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -25,11 +136,11 @@ ] }, "locked": { - "lastModified": 1699368917, - "narHash": "sha256-nUtGIWf86BOkUbtksWtfglvCZ/otP0FTZlQH8Rzc7PA=", + "lastModified": 1700118404, + "narHash": "sha256-XkqpZpVoy1FV7UbiLkP+fQxxv/6KnwLYkFEHgE8z2IQ=", "owner": "nix-community", "repo": "home-manager", - "rev": "6a8444467c83c961e2f5ff64fb4f422e303c98d3", + "rev": "c1a033122df8a3c74fda3780c83a104a7d60873c", "type": "github" }, "original": { @@ -40,18 +151,18 @@ }, "neovim-flake": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_3", "nixpkgs": [ "nixpkgs" ] }, "locked": { "dir": "contrib", - "lastModified": 1699631770, - "narHash": "sha256-7gvGDKugspHfzcruvtWrj6SxiIA6qos+GlusCCIegEE=", + "lastModified": 1700230410, + "narHash": "sha256-cj7WV6AxFxAZCDip9DGcK1YXe3JidLiQ7w3mBpL77w0=", "owner": "neovim", "repo": "neovim", - "rev": "430b8da01db738f607998a1a35edab9b0398b12d", + "rev": "ad867fee26c8124d23693823b56f849e4487b828", "type": "github" }, "original": { @@ -63,11 +174,58 @@ }, "nixpkgs": { "locked": { - "lastModified": 1699099776, - "narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=", + "lastModified": 1697929210, + "narHash": "sha256-RkQZif6QhswEwv7484mrKfIU8XmIWm+ED6llbr4IyxM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "fb000224952bf7749a9e8b3779104ef7ea4465c8", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "release-23.05", + "type": "indirect" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1685801374, + "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c37ca420157f4abc31e26f436c1145f8951ff373", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1689261696, + "narHash": "sha256-LzfUtFs9MQRvIoQ3MfgSuipBVMXslMPH/vZ+nM40LkA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "df1eee2aa65052a18121ed4971081576b25d6b5c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1699963925, + "narHash": "sha256-LE7OV/SwkIBsCpAlIPiFhch/J+jBDGEZjNfdnzCnCrY=", "owner": "nixos", "repo": "nixpkgs", - "rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb", + "rev": "bf744fe90419885eefced41b3e5ae442d732712d", "type": "github" }, "original": { @@ -77,11 +235,34 @@ "type": "github" } }, + "pre-commit": { + "inputs": { + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_2", + "gitignore": "gitignore", + "nixpkgs": "nixpkgs_2", + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1697746376, + "narHash": "sha256-gu77VkgdfaHgNCVufeb6WP9oqFLjwK4jHcoPZmBVF3E=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "8cc349bfd082da8782b989cad2158c9ad5bd70fd", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, "root": { "inputs": { + "arkenfox": "arkenfox", "home-manager": "home-manager", "neovim-flake": "neovim-flake", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_3" } }, "systems": { @@ -98,6 +279,36 @@ "repo": "default", "type": "github" } + }, + "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 327541eb..a31eebed 100644 --- a/flake.nix +++ b/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, ... }: { diff --git a/home-manager/home.nix b/home-manager/home.nix index 014d8e09..62bde392 100644 --- a/home-manager/home.nix +++ b/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 diff --git a/home-manager/modules/arkenfox.nix b/home-manager/modules/arkenfox.nix new file mode 100644 index 00000000..47e55eab --- /dev/null +++ b/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; + }; + }; +} diff --git a/nvim/lua/my/configure/heirline/init.lua b/nvim/lua/my/configure/heirline/init.lua index 59298128..c6fc1fa6 100644 --- a/nvim/lua/my/configure/heirline/init.lua +++ b/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 diff --git a/nvim/lua/my/configure/heirline/shared.lua b/nvim/lua/my/configure/heirline/shared.lua index 6977fe39..73f4fb6c 100644 --- a/nvim/lua/my/configure/heirline/shared.lua +++ b/nvim/lua/my/configure/heirline/shared.lua @@ -84,4 +84,8 @@ function M.Diagnostics(is_winbar, bg) ) end +M.Trunc = { + provider = '%<', +} + return M diff --git a/nvim/lua/my/configure/heirline/winbar.lua b/nvim/lua/my/configure/heirline/winbar.lua index 894e5947..5c2858e3 100644 --- a/nvim/lua/my/configure/heirline/winbar.lua +++ b/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