From 2f42fac5482b280b0e1bdd40fd2add0d4736e624 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= Date: Thu, 18 Apr 2019 17:09:34 +0200 Subject: [PATCH] use stockholm --- configs/packages.nix | 21 ++++++++++++--------- configs/scripts.nix | 25 +++++-------------------- deploy.nix | 12 ++++++++---- dot/vimrc | 2 ++ nixpkgs.json | 6 +++--- systems/generic.nix | 11 ++++++----- 6 files changed, 36 insertions(+), 41 deletions(-) diff --git a/configs/packages.nix b/configs/packages.nix index cb1ba62..bb0b282 100644 --- a/configs/packages.nix +++ b/configs/packages.nix @@ -1,20 +1,23 @@ { config, pkgs, lib, ... }: let - bvg = pkgs.callPackage {}; - daybook = pkgs.callPackage {}; - iolanguage = pkgs.callPackage {}; - sncli = pkgs.python3Packages.callPackage {}; - todoist = pkgs.callPackage {}; - spotify-cli-linux = pkgs.python3Packages.callPackage {}; - instaloader = pkgs.python3Packages.callPackage {}; - autorenkalender = pkgs.callPackage {}; - haskells = import ; unstable = import {}; executables = pkgs.haskell.lib.justStaticExecutables; + haskells = import ; in with pkgs; { nixpkgs.config.allowUnfree = true; + nixpkgs.config.packageOverrides = pkgs: { + bvg = pkgs.callPackage {}; + daybook = pkgs.callPackage {}; + iolanguage = pkgs.callPackage {}; + sncli = pkgs.python3Packages.callPackage {}; + todoist = pkgs.callPackage {}; + spotify-cli-linux = pkgs.python3Packages.callPackage {}; + instaloader = pkgs.python3Packages.callPackage {}; + autorenkalender = pkgs.callPackage {}; + }; + fonts.enableDefaultFonts = true; fonts.fonts = [ corefonts diff --git a/configs/scripts.nix b/configs/scripts.nix index cbd2f55..b2ad2b2 100644 --- a/configs/scripts.nix +++ b/configs/scripts.nix @@ -2,26 +2,11 @@ let theme = import ; unstable = import {}; - scripts.dic = pkgs.callPackage (pkgs.fetchurl { - url = "https://cgit.krebsco.de/stockholm/plain/krebs/5pkgs/simple/dic/default.nix?id=8371e21c10bdb5d5353cc581efba7e09e4ce7a91"; - sha256 = "1vd8mg1ac7wzrcs5bl20srkxcs65zr7rd7y3wxzrxspij5wrb23i"; - }) {}; - scripts.yt-next = pkgs.callPackage (pkgs.fetchurl { - 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.dic = pkgs.callPackage {}; + scripts.yt-next = pkgs.callPackage {}; + scripts.acronym = pkgs.callPackage {}; + scripts.urban = pkgs.callPackage {}; + scripts.mpv-poll = pkgs.callPackage {}; scripts.instaget = unstable.writers.writeDashBin "instaget" '' for url in "$@"; do ${pkgs.curl}/bin/curl -s "$url" \ diff --git a/deploy.nix b/deploy.nix index 694f381..e21f1ea 100644 --- a/deploy.nix +++ b/deploy.nix @@ -11,14 +11,18 @@ let importJson = (import {}).lib.importJSON; source = {path, other ? {}}: lib.evalSource [({ + home-manager.git = { + url = https://github.com/rycee/home-manager; + ref = "2ccbf43"; + }; nixpkgs.git = { url = https://github.com/NixOS/nixpkgs-channels; ref = (importJson ./nixpkgs.json).rev; }; - # stockholm.git = { - # url = https://cgit.krebsco.de/stockholm; - # ref = "7e1b197dab13d024ba491c96dc959306324943c0"; - # }; + stockholm.git = { + url = https://cgit.krebsco.de/stockholm; + ref = "7e1b197dab13d024ba491c96dc959306324943c0"; + }; system.file = toString path; art.file = toString ./art; lib.file = toString ./lib; diff --git a/dot/vimrc b/dot/vimrc index 32e43c5..72c9b11 100644 --- a/dot/vimrc +++ b/dot/vimrc @@ -131,6 +131,8 @@ if has("autocmd") autocmd bufreadpre * setlocal foldmethod=indent " autocmd bufwritepre * :call StripTrailingWhitespaces() autocmd bufwinenter * if &fdm == 'indent' | setlocal foldmethod=manual | endif + + autocmd VimEnter * UpdateRemotePlugins endif "if exists("g:loaded_startify") diff --git a/nixpkgs.json b/nixpkgs.json index 594227e..7a6f41b 100644 --- a/nixpkgs.json +++ b/nixpkgs.json @@ -1,7 +1,7 @@ { "url": "https://github.com/NixOS/nixpkgs-channels", - "rev": "46d3867a08a9206685e2b6a8e19f5ad9f6ab4b39", - "date": "2019-04-11T01:41:16+03:00", - "sha256": "16nryjvfaw2dq55yp34hcw5bz8nlidhdi3yvr2ilr7lrlm4k54p1", + "rev": "05ef70a46fe22a0d4030dc92424b4ae72793abd2", + "date": "2019-04-13T16:30:47+02:00", + "sha256": "1hgsrday43nn6hsha5ggdw5f4lf60m0k45yfjf7d6l3w13vnpnk5", "fetchSubmodules": false } diff --git a/systems/generic.nix b/systems/generic.nix index e743e6c..0220a11 100644 --- a/systems/generic.nix +++ b/systems/generic.nix @@ -3,7 +3,7 @@ let helpers = import ; in { imports = [ - "${builtins.fetchTarball https://github.com/rycee/home-manager/archive/release-18.09.tar.gz}/nixos" + @@ -16,6 +16,7 @@ in { ]; boot.cleanTmpDir = true; + boot.loader.timeout = 1; boot.extraModulePackages = [ config.boot.kernelPackages.exfat-nofuse ]; time.timeZone = "Europe/Berlin"; @@ -102,8 +103,8 @@ in { }; xdg.configFile = { - "mpv/input.conf".text = import ; - "htop/htoprc".text = builtins.readFile ; + "mpv/input.conf".text = import ; + "htop/htoprc".text = builtins.readFile ; "zathura/zathurarc".text = "set selection-clipboard clipboard"; "pycodestyle".text = '' [pycodestyle] @@ -112,8 +113,8 @@ in { }; home.file = { - ".ghc/ghci.conf".text = import { inherit pkgs; }; - ".stack/config.yaml".text = import { user = config.constants.user; }; + ".ghc/ghci.conf".text = import { inherit pkgs; }; + ".stack/config.yaml".text = import { user = config.constants.user; }; ".zshrc".text = "# nothing to see here"; }; };