Compare commits

...

6 commits

Author SHA1 Message Date
dependabot[bot]
d491a12dce
ci: bump cachix/install-nix-action from 30 to 31
Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 30 to 31.
- [Release notes](https://github.com/cachix/install-nix-action/releases)
- [Commits](https://github.com/cachix/install-nix-action/compare/v30...v31)

---
updated-dependencies:
- dependency-name: cachix/install-nix-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-04-14 13:41:17 +00:00
ccfa4fdb4f
build not run
Some checks failed
/ ci (push) Has been cancelled
2025-04-14 14:39:43 +01:00
74701ee626
ci update 2025-04-14 14:24:32 +01:00
b57a13036a
cleanup and update 2025-04-14 14:14:02 +01:00
75d9ea8613
fix setting conflict 2025-04-14 13:09:45 +01:00
1eece5263a
switch to nvf
Some checks failed
/ ci (push) Has been cancelled
2025-04-10 16:18:46 +01:00
10 changed files with 325 additions and 598 deletions

View file

@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- uses: cachix/install-nix-action@v30 - uses: cachix/install-nix-action@v31
with: with:
nix_path: nixpkgs=channel:nixos-unstable nix_path: nixpkgs=channel:nixos-unstable
- name: Free Disk Space - name: Free Disk Space
@ -23,4 +23,5 @@ jobs:
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
pushFilter: '(nerdfonts)' pushFilter: '(nerdfonts)'
extraPullNames: nix-community, om extraPullNames: nix-community, om
- run: nix run github:juspay/omnix --accept-flake-config -- ci run "." - run: nix build github:srid/devour-flake -L --no-link --print-out-paths --override-input flake .

View file

@ -12,7 +12,7 @@ jobs:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v4 uses: actions/checkout@v4
- name: Install Nix - name: Install Nix
uses: cachix/install-nix-action@v30 uses: cachix/install-nix-action@v31
- name: Update flake.lock - name: Update flake.lock
uses: DeterminateSystems/update-flake-lock@v24 uses: DeterminateSystems/update-flake-lock@v24
with: with:

885
flake.lock generated

File diff suppressed because it is too large Load diff

View file

@ -71,7 +71,7 @@
devShells.default = final.mkShell { devShells.default = final.mkShell {
meta.description = "Default dev shell"; meta.description = "Default dev shell";
inputsFrom = [config.pre-commit.devShell config.treefmt.build.devShell]; inputsFrom = [config.pre-commit.devShell config.treefmt.build.devShell];
packages = with final; [just git nixvim cachix jq devour-flake om agenix deadnix]; packages = with final; [just git nvf cachix jq devour-flake om agenix deadnix];
}; };
apps = nixpkgs.lib.mapAttrs' (name: value: nixpkgs.lib.nameValuePair ("deploy-" + name) value) (inputs'.nixinate.packages self); apps = nixpkgs.lib.mapAttrs' (name: value: nixpkgs.lib.nameValuePair ("deploy-" + name) value) (inputs'.nixinate.packages self);
@ -96,8 +96,8 @@
flake = false; flake = false;
}; };
nixvim = { nvf = {
url = "github:callumio/nixvim"; url = "github:callumio/nvf";
inputs.nixpkgs.follows = "unstable"; inputs.nixpkgs.follows = "unstable";
}; };
@ -125,7 +125,6 @@
omnix = { omnix = {
url = "github:juspay/omnix"; url = "github:juspay/omnix";
inputs = { inputs = {
treefmt-nix.follows = "treefmt-nix";
systems.follows = "systems"; systems.follows = "systems";
}; };
}; };

View file

@ -1,8 +1,4 @@
{ {pkgs, ...}: {
inputs,
pkgs,
...
}: {
imports = [./programs ./services]; imports = [./programs ./services];
programs.home-manager.enable = true; programs.home-manager.enable = true;
@ -59,7 +55,7 @@
unzip unzip
just just
wireshark wireshark
inputs.nixvim.packages."x86_64-linux".default # nixvim nvf
]; ];
home.stateVersion = "24.05"; home.stateVersion = "24.05";

View file

@ -1,4 +1,8 @@
{pkgs, ...}: { {
pkgs,
lib,
...
}: {
programs = { programs = {
wireshark.enable = true; wireshark.enable = true;
fish.enable = true; fish.enable = true;
@ -16,7 +20,7 @@
# url = "https://i.redd.it/jd1nuwsl0d121.jpg"; # url = "https://i.redd.it/jd1nuwsl0d121.jpg";
# sha256 = "sha256-ff3ajGVsay2dtHiHmO2MYlqCvexUQjGifMs/ofzuyvI="; # sha256 = "sha256-ff3ajGVsay2dtHiHmO2MYlqCvexUQjGifMs/ofzuyvI=";
# }; # };
fit = "Contain"; fit = lib.mkForce "Contain";
}; };
# GTK = { # GTK = {
# application_prefer_dark_theme = true; # application_prefer_dark_theme = true;

View file

@ -26,7 +26,7 @@
openssh.authorizedKeys.keys = config.keys.c; openssh.authorizedKeys.keys = config.keys.c;
packages = with pkgs; [ packages = with pkgs; [
tree tree
nixvim nvf
]; ];
}; };

View file

@ -14,7 +14,7 @@ deploy MACHINE:
nix run .#deploy-{{MACHINE}} nix run .#deploy-{{MACHINE}}
vim: vim:
nix flake lock --update-input nixvim nix flake lock --update-input nvf
update: update:
nix flake update nix flake update

View file

@ -1,5 +1,5 @@
{inputs, ...}: _final: prev: { {inputs, ...}: _final: prev: {
nixvim = inputs.nixvim.packages.${prev.system}.default; nvf = inputs.nvf.packages.${prev.system}.default;
devour-flake = prev.callPackage inputs.devour-flake {}; devour-flake = prev.callPackage inputs.devour-flake {};
agenix = inputs.agenix.packages.${prev.system}.default; agenix = inputs.agenix.packages.${prev.system}.default;
} }

View file

@ -5,7 +5,7 @@
}: { }: {
tmux-sessionizer-cl = pkgs.callPackage ./tmux-sessionizer {}; tmux-sessionizer-cl = pkgs.callPackage ./tmux-sessionizer {};
om = inputs'.omnix.packages.default; om = inputs'.omnix.packages.default;
nixvim = inputs'.nixvim.packages.default; nvf = inputs'.nvf.packages.default;
agenix = inputs'.agenix.packages.default; agenix = inputs'.agenix.packages.default;
vaapiIntel = pkgs.vaapiIntel.override {enableHybridCodec = true;}; vaapiIntel = pkgs.vaapiIntel.override {enableHybridCodec = true;};
devour-flake = pkgs.callPackage inputs.devour-flake {}; devour-flake = pkgs.callPackage inputs.devour-flake {};