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
9 changed files with 323 additions and 596 deletions

View file

@ -23,4 +23,5 @@ jobs:
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
pushFilter: '(nerdfonts)'
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 .

885
flake.lock generated

File diff suppressed because it is too large Load diff

View file

@ -71,7 +71,7 @@
devShells.default = final.mkShell {
meta.description = "Default dev shell";
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);
@ -96,8 +96,8 @@
flake = false;
};
nixvim = {
url = "github:callumio/nixvim";
nvf = {
url = "github:callumio/nvf";
inputs.nixpkgs.follows = "unstable";
};
@ -125,7 +125,6 @@
omnix = {
url = "github:juspay/omnix";
inputs = {
treefmt-nix.follows = "treefmt-nix";
systems.follows = "systems";
};
};

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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