From 207c451d7d9c816270803a5c8d4e8b4a6e6ec0c7 Mon Sep 17 00:00:00 2001 From: nin Date: Wed, 22 Feb 2017 21:35:38 +0100 Subject: n 2 nixpkgs: d2cd8a0 -> 6651c72 --- nin/2configs/nixpkgs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nin') diff --git a/nin/2configs/nixpkgs.nix b/nin/2configs/nixpkgs.nix index 27a845bd..ad39848b 100644 --- a/nin/2configs/nixpkgs.nix +++ b/nin/2configs/nixpkgs.nix @@ -3,6 +3,6 @@ { krebs.build.source.nixpkgs.git = { url = https://github.com/nixos/nixpkgs; - ref = "d2cd8a0"; + ref = "6651c72"; }; } -- cgit v1.2.3 From 95a178a5dfafc0e06548cd005f99e5abd8dc8c78 Mon Sep 17 00:00:00 2001 From: nin Date: Fri, 3 Mar 2017 14:09:53 +0100 Subject: n 1 hiawatha: add git + git config --- nin/1systems/hiawatha.nix | 5 ++++- nin/2configs/git.nix | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'nin') diff --git a/nin/1systems/hiawatha.nix b/nin/1systems/hiawatha.nix index af865497..12f2718b 100644 --- a/nin/1systems/hiawatha.nix +++ b/nin/1systems/hiawatha.nix @@ -10,8 +10,11 @@ with lib; imports = [ ../. - ../2configs/retiolum.nix + ../2configs/copyq.nix + ../2configs/games.nix ../2configs/git.nix + ../2configs/retiolum.nix + ../2configs/termite.nix ]; krebs.build.host = config.krebs.hosts.hiawatha; diff --git a/nin/2configs/git.nix b/nin/2configs/git.nix index 39f919e7..6bdc857d 100644 --- a/nin/2configs/git.nix +++ b/nin/2configs/git.nix @@ -5,6 +5,7 @@ with import ; let out = { + services.nginx.enable = true; krebs.git = { enable = true; cgit = { -- cgit v1.2.3 From 23314b0aca248d234c122dab4eaaaaf2c9286677 Mon Sep 17 00:00:00 2001 From: nin Date: Fri, 3 Mar 2017 14:11:07 +0100 Subject: n 2: add copyq --- nin/2configs/copyq.nix | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 nin/2configs/copyq.nix (limited to 'nin') diff --git a/nin/2configs/copyq.nix b/nin/2configs/copyq.nix new file mode 100644 index 00000000..0616c402 --- /dev/null +++ b/nin/2configs/copyq.nix @@ -0,0 +1,38 @@ +{ config, pkgs, ... }: +with import ; +let + copyqConfig = pkgs.writeDash "copyq-config" '' + ${pkgs.copyq}/bin/copyq config check_clipboard true + ${pkgs.copyq}/bin/copyq config check_selection true + ${pkgs.copyq}/bin/copyq config copy_clipboard true + ${pkgs.copyq}/bin/copyq config copy_selection true + + ${pkgs.copyq}/bin/copyq config activate_closes true + ${pkgs.copyq}/bin/copyq config clipboard_notification_lines 0 + ${pkgs.copyq}/bin/copyq config clipboard_tab clipboard + ${pkgs.copyq}/bin/copyq config disable_tray true + ${pkgs.copyq}/bin/copyq config hide_tabs true + ${pkgs.copyq}/bin/copyq config hide_toolbar true + ${pkgs.copyq}/bin/copyq config item_popup_interval true + ${pkgs.copyq}/bin/copyq config maxitems 1000 + ${pkgs.copyq}/bin/copyq config move true + ${pkgs.copyq}/bin/copyq config text_wrap true + ''; +in { + systemd.user.services.copyq = { + after = [ "graphical.target" ]; + wants = [ "graphical.target" ]; + wantedBy = [ "default.target" ]; + environment = { + DISPLAY = ":0"; + }; + serviceConfig = { + SyslogIdentifier = "copyq"; + ExecStart = "${pkgs.copyq}/bin/copyq"; + ExecStartPost = copyqConfig; + Restart = "always"; + RestartSec = "2s"; + StartLimitBurst = 0; + }; + }; +} -- cgit v1.2.3 From 953046f7218f9752b5164b45301d87ed1995e351 Mon Sep 17 00:00:00 2001 From: nin Date: Fri, 3 Mar 2017 14:11:40 +0100 Subject: n 2: steal games from lass --- nin/2configs/games.nix | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 nin/2configs/games.nix (limited to 'nin') diff --git a/nin/2configs/games.nix b/nin/2configs/games.nix new file mode 100644 index 00000000..a7edae07 --- /dev/null +++ b/nin/2configs/games.nix @@ -0,0 +1,70 @@ +{ config, pkgs, ... }: + +let + mainUser = config.users.extraUsers.mainUser; + vdoom = pkgs.writeDash "vdoom" '' + ${pkgs.zandronum-bin}/bin/zandronum \ + -fov 120 \ + "$@" + ''; + doom = pkgs.writeDash "doom" '' + DOOM_DIR=''${DOOM_DIR:-~/doom/} + ${vdoom} \ + -file $DOOM_DIR/lib/brutalv20.pk3 \ + "$@" + ''; + doom1 = pkgs.writeDashBin "doom1" '' + DOOM_DIR=''${DOOM_DIR:-~/doom/} + ${doom} -iwad $DOOM_DIR/wads/stock/doom.wad "$@" + ''; + doom2 = pkgs.writeDashBin "doom2" '' + DOOM_DIR=''${DOOM_DIR:-~/doom/} + ${doom} -iwad $DOOM_DIR/wads/stock/doom2.wad "$@" + ''; + vdoom1 = pkgs.writeDashBin "vdoom1" '' + DOOM_DIR=''${DOOM_DIR:-~/doom/} + ${vdoom} -iwad $DOOM_DIR/wads/stock/doom.wad "$@" + ''; + vdoom2 = pkgs.writeDashBin "vdoom2" '' + DOOM_DIR=''${DOOM_DIR:-~/doom/} + ${vdoom} -iwad $DOOM_DIR/wads/stock/doom2.wad "$@" + ''; + + doomservercfg = pkgs.writeText "doomserver.cfg" '' + skill 7 + #survival true + #sv_maxlives 4 + #sv_norespawn true + #sv_weapondrop true + no_jump true + #sv_noweaponspawn true + sv_sharekeys true + sv_survivalcountdowntime 1 + sv_noteamselect true + sv_updatemaster false + #sv_coop_loseinventory true + #cl_startasspectator false + #lms_spectatorview false + ''; + + vdoomserver = pkgs.writeDashBin "vdoomserver" '' + DOOM_DIR=''${DOOM_DIR:-~/doom/} + + ${pkgs.zandronum-bin}/bin/zandronum-server \ + +exec ${doomservercfg} \ + "$@" + ''; + +in { + environment.systemPackages = with pkgs; [ + dwarf_fortress + doom1 + doom2 + vdoom1 + vdoom2 + vdoomserver + ]; + + hardware.pulseaudio.support32Bit = true; + +} -- cgit v1.2.3 From 01868340e25ffb05ea8b784c5cdf47c251157dfb Mon Sep 17 00:00:00 2001 From: nin Date: Fri, 3 Mar 2017 14:12:15 +0100 Subject: n 2: add termite terminal --- nin/2configs/termite.nix | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 nin/2configs/termite.nix (limited to 'nin') diff --git a/nin/2configs/termite.nix b/nin/2configs/termite.nix new file mode 100644 index 00000000..942446b0 --- /dev/null +++ b/nin/2configs/termite.nix @@ -0,0 +1,22 @@ +{ config, pkgs, ... }: + +{ + environment.systemPackages = [ + pkgs.termite + ]; + + krebs.per-user.nin.packages = let + termitecfg = pkgs.writeTextFile { + name = "termite-config"; + destination = "/etc/xdg/termite/config"; + text = '' + [colors] + foreground = #d0d7d0 + background = #000000 + ''; + }; + in [ + termitecfg + ]; + +} -- cgit v1.2.3 From c04b08ab7e7967038e5ce9b494aafbbfc206d307 Mon Sep 17 00:00:00 2001 From: nin Date: Tue, 7 Mar 2017 17:38:03 +0100 Subject: n 2 nixpackages: 6651c72 -> 5b0c9d4 --- nin/2configs/nixpkgs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nin') diff --git a/nin/2configs/nixpkgs.nix b/nin/2configs/nixpkgs.nix index ad39848b..9c3eafff 100644 --- a/nin/2configs/nixpkgs.nix +++ b/nin/2configs/nixpkgs.nix @@ -3,6 +3,6 @@ { krebs.build.source.nixpkgs.git = { url = https://github.com/nixos/nixpkgs; - ref = "6651c72"; + ref = "5b0c9d4"; }; } -- cgit v1.2.3