mirror of
https://github.com/kmein/niveum
synced 2026-03-20 03:51:07 +01:00
chore: nixfmt
This commit is contained in:
@@ -1,16 +1,13 @@
|
||||
{ pkgs, lib, ... }:
|
||||
let
|
||||
scripts = import <niveum/packages/scripts> { inherit pkgs lib; };
|
||||
in
|
||||
{
|
||||
let scripts = import <niveum/packages/scripts> { inherit pkgs lib; };
|
||||
in {
|
||||
imports = [
|
||||
./krebs.nix
|
||||
./writing.nix
|
||||
./python.nix
|
||||
./haskell
|
||||
{
|
||||
environment.systemPackages =
|
||||
let
|
||||
environment.systemPackages = let
|
||||
# nightly = pkgs.rustChannelOf {
|
||||
# date = "2019-12-27";
|
||||
# channel = "nightly";
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
{ config, pkgs, ... }:
|
||||
{
|
||||
{ config, pkgs, ... }: {
|
||||
home-manager.users.me.home.file = {
|
||||
".ghc/ghci.conf".text = ''
|
||||
:set editor vim
|
||||
@@ -10,15 +9,16 @@
|
||||
:set -Wall
|
||||
:set -XOverloadedStrings
|
||||
'';
|
||||
# :def unpl \x -> return $ ":!${pkgs.haskellPackages.pointful}/bin/pointful \"" ++ x ++ "\""
|
||||
".stack/config.yaml".text = let inherit (config.niveum) user; in builtins.toJSON {
|
||||
templates.params = {
|
||||
author-name = user.name;
|
||||
author-email = user.email;
|
||||
copyright = "Copyright: (c) 2019 ${user.name}";
|
||||
github-username = user.github;
|
||||
};
|
||||
# :def unpl \x -> return $ ":!${pkgs.haskellPackages.pointful}/bin/pointful \"" ++ x ++ "\""
|
||||
".stack/config.yaml".text = let inherit (config.niveum) user;
|
||||
in builtins.toJSON {
|
||||
templates.params = {
|
||||
author-name = user.name;
|
||||
author-email = user.email;
|
||||
copyright = "Copyright: (c) 2019 ${user.name}";
|
||||
github-username = user.github;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
services.hoogle = {
|
||||
@@ -27,19 +27,20 @@
|
||||
port = 8091;
|
||||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
cabal2nix
|
||||
cabal-install
|
||||
hlint
|
||||
haskellPackages.brittany
|
||||
# haskellPackages.hfmt
|
||||
(haskellPackages.ghcWithHoogle (import ./packages.nix))
|
||||
] ++ map haskell.lib.justStaticExecutables [
|
||||
haskellPackages.ghcid
|
||||
haskellPackages.hasktags
|
||||
haskellPackages.hindent
|
||||
haskellPackages.pointfree
|
||||
# haskellPackages.pointful
|
||||
haskellPackages.hpack
|
||||
];
|
||||
environment.systemPackages = with pkgs;
|
||||
[
|
||||
cabal2nix
|
||||
cabal-install
|
||||
hlint
|
||||
haskellPackages.brittany
|
||||
# haskellPackages.hfmt
|
||||
(haskellPackages.ghcWithHoogle (import ./packages.nix))
|
||||
] ++ map haskell.lib.justStaticExecutables [
|
||||
haskellPackages.ghcid
|
||||
haskellPackages.hasktags
|
||||
haskellPackages.hindent
|
||||
haskellPackages.pointfree
|
||||
# haskellPackages.pointful
|
||||
haskellPackages.hpack
|
||||
];
|
||||
}
|
||||
|
||||
@@ -1,19 +1,24 @@
|
||||
{ lib, pkgs, ... }:
|
||||
let krebs-packages = pkgs: {
|
||||
dic = pkgs.callPackage <stockholm/krebs/5pkgs/simple/dic> {};
|
||||
yt-next = pkgs.callPackage <stockholm/lass/5pkgs/yt-next> {};
|
||||
acronym = pkgs.callPackage <stockholm/lass/5pkgs/acronym> {};
|
||||
urban = pkgs.callPackage <stockholm/lass/5pkgs/urban> {};
|
||||
mpv-poll = pkgs.callPackage <stockholm/lass/5pkgs/mpv-poll> {};
|
||||
untilport = pkgs.callPackage <stockholm/krebs/5pkgs/simple/untilport> {};
|
||||
kpaste = pkgs.callPackage <stockholm/krebs/5pkgs/simple/kpaste> {};
|
||||
krebspaste = pkgs.callPackage <stockholm/krebs/5pkgs/simple/krebspaste> {};
|
||||
bepasty-client-cli = pkgs.callPackage <stockholm/krebs/5pkgs/simple/bepasty-client-cli> {};
|
||||
irc-announce = pkgs.callPackage <stockholm/krebs/5pkgs/simple/irc-announce> {};
|
||||
git-preview = pkgs.callPackage <stockholm/krebs/5pkgs/simple/git-preview> {};
|
||||
};
|
||||
let
|
||||
krebs-packages = pkgs: {
|
||||
dic = pkgs.callPackage <stockholm/krebs/5pkgs/simple/dic> { };
|
||||
yt-next = pkgs.callPackage <stockholm/lass/5pkgs/yt-next> { };
|
||||
acronym = pkgs.callPackage <stockholm/lass/5pkgs/acronym> { };
|
||||
urban = pkgs.callPackage <stockholm/lass/5pkgs/urban> { };
|
||||
mpv-poll = pkgs.callPackage <stockholm/lass/5pkgs/mpv-poll> { };
|
||||
untilport = pkgs.callPackage <stockholm/krebs/5pkgs/simple/untilport> { };
|
||||
kpaste = pkgs.callPackage <stockholm/krebs/5pkgs/simple/kpaste> { };
|
||||
krebspaste = pkgs.callPackage <stockholm/krebs/5pkgs/simple/krebspaste> { };
|
||||
bepasty-client-cli =
|
||||
pkgs.callPackage <stockholm/krebs/5pkgs/simple/bepasty-client-cli> { };
|
||||
irc-announce =
|
||||
pkgs.callPackage <stockholm/krebs/5pkgs/simple/irc-announce> { };
|
||||
git-preview =
|
||||
pkgs.callPackage <stockholm/krebs/5pkgs/simple/git-preview> { };
|
||||
};
|
||||
in {
|
||||
nixpkgs.config.packageOverrides = krebs-packages;
|
||||
|
||||
environment.systemPackages = map (name: pkgs.${name}) (lib.attrNames (krebs-packages pkgs));
|
||||
environment.systemPackages =
|
||||
map (name: pkgs.${name}) (lib.attrNames (krebs-packages pkgs));
|
||||
}
|
||||
|
||||
@@ -1,22 +1,19 @@
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
{ pkgs, ... }: {
|
||||
environment.systemPackages = [
|
||||
(pkgs.python3.withPackages
|
||||
(py: [
|
||||
py.black
|
||||
py.python-language-server
|
||||
py.pyls-mypy
|
||||
py.pyls-black
|
||||
py.pyls-isort
|
||||
py.flake8
|
||||
py.flask
|
||||
py.pygments
|
||||
py.docopt
|
||||
py.schema
|
||||
py.ansicolors
|
||||
py.virtualenv
|
||||
])
|
||||
)
|
||||
(pkgs.python3.withPackages (py: [
|
||||
py.black
|
||||
py.python-language-server
|
||||
py.pyls-mypy
|
||||
py.pyls-black
|
||||
py.pyls-isort
|
||||
py.flake8
|
||||
py.flask
|
||||
py.pygments
|
||||
py.docopt
|
||||
py.schema
|
||||
py.ansicolors
|
||||
py.virtualenv
|
||||
]))
|
||||
];
|
||||
|
||||
home-manager.users.me.xdg.configFile."pycodestyle".text = ''
|
||||
|
||||
@@ -7,10 +7,13 @@ let
|
||||
inherit sha256;
|
||||
};
|
||||
};
|
||||
makeStardictDataDir = dicts: pkgs.linkFarm "dictionaries" (map ({name, path}: { name = "dic/${name}"; inherit path; }) dicts);
|
||||
makeStardictDataDir = dicts:
|
||||
pkgs.linkFarm "dictionaries" (map ({ name, path }: {
|
||||
name = "dic/${name}";
|
||||
inherit path;
|
||||
}) dicts);
|
||||
scardanelli = config.networking.hostName == "scardanelli";
|
||||
in
|
||||
{
|
||||
in {
|
||||
environment.variables.STARDICT_DATA_DIR = toString (makeStardictDataDir [
|
||||
{
|
||||
name = "gr-de";
|
||||
@@ -35,31 +38,31 @@ in
|
||||
}
|
||||
]);
|
||||
|
||||
|
||||
environment.variables.CITATIONSTYLES = toString (pkgs.linkFarm "citation-styles" [
|
||||
(zoteroStyle {
|
||||
name = "chicago-author-date-de";
|
||||
sha256 = "0fz0xn46rkciblr34a7x2v60j0lbq9l3fmzi43iphph27m0czn6s";
|
||||
})
|
||||
(zoteroStyle {
|
||||
name = "din-1505-2";
|
||||
sha256 =
|
||||
if scardanelli
|
||||
then "1pvy1b7qm13mnph7z365rrz1j082bl2y8ih73rhzd0zd6dz1jyjq"
|
||||
else "150kbnxl1r4g1s40khdavv5s6ah10ws135r9k883f6srk78sz6zi";
|
||||
})
|
||||
(zoteroStyle {
|
||||
name = "apa";
|
||||
sha256 =
|
||||
if scardanelli
|
||||
then "0g8vhp7gnd315h5b60r3zqp49kaq3fkxqnz2v7j2a0zp6s3cisdk"
|
||||
else "1rg41mblmqifba1azb6481dwxhsbl606kf6ysqkqd786f9l9dcf8";
|
||||
})
|
||||
]);
|
||||
environment.variables.CITATIONSTYLES = toString
|
||||
(pkgs.linkFarm "citation-styles" [
|
||||
(zoteroStyle {
|
||||
name = "chicago-author-date-de";
|
||||
sha256 = "0fz0xn46rkciblr34a7x2v60j0lbq9l3fmzi43iphph27m0czn6s";
|
||||
})
|
||||
(zoteroStyle {
|
||||
name = "din-1505-2";
|
||||
sha256 = if scardanelli then
|
||||
"1pvy1b7qm13mnph7z365rrz1j082bl2y8ih73rhzd0zd6dz1jyjq"
|
||||
else
|
||||
"150kbnxl1r4g1s40khdavv5s6ah10ws135r9k883f6srk78sz6zi";
|
||||
})
|
||||
(zoteroStyle {
|
||||
name = "apa";
|
||||
sha256 = if scardanelli then
|
||||
"0g8vhp7gnd315h5b60r3zqp49kaq3fkxqnz2v7j2a0zp6s3cisdk"
|
||||
else
|
||||
"1rg41mblmqifba1azb6481dwxhsbl606kf6ysqkqd786f9l9dcf8";
|
||||
})
|
||||
]);
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
texlive.combined.scheme-full
|
||||
(aspellWithDicts (dict: [dict.de dict.en dict.en-computers]))
|
||||
(aspellWithDicts (dict: [ dict.de dict.en dict.en-computers ]))
|
||||
haskellPackages.pandoc-citeproc
|
||||
# nur.repos.kmein.text2pdf
|
||||
libreoffice
|
||||
|
||||
Reference in New Issue
Block a user