Fix pre-commit-checks
This commit is contained in:
parent
e0c046d5cd
commit
f2b0ff5abb
|
|
@ -20,14 +20,12 @@
|
|||
inherit
|
||||
(pkgs)
|
||||
# web
|
||||
|
||||
chromium
|
||||
mumble
|
||||
upower
|
||||
speedtest-cli
|
||||
acpi
|
||||
# tools & office
|
||||
|
||||
feh
|
||||
gimp
|
||||
imagemagick
|
||||
|
|
@ -40,7 +38,6 @@
|
|||
beets
|
||||
zbar
|
||||
# media
|
||||
|
||||
ncpamixer
|
||||
pavucontrol
|
||||
playerctl
|
||||
|
|
|
|||
|
|
@ -33,9 +33,12 @@
|
|||
inherit
|
||||
(pkgs)
|
||||
rust-analyzer
|
||||
taplo # toml
|
||||
nil # nix
|
||||
texlab # latex
|
||||
taplo
|
||||
# toml
|
||||
nil
|
||||
# nix
|
||||
texlab
|
||||
# latex
|
||||
lean
|
||||
yaml-language-server
|
||||
;
|
||||
|
|
@ -97,88 +100,61 @@ in {
|
|||
inherit
|
||||
(pkgs.vimPlugins)
|
||||
# coc-tabnine (TODO: Why doesn‘t it work?)
|
||||
|
||||
# TODO: tabnine config in home-manager
|
||||
|
||||
# TODO: tabnine lsp: nix, rust, pandoc/latex lsp? was noch?
|
||||
|
||||
# ===
|
||||
|
||||
# Basic IDE plugins
|
||||
|
||||
coc-nvim
|
||||
airline
|
||||
# same word highlighting when not supported by language
|
||||
|
||||
coc-highlight
|
||||
coc-explorer
|
||||
# searches
|
||||
|
||||
coc-fzf
|
||||
fzf-vim
|
||||
# general whitespace
|
||||
|
||||
vim-trailing-whitespace
|
||||
vim-autoformat
|
||||
# Git
|
||||
|
||||
coc-git
|
||||
# statusline, numberline and explorer infos
|
||||
|
||||
fugitive
|
||||
# various git commands
|
||||
|
||||
# Commenting and Uncommenting
|
||||
|
||||
nerdcommenter
|
||||
# Theme
|
||||
|
||||
papercolor-theme
|
||||
vim-airline-themes
|
||||
LanguageTool-nvim
|
||||
vim-css-color
|
||||
vista-vim
|
||||
# ===
|
||||
|
||||
# Languages
|
||||
|
||||
# haskell syntax highlighting
|
||||
|
||||
haskell-vim
|
||||
vim-hoogle
|
||||
# nix syntax highlighting
|
||||
|
||||
vim-nix
|
||||
vim-markdown
|
||||
# latex
|
||||
|
||||
vimtex
|
||||
coc-vimtex
|
||||
# not sure if I need two
|
||||
|
||||
# ledger
|
||||
|
||||
vim-ledger
|
||||
# rust
|
||||
|
||||
coc-rls
|
||||
# python
|
||||
|
||||
coc-python
|
||||
# css
|
||||
|
||||
coc-css
|
||||
# yaml
|
||||
|
||||
coc-yaml
|
||||
# json
|
||||
|
||||
coc-json
|
||||
# html
|
||||
|
||||
coc-html
|
||||
# dhall
|
||||
|
||||
dhall-vim
|
||||
;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,10 +2,7 @@
|
|||
config,
|
||||
pkgs,
|
||||
...
|
||||
}: let
|
||||
emanote_commit = (builtins.fromJSON (builtins.readFile ../../nix/sources.json)).emanote.rev;
|
||||
emanote = builtins.getFlake "github:srid/emanote/${emanote_commit}";
|
||||
in {
|
||||
}: {
|
||||
imports = [emanote.homeManagerModule];
|
||||
services.emanote = {
|
||||
enable = true;
|
||||
|
|
@ -14,6 +11,6 @@ in {
|
|||
notes = [
|
||||
"${config.home.homeDirectory}/git/notes" # add as many layers as you like
|
||||
];
|
||||
package = emanote.packages."${builtins.currentSystem}".default;
|
||||
package = pkgs.emanote;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,16 @@
|
|||
{
|
||||
"emanote": {
|
||||
"branch": "master",
|
||||
"description": "Spiritual successor to neuron, based on Ema.",
|
||||
"homepage": "https://emanote.srid.ca",
|
||||
"owner": "srid",
|
||||
"repo": "emanote",
|
||||
"rev": "3300092d40c9092e33a6b22e53a30a2a82796138",
|
||||
"sha256": "0zfr6lcab9cy5qrympyrqga2z1v2fs7dqcfb2jfr5vmm3mlfywdj",
|
||||
"type": "tarball",
|
||||
"url": "https://github.com/srid/emanote/archive/3300092d40c9092e33a6b22e53a30a2a82796138.tar.gz",
|
||||
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
|
||||
},
|
||||
"hexa-nur-packages": {
|
||||
"branch": "master",
|
||||
"description": "My personal NUR repository: [maintainer=@mweinelt] ",
|
||||
|
|
|
|||
|
|
@ -19,15 +19,16 @@
|
|||
fonts = builtins.attrValues {
|
||||
inherit
|
||||
(pkgs)
|
||||
nerdfonts # For all my terminal needs.
|
||||
|
||||
libertinus # nice text font
|
||||
|
||||
material-icons # icons in my app
|
||||
|
||||
b612 # sans font, very good for displays
|
||||
|
||||
noto-fonts # for unicode fallback
|
||||
nerdfonts
|
||||
# For all my terminal needs.
|
||||
libertinus
|
||||
# nice text font
|
||||
material-icons
|
||||
# icons in my app
|
||||
b612
|
||||
# sans font, very good for displays
|
||||
noto-fonts
|
||||
# for unicode fallback
|
||||
;
|
||||
};
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,17 +1,11 @@
|
|||
self: super: let
|
||||
unstable = import super.sources.nixos-unstable {};
|
||||
nom_commit = (builtins.fromJSON (builtins.readFile ../nix/sources.json)).nix-output-monitor.rev;
|
||||
hx_commit = (builtins.fromJSON (builtins.readFile ../nix/sources.json)).helix.rev;
|
||||
bot_commit = (builtins.fromJSON (builtins.readFile ../nix/sources.json)).nixpkgs-bot.rev;
|
||||
hx = builtins.getFlake "github:helix-editor/helix/${hx_commit}";
|
||||
nom = builtins.getFlake "git+ssh://git@hera.m-0.eu/nix-output-monitor?rev=${nom_commit}&ref=main";
|
||||
bot = builtins.getFlake "git+ssh://git@hera.m-0.eu/nixpkgs-bot?rev=${bot_commit}&ref=main";
|
||||
in {
|
||||
inherit unstable;
|
||||
unstableHaskellPackages = unstable.haskellPackages;
|
||||
unstableGhc = unstable.ghc;
|
||||
inherit (unstable) nix home-assistant vscode-extensions vscodium cachix cabal2nix chrysalis nil taplo tut;
|
||||
nix-output-monitor = nom.packages.x86_64-linux.default;
|
||||
helix = hx.packages.x86_64-linux.default;
|
||||
nixpkgs-bot = bot.packages.x86_64-linux.default;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -93,8 +93,10 @@ self: super: {
|
|||
desktop-pkgs = {
|
||||
inherit
|
||||
(self)
|
||||
esphome # To flash devices
|
||||
esptool # provides esptool.py
|
||||
esphome
|
||||
# To flash devices
|
||||
esptool
|
||||
# provides esptool.py
|
||||
dconf
|
||||
lm_sensors
|
||||
xwayland
|
||||
|
|
|
|||
6
test.nix
6
test.nix
|
|
@ -1,8 +1,8 @@
|
|||
let
|
||||
sources = import ./nix/sources.nix;
|
||||
nix-pre-commit-hooks = import "${sources."pre-commit-hooks.nix"}/nix" {nixpkgs = sources.nixos-unstable;};
|
||||
commit = (builtins.fromJSON (builtins.readFile ./nix/sources.json))."pre-commit-hooks.nix".rev;
|
||||
nix-pre-commit-hooks = builtins.getFlake "github:cachix/pre-commit-hooks.nix/${commit}";
|
||||
in {
|
||||
pre-commit-check = nix-pre-commit-hooks.run {
|
||||
pre-commit-check = nix-pre-commit-hooks.lib.x86_64-linux.run {
|
||||
src = ./.;
|
||||
hooks = {
|
||||
hlint.enable = true;
|
||||
|
|
|
|||
Loading…
Reference in a new issue