maralorn/nixos-config
1
0
Fork 0
Code Wiki Activity

Fix pre-commit-checks

Browse source
This commit is contained in:
Malte 2022-11-22 16:25:54 +01:00
parent e0c046d5cd
commit f2b0ff5abb
16 changed files with 118 additions and 139 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
home-manager/roles/daily-driver-programs.nix
View file

@ -20,14 +20,12 @@
inherit inherit
(pkgs) (pkgs)
# web # web
chromium chromium
mumble mumble
upower upower
speedtest-cli speedtest-cli
acpi acpi
# tools & office # tools & office
feh feh
gimp gimp
imagemagick imagemagick
@ -40,7 +38,6 @@
beets beets
zbar zbar
# media # media
ncpamixer ncpamixer
pavucontrol pavucontrol
playerctl playerctl

36
home-manager/roles/neovim/default.nix
View file

@ -33,9 +33,12 @@
inherit inherit
(pkgs) (pkgs)
rust-analyzer rust-analyzer
taplo # toml taplo
nil # nix # toml
texlab # latex nil
# nix
texlab
# latex
lean lean
yaml-language-server yaml-language-server
; ;
@ -97,88 +100,61 @@ in {
inherit inherit
(pkgs.vimPlugins) (pkgs.vimPlugins)
# coc-tabnine (TODO: Why doesn‘t it work?) # coc-tabnine (TODO: Why doesn‘t it work?)
# TODO: tabnine config in home-manager # TODO: tabnine config in home-manager
# TODO: tabnine lsp: nix, rust, pandoc/latex lsp? was noch? # TODO: tabnine lsp: nix, rust, pandoc/latex lsp? was noch?
# === # ===
# Basic IDE plugins # Basic IDE plugins
coc-nvim coc-nvim
airline airline
# same word highlighting when not supported by language # same word highlighting when not supported by language
coc-highlight coc-highlight
coc-explorer coc-explorer
# searches # searches
coc-fzf coc-fzf
fzf-vim fzf-vim
# general whitespace # general whitespace
vim-trailing-whitespace vim-trailing-whitespace
vim-autoformat vim-autoformat
# Git # Git
coc-git coc-git
# statusline, numberline and explorer infos # statusline, numberline and explorer infos
fugitive fugitive
# various git commands # various git commands
# Commenting and Uncommenting # Commenting and Uncommenting
nerdcommenter nerdcommenter
# Theme # Theme
papercolor-theme papercolor-theme
vim-airline-themes vim-airline-themes
LanguageTool-nvim LanguageTool-nvim
vim-css-color vim-css-color
vista-vim vista-vim
# === # ===
# Languages # Languages
# haskell syntax highlighting # haskell syntax highlighting
haskell-vim haskell-vim
vim-hoogle vim-hoogle
# nix syntax highlighting # nix syntax highlighting
vim-nix vim-nix
vim-markdown vim-markdown
# latex # latex
vimtex vimtex
coc-vimtex coc-vimtex
# not sure if I need two # not sure if I need two
# ledger # ledger
vim-ledger vim-ledger
# rust # rust
coc-rls coc-rls
# python # python
coc-python coc-python
# css # css
coc-css coc-css
# yaml # yaml
coc-yaml coc-yaml
# json # json
coc-json coc-json
# html # html
coc-html coc-html
# dhall # dhall
dhall-vim dhall-vim
; ;
}; };

7
home-manager/roles/zettelkasten.nix
View file

@ -2,10 +2,7 @@
config, config,
pkgs, 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]; imports = [emanote.homeManagerModule];
services.emanote = { services.emanote = {
enable = true; enable = true;
@ -14,6 +11,6 @@ in {
notes = [ notes = [
"${config.home.homeDirectory}/git/notes" # add as many layers as you like "${config.home.homeDirectory}/git/notes" # add as many layers as you like
]; ];
package = emanote.packages."${builtins.currentSystem}".default; package = pkgs.emanote;
}; };
} }

12
nix/sources.json
View file

@ -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": { "hexa-nur-packages": {
"branch": "master", "branch": "master",
"description": "My personal NUR repository: [maintainer=@mweinelt] ", "description": "My personal NUR repository: [maintainer=@mweinelt] ",

19
nixos/roles/fonts.nix
View file

@ -19,15 +19,16 @@
fonts = builtins.attrValues { fonts = builtins.attrValues {
inherit inherit
(pkgs) (pkgs)
nerdfonts # For all my terminal needs. nerdfonts
# For all my terminal needs.
libertinus # nice text font libertinus
# nice text font
material-icons # icons in my app material-icons
# icons in my app
b612 # sans font, very good for displays b612
# sans font, very good for displays
noto-fonts # for unicode fallback noto-fonts
# for unicode fallback
; ;
}; };
}; };

6
overlays/10-previews.nix
View file

@ -1,17 +1,11 @@
self: super: let self: super: let
unstable = import super.sources.nixos-unstable {}; 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; 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"; bot = builtins.getFlake "git+ssh://git@hera.m-0.eu/nixpkgs-bot?rev=${bot_commit}&ref=main";
in { in {
inherit unstable; inherit unstable;
unstableHaskellPackages = unstable.haskellPackages; unstableHaskellPackages = unstable.haskellPackages;
unstableGhc = unstable.ghc; unstableGhc = unstable.ghc;
inherit (unstable) nix home-assistant vscode-extensions vscodium cachix cabal2nix chrysalis nil taplo tut; 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; nixpkgs-bot = bot.packages.x86_64-linux.default;
} }

6
overlays/pkgSets.nix
View file

@ -93,8 +93,10 @@ self: super: {
desktop-pkgs = { desktop-pkgs = {
inherit inherit
(self) (self)
esphome # To flash devices esphome
esptool # provides esptool.py # To flash devices
esptool
# provides esptool.py
dconf dconf
lm_sensors lm_sensors
xwayland xwayland

6
test.nix
View file

@ -1,8 +1,8 @@
let let
sources = import ./nix/sources.nix; commit = (builtins.fromJSON (builtins.readFile ./nix/sources.json))."pre-commit-hooks.nix".rev;
nix-pre-commit-hooks = import "${sources."pre-commit-hooks.nix"}/nix" {nixpkgs = sources.nixos-unstable;}; nix-pre-commit-hooks = builtins.getFlake "github:cachix/pre-commit-hooks.nix/${commit}";
in { in {
pre-commit-check = nix-pre-commit-hooks.run { pre-commit-check = nix-pre-commit-hooks.lib.x86_64-linux.run {
src = ./.; src = ./.;
hooks = { hooks = {
hlint.enable = true; hlint.enable = true;