mirror of
https://github.com/callumio/nixfiles.git
synced 2025-12-19 20:39:20 +00:00
Compare commits
6 commits
adcb072e47
...
d491a12dce
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d491a12dce | ||
| ccfa4fdb4f | |||
| 74701ee626 | |||
| b57a13036a | |||
| 75d9ea8613 | |||
| 1eece5263a |
10 changed files with 325 additions and 598 deletions
5
.github/workflows/ci.yml
vendored
5
.github/workflows/ci.yml
vendored
|
|
@ -9,7 +9,7 @@ jobs:
|
|||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: cachix/install-nix-action@v30
|
||||
- uses: cachix/install-nix-action@v31
|
||||
with:
|
||||
nix_path: nixpkgs=channel:nixos-unstable
|
||||
- name: Free Disk Space
|
||||
|
|
@ -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 .
|
||||
|
||||
|
|
|
|||
2
.github/workflows/update-flake.yml
vendored
2
.github/workflows/update-flake.yml
vendored
|
|
@ -12,7 +12,7 @@ jobs:
|
|||
- name: Checkout repository
|
||||
uses: actions/checkout@v4
|
||||
- name: Install Nix
|
||||
uses: cachix/install-nix-action@v30
|
||||
uses: cachix/install-nix-action@v31
|
||||
- name: Update flake.lock
|
||||
uses: DeterminateSystems/update-flake-lock@v24
|
||||
with:
|
||||
|
|
|
|||
885
flake.lock
generated
885
flake.lock
generated
File diff suppressed because it is too large
Load diff
|
|
@ -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";
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -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";
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
openssh.authorizedKeys.keys = config.keys.c;
|
||||
packages = with pkgs; [
|
||||
tree
|
||||
nixvim
|
||||
nvf
|
||||
];
|
||||
};
|
||||
|
||||
|
|
|
|||
2
justfile
2
justfile
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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 {};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue