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

19.03

Browse Source
This commit is contained in:
Kierán Meinhardt
2019-05-15 18:21:58 +02:00
parent edf32ed979
commit 495fcf0775
7 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
configs/default.nix
View File

@@ -49,9 +49,6 @@
<configs/xautolock.nix> <configs/xautolock.nix>
<configs/xresources.nix> <configs/xresources.nix>
<configs/zsh.nix> <configs/zsh.nix>
{
nix.buildCores = 0;
}
{ {
niveum.user = { niveum.user = {
github = "kmein"; github = "kmein";
@@ -74,6 +71,7 @@
allowUnfree = true; allowUnfree = true;
packageOverrides = pkgs: { packageOverrides = pkgs: {
autorenkalender = pkgs.callPackage <packages/autorenkalender.nix> {}; autorenkalender = pkgs.callPackage <packages/autorenkalender.nix> {};
quote-db = pkgs.haskellPackages.callPackage <packages/quote-db.nix> {};
bvg = pkgs.callPackage <packages/bvg.nix> {}; bvg = pkgs.callPackage <packages/bvg.nix> {};
daybook = pkgs.callPackage <packages/daybook.nix> {}; daybook = pkgs.callPackage <packages/daybook.nix> {};
font-size = pkgs.callPackage <packages/font-size.nix> { font = config.niveum.fonts.terminal; }; font-size = pkgs.callPackage <packages/font-size.nix> { font = config.niveum.fonts.terminal; };
@@ -150,7 +148,7 @@
(pkgs.unstable.writers.writeDashBin "niveum-update" '' (pkgs.unstable.writers.writeDashBin "niveum-update" ''
NIVEUM_DIR=/home/kfm/prog/git/niveum NIVEUM_DIR=/home/kfm/prog/git/niveum
nix-prefetch-git --url https://github.com/NixOS/nixpkgs-channels --rev refs/heads/nixos-18.09 > "$NIVEUM_DIR/nixpkgs.json" nix-prefetch-git --url https://github.com/NixOS/nixpkgs-channels --rev refs/heads/nixos-${config.system.stateVersion} > "$NIVEUM_DIR/nixpkgs.json"
'') '')
]; ];
} }
@@ -334,6 +332,7 @@
autorenkalender autorenkalender
font-size font-size
odyssey odyssey
# quote-db
literature-quote literature-quote
dic dic
yt-next yt-next

12
configs/git.nix
View File

@@ -1,5 +1,17 @@
{ pkgs, config, ... }: { pkgs, config, ... }:
{ {
imports = [ <modules/git.nix> ];
# niveum.git = {
# enable = true;
# repositories.niveum = {
# enable = true;
# location = "/tmp/niveum";
# branches = [ "master" ];
# remotes.origin = "git@github.com:kmein/niveum";
# };
# };
environment.systemPackages = [ environment.systemPackages = [
pkgs.git pkgs.git
pkgs.gitAndTools.hub pkgs.gitAndTools.hub

10
configs/i3.nix
View File

@@ -72,7 +72,7 @@ in with config.niveum; {
separator = " " separator = " "
} }
order += "run_watch retiolum" # order += "run_watch retiolum"
order += "path_exists openvpn" order += "path_exists openvpn"
order += "wireless ${wifi-interface}" order += "wireless ${wifi-interface}"
order += "battery all" order += "battery all"
@@ -85,10 +85,10 @@ in with config.niveum; {
format_down = "offline" format_down = "offline"
} }
run_watch retiolum { # run_watch retiolum {
pidfile = "/var/run/tinc.retiolum.pid" # pidfile = "/var/run/tinc.retiolum.pid"
format = "%title" # format = "%title"
} # }
path_exists openvpn { path_exists openvpn {
path = "/proc/sys/net/ipv4/conf/tun0" path = "/proc/sys/net/ipv4/conf/tun0"

1
deploy.nix
View File

@@ -5,6 +5,7 @@
let let
krops = builtins.fetchGit { krops = builtins.fetchGit {
url = "https://cgit.krebsco.de/krops/"; url = "https://cgit.krebsco.de/krops/";
ref = "v1.14.0";
}; };
lib = import "${krops}/lib"; lib = import "${krops}/lib";
pkgs = import "${krops}/pkgs" {}; pkgs = import "${krops}/pkgs" {};

6
nixpkgs.json
View File

@@ -1,7 +1,7 @@
{ {
"url": "https://github.com/NixOS/nixpkgs-channels", "url": "https://github.com/NixOS/nixpkgs-channels",
"rev": "571b40d3f50466d3e91c1e609d372de96d782793", "rev": "7cd2e4ebe8ca91f829b405451586868744270100",
"date": "2019-04-23T11:24:45+02:00", "date": "2019-05-14T00:18:11+02:00",
"sha256": "0qjpkx2b5pac1nqr5chvlrlcyyk294w2079ybf88p95qxkqbbby5", "sha256": "0h4lacvqmk356ihc7gnb44dni6m5qza23vlgl6w6jdhr9pjcmdcm",
"fetchSubmodules": false "fetchSubmodules": false
} }

2
systems/homeros/configuration.nix
View File

@@ -16,5 +16,5 @@
networking.hostName = "homeros"; networking.hostName = "homeros";
system.stateVersion = "18.09"; system.stateVersion = "19.03";
} }

2
systems/scardanelli/configuration.nix
View File

@@ -13,5 +13,5 @@
networking.hostName = "scardanelli"; networking.hostName = "scardanelli";
system.stateVersion = "18.09"; system.stateVersion = "19.03";
} }