diff --git a/dotfiles/.gitignore b/dotfiles/.gitignore new file mode 100644 index 0000000..143b78a --- /dev/null +++ b/dotfiles/.gitignore @@ -0,0 +1,2 @@ +.devenv* +.direnv* \ No newline at end of file diff --git a/machines/common.nix b/machines/common.nix index b2218c6..a8e35f6 100644 --- a/machines/common.nix +++ b/machines/common.nix @@ -33,6 +33,7 @@ include "/usr/share/nano/*.nanorc" ''; ".ssh/config".source = ./../dotfiles/ssh-config; + ".gitignore".source = ./../dotfiles/.gitignore; }; sessionVariables = { diff --git a/packages.nix b/packages.nix index dc15ca2..7d45682 100644 --- a/packages.nix +++ b/packages.nix @@ -27,6 +27,8 @@ vistafonts hub httpie + manix + anki ] ++ [ (import (fetchTarball "https://github.com/cachix/devenv/archive/v0.6.2.tar.gz")).default diff --git a/pkgs/spx-gc.nix b/pkgs/spx-gc.nix new file mode 100644 index 0000000..d1d4103 --- /dev/null +++ b/pkgs/spx-gc.nix @@ -0,0 +1,34 @@ +{ lib +, stdenv +, buildNpmPackage +, fetchFromGitHub +}: + +buildNpmPackage rec { + pname = "spx-gc"; + version = "1.1.2"; + + src = fetchFromGitHub { + owner = "TuomoKu"; + repo = "SPX-GC"; + rev = "v.${version}"; + hash = "sha256-NVppqlQOpOmBtsoDVhaIiHzc360ek273rpr2i9p8WK8="; + }; + + dontNpmBuild = true; + + npmDepsHash = "sha256-TGiurf/vwGV1KBxQXl0gVDNeZZWrW1Yku3fhTmh3nhk="; + + postInstall = '' + mkdir -p $out/locales + cp -r $src/locales/* $out/locales + ''; + + meta = with lib; { + description = "SPX is a graphics control client for live video productions and live streams using CasparCG, OBS, vMix, or similar software"; + homepage = "https://github.com/TuomoKu/SPX-GC#npminstall"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + mainProgram = "spx"; + }; +} diff --git a/programs/git.nix b/programs/git.nix index f2e6d7c..21b5071 100644 --- a/programs/git.nix +++ b/programs/git.nix @@ -19,7 +19,7 @@ rerere = { enabled = "1"; }; core = { whitespace = "fix,-indent-with-non-tab,trailing-space,cr-at-eol"; - excludesfile = "~/.gitignore-rab"; + excludesfile = "~/.gitignore"; autocrlf = "input"; }; apply = { whitespace = "nowarn"; }; diff --git a/programs/topgrade.nix b/programs/topgrade.nix index 5912d7b..5b98156 100644 --- a/programs/topgrade.nix +++ b/programs/topgrade.nix @@ -4,12 +4,14 @@ programs.topgrade = { enable = true; settings = { - assume_yes = true; - ignore_failures = [ "git_repos" ]; - no_retry = true; - pre_sudo = false; - cleanup = true; - skip_notify = true; + misc = { + assume_yes = true; + ignore_failures = [ "git_repos" ]; + no_retry = true; + pre_sudo = false; + cleanup = true; + skip_notify = true; + }; firmware = { upgrade = true; }; }; };