Skip to content

Commit

Permalink
chore: lint and update deps
Browse files Browse the repository at this point in the history
  • Loading branch information
o-az committed Oct 1, 2024
1 parent 25cbbe2 commit e17ea9d
Show file tree
Hide file tree
Showing 11 changed files with 31 additions and 100 deletions.
1 change: 1 addition & 0 deletions .envrc
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
#!/usr/bin/env bash
use flake
export DIRENV_WARN_TIMEOUT=1m
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
* text=auto
.gitattributes !filter !diff

.envrc linguist-language=Shell

.vscode/*.json linguist-language=JSON-with-Comments
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
[![built with nix](https://builtwithnix.org/badge.svg)](https://builtwithnix.org)

[![FlakeHub](https://img.shields.io/endpoint?url=https://flakehub.com/f/index/nixos-config/badge)](https://flakehub.com/flake/index/nixos-config)
106 changes: 17 additions & 89 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
description = "NixOS configuration";

inputs = {
# consider switching to? github:numtide/nixpkgs-unfree?ref=nixos-unstable
nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";

nix-darwin.url = "github:lnl7/nix-darwin/master";
Expand All @@ -14,9 +15,6 @@
home-manager.url = "github:nix-community/home-manager";
home-manager.inputs.nixpkgs.follows = "nixpkgs";

microvm.url = "github:astro/microvm.nix";
microvm.inputs.nixpkgs.follows = "nixpkgs";

helix.url = "github:helix-editor/helix";

nix-index-database.url = "github:nix-community/nix-index-database";
Expand Down
3 changes: 2 additions & 1 deletion home-modules/home.nix
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{ ... }: {
_:
{
programs.home-manager.enable = true;
}
6 changes: 3 additions & 3 deletions home-modules/shells/fish/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ in
plugins = with pkgs.fishPlugins; [
{
name = "sponge";
src = sponge.src;
inherit (sponge) src;
}
{
name = "fzf";
src = fzf-fish.src;
inherit (fzf-fish) src;
}
{
name = "autopair";
src = autopair.src;
inherit (autopair) src;
}
{
name = "spark";
Expand Down
2 changes: 1 addition & 1 deletion justfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ update-lockfile:
sudo nix flake update

lint:
deadnix && statix check .
deadnix --no-lambda-pattern-names && statix check .

fmt:
nixfmt *.nix **/*.nix **/**/*.nix --width=100
Expand Down
1 change: 0 additions & 1 deletion modules/orbstack.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

{
lib,
pkgs,
config,
...
}:
Expand Down
2 changes: 1 addition & 1 deletion modules/tailscale.nix
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# https://search.nixos.org/options?channel=unstable&from=0&size=50&sort=relevance&type=packages&query=tailscale..
{config, pkgs, ...}:
{ pkgs, ... }:
{
services.tailscale.enable = true;
services.tailscale.package = pkgs.tailscale;
Expand Down
2 changes: 1 addition & 1 deletion overlays/default.nix
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{ inputs, ... }: { }
_: { }

0 comments on commit e17ea9d

Please sign in to comment.