kfm/niveum
1
0
Fork 0
mirror of https://github.com/kmein/niveum synced 2026-03-19 11:31:09 +01:00
Code Releases Activity

use stockholm

Browse Source
This commit is contained in:
Kierán Meinhardt
2019-04-18 17:09:34 +02:00
parent b2588bb4ab
commit 2f42fac548
6 changed files with 36 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
configs/packages.nix
View File

@@ -1,20 +1,23 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
let let
bvg = pkgs.callPackage <packages/bvg.nix> {};
daybook = pkgs.callPackage <packages/daybook.nix> {};
iolanguage = pkgs.callPackage <packages/iolanguage.nix> {};
sncli = pkgs.python3Packages.callPackage <packages/sncli.nix> {};
todoist = pkgs.callPackage <packages/todoist> {};
spotify-cli-linux = pkgs.python3Packages.callPackage <packages/spotify-cli-linux.nix> {};
instaloader = pkgs.python3Packages.callPackage <packages/instaloader.nix> {};
autorenkalender = pkgs.callPackage <packages/autorenkalender.nix> {};
haskells = import <dot/haskells.nix>;
unstable = import <nixos-unstable> {}; unstable = import <nixos-unstable> {};
executables = pkgs.haskell.lib.justStaticExecutables; executables = pkgs.haskell.lib.justStaticExecutables;
haskells = import <dot/haskells.nix>;
in with pkgs; in with pkgs;
{ {
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
nixpkgs.config.packageOverrides = pkgs: {
bvg = pkgs.callPackage <packages/bvg.nix> {};
daybook = pkgs.callPackage <packages/daybook.nix> {};
iolanguage = pkgs.callPackage <packages/iolanguage.nix> {};
sncli = pkgs.python3Packages.callPackage <packages/sncli.nix> {};
todoist = pkgs.callPackage <packages/todoist> {};
spotify-cli-linux = pkgs.python3Packages.callPackage <packages/spotify-cli-linux.nix> {};
instaloader = pkgs.python3Packages.callPackage <packages/instaloader.nix> {};
autorenkalender = pkgs.callPackage <packages/autorenkalender.nix> {};
};
fonts.enableDefaultFonts = true; fonts.enableDefaultFonts = true;
fonts.fonts = [ fonts.fonts = [
corefonts corefonts

25
configs/scripts.nix
View File

@@ -2,26 +2,11 @@
let let
theme = import <dot/theme.nix>; theme = import <dot/theme.nix>;
unstable = import <nixos-unstable> {}; unstable = import <nixos-unstable> {};
scripts.dic = pkgs.callPackage (pkgs.fetchurl { scripts.dic = pkgs.callPackage <stockholm/krebs/5pkgs/simple/dic/default.nix> {};
url = "https://cgit.krebsco.de/stockholm/plain/krebs/5pkgs/simple/dic/default.nix?id=8371e21c10bdb5d5353cc581efba7e09e4ce7a91"; scripts.yt-next = pkgs.callPackage <stockholm/lass/5pkgs/yt-next/default.nix> {};
sha256 = "1vd8mg1ac7wzrcs5bl20srkxcs65zr7rd7y3wxzrxspij5wrb23i"; scripts.acronym = pkgs.callPackage <stockholm/lass/5pkgs/acronym/default.nix> {};
}) {}; scripts.urban = pkgs.callPackage <stockholm/lass/5pkgs/urban/default.nix> {};
scripts.yt-next = pkgs.callPackage (pkgs.fetchurl { scripts.mpv-poll = pkgs.callPackage <stockholm/lass/5pkgs/mpv-poll/default.nix> {};
url = http://cgit.lassul.us/stockholm/plain/lass/5pkgs/yt-next/default.nix;
sha256 = "0j9r9xy34sl9ci5lz38060b3nakf0vd7gw46pykdiriwz6znbxn3";
}) {};
scripts.acronym = pkgs.callPackage (pkgs.fetchurl {
url = http://cgit.lassul.us/stockholm/plain/lass/5pkgs/acronym/default.nix;
sha256 = "1rpr1rniz74vmkl4r3hgrg8q7ncxrvbf7zp0lq9b7lva85i12zx9";
}) {};
scripts.urban = pkgs.callPackage (pkgs.fetchurl {
url = http://cgit.lassul.us/stockholm/plain/lass/5pkgs/urban/default.nix;
sha256 = "128v0znnapcqbyvc0nf112ddfyipr8sc1z4kcnggnbjf99i763ji";
}) {};
scripts.mpv-poll = pkgs.callPackage (pkgs.fetchurl {
url = http://cgit.lassul.us/stockholm/plain/lass/5pkgs/mpv-poll/default.nix;
sha256 = "0ccmm7spxll98j8gy58fc3p8331arznshsj5wn4kkcypcs16n6ci";
}) {};
scripts.instaget = unstable.writers.writeDashBin "instaget" '' scripts.instaget = unstable.writers.writeDashBin "instaget" ''
for url in "$@"; do for url in "$@"; do
${pkgs.curl}/bin/curl -s "$url" \ ${pkgs.curl}/bin/curl -s "$url" \

12
deploy.nix
View File

@@ -11,14 +11,18 @@ let
importJson = (import <nixpkgs> {}).lib.importJSON; importJson = (import <nixpkgs> {}).lib.importJSON;
source = {path, other ? {}}: lib.evalSource [({ source = {path, other ? {}}: lib.evalSource [({
home-manager.git = {
url = https://github.com/rycee/home-manager;
ref = "2ccbf43";
};
nixpkgs.git = { nixpkgs.git = {
url = https://github.com/NixOS/nixpkgs-channels; url = https://github.com/NixOS/nixpkgs-channels;
ref = (importJson ./nixpkgs.json).rev; ref = (importJson ./nixpkgs.json).rev;
}; };
# stockholm.git = { stockholm.git = {
# url = https://cgit.krebsco.de/stockholm; url = https://cgit.krebsco.de/stockholm;
# ref = "7e1b197dab13d024ba491c96dc959306324943c0"; ref = "7e1b197dab13d024ba491c96dc959306324943c0";
# }; };
system.file = toString path; system.file = toString path;
art.file = toString ./art; art.file = toString ./art;
lib.file = toString ./lib; lib.file = toString ./lib;

2
dot/vimrc
View File

@@ -131,6 +131,8 @@ if has("autocmd")
autocmd bufreadpre * setlocal foldmethod=indent autocmd bufreadpre * setlocal foldmethod=indent
" autocmd bufwritepre * :call <SID>StripTrailingWhitespaces() " autocmd bufwritepre * :call <SID>StripTrailingWhitespaces()
autocmd bufwinenter * if &fdm == 'indent' | setlocal foldmethod=manual | endif autocmd bufwinenter * if &fdm == 'indent' | setlocal foldmethod=manual | endif
autocmd VimEnter * UpdateRemotePlugins
endif endif
"if exists("g:loaded_startify") "if exists("g:loaded_startify")

6
nixpkgs.json
View File

@@ -1,7 +1,7 @@
{ {
"url": "https://github.com/NixOS/nixpkgs-channels", "url": "https://github.com/NixOS/nixpkgs-channels",
"rev": "46d3867a08a9206685e2b6a8e19f5ad9f6ab4b39", "rev": "05ef70a46fe22a0d4030dc92424b4ae72793abd2",
"date": "2019-04-11T01:41:16+03:00", "date": "2019-04-13T16:30:47+02:00",
"sha256": "16nryjvfaw2dq55yp34hcw5bz8nlidhdi3yvr2ilr7lrlm4k54p1", "sha256": "1hgsrday43nn6hsha5ggdw5f4lf60m0k45yfjf7d6l3w13vnpnk5",
"fetchSubmodules": false "fetchSubmodules": false
} }

11
systems/generic.nix
View File

@@ -3,7 +3,7 @@ let
helpers = import <lib>; helpers = import <lib>;
in { in {
imports = [ imports = [
"${builtins.fetchTarball https://github.com/rycee/home-manager/archive/release-18.09.tar.gz}/nixos" <home-manager/nixos>
<modules/defaultApplications.nix> <modules/defaultApplications.nix>
<configs/hu-berlin.nix> <configs/hu-berlin.nix>
<configs/shells.nix> <configs/shells.nix>
@@ -16,6 +16,7 @@ in {
]; ];
boot.cleanTmpDir = true; boot.cleanTmpDir = true;
boot.loader.timeout = 1;
boot.extraModulePackages = [ config.boot.kernelPackages.exfat-nofuse ]; boot.extraModulePackages = [ config.boot.kernelPackages.exfat-nofuse ];
time.timeZone = "Europe/Berlin"; time.timeZone = "Europe/Berlin";
@@ -102,8 +103,8 @@ in {
}; };
xdg.configFile = { xdg.configFile = {
"mpv/input.conf".text = import <niveum/dot/mpv.nix>; "mpv/input.conf".text = import <dot/mpv.nix>;
"htop/htoprc".text = builtins.readFile <niveum/dot/htoprc>; "htop/htoprc".text = builtins.readFile <dot/htoprc>;
"zathura/zathurarc".text = "set selection-clipboard clipboard"; "zathura/zathurarc".text = "set selection-clipboard clipboard";
"pycodestyle".text = '' "pycodestyle".text = ''
[pycodestyle] [pycodestyle]
@@ -112,8 +113,8 @@ in {
}; };
home.file = { home.file = {
".ghc/ghci.conf".text = import <niveum/dot/ghci.nix> { inherit pkgs; }; ".ghc/ghci.conf".text = import <dot/ghci.nix> { inherit pkgs; };
".stack/config.yaml".text = import <niveum/dot/stack.nix> { user = config.constants.user; }; ".stack/config.yaml".text = import <dot/stack.nix> { user = config.constants.user; };
".zshrc".text = "# nothing to see here"; ".zshrc".text = "# nothing to see here";
}; };
}; };