Merge branches 'master' and 'master' of sabaki.orbekk.com:/storage/projects/dotfiles

4 files changed, 103 insertions, 4 deletions

diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 80570d0..c65ff35 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -4,6 +4,8 @@
   hardware.bluetooth.enable = true;
   hardware.pulseaudio.enable = true;
   hardware.pulseaudio.package = pkgs.pulseaudioFull;
+  hardware.pulseaudio.tcp.enable = true;
+  hardware.pulseaudio.tcp.anonymousClients.allowAll = true;
   hardware.enableAllFirmware = true;
 
   boot.cleanTmpDir = true;
@@ -25,8 +27,19 @@
   # Set your time zone.
   time.timeZone = "America/New_York";
 
+  # security.grsecurity.enable = true;
+  # security.grsecurity.lockTunables = false;
+  # # Needed when using chromium with grsecurity.
+  # security.chromiumSuidSandbox.enable = true;
+
   nixpkgs.config.allowUnfree = true;
 
+  fonts = {
+    fonts = with pkgs; [
+     fira-code 
+    ];
+  };
+
   # List packages installed in system profile. To search by name, run:
   # $ nix-env -qaP | grep wget
   environment.systemPackages = with pkgs;
@@ -53,7 +66,7 @@
     pasystray
     pavucontrol
     powertop
-    kde4.digikam
+    # kde4.digikam
     emacs25
     sshfsFuse
     xorg.xbacklight
@@ -77,10 +90,45 @@
     myWine
     mumble
     wdfs
+    whois
+    dhcpcd
+    haskellPackages.idris
 
+    dnsutils
     # fonts
     source-code-pro
     inconsolata
+    wirelesstools
+    xbindkeys
+    imagemagick
+    ghc
+    net_snmp
+    #rxvt-unicode-with-perl-with-unicode3-with-plugins
+    unzip
+    linssid
+    lxc
+    nix-repl
+    youtube-dl
+    vlc
+    unrar
+    mosh
+    tldr
+    fira-code
+    haskellPackages.hledger
+    haskellPackages.hledger-ui
+    haskellPackages.hledger-web
+    haskellPackages.hledger-iadd
+    moreutils
+    ledger
+    xorg.xhost
+    binutils
+    pandoc
+
+    # (callPackage ./stardew-valley.nix {})    
+
+    #temporary
+    debootstrap
+    wget
 
     # haskellPackages.xmonad
     # haskellPackages.xmonad-contrib
diff --git a/nixos/pincer.nix b/nixos/pincer.nix
index 8d83954..449ee68 100644
--- a/nixos/pincer.nix
+++ b/nixos/pincer.nix
@@ -5,8 +5,8 @@
     ./configuration.nix
   ];
   networking.hostName = "pincer";
-  networking.firewall.allowedTCPPorts = [5201];
-  networking.firewall.allowedUDPPorts = [5201];
+  networking.firewall.allowedTCPPorts = [5201 34196 34197 5556 5558];
+  networking.firewall.allowedUDPPorts = [5201 34196 34197];
 
   hardware.opengl.driSupport32Bit = true;
   boot.loader.systemd-boot.enable = true;
@@ -53,7 +53,37 @@
       myMinecraft = minecraft.override {
         jre = oraclejre8;
       };
-    in [ myMinecraft ];
+      pwFactorio = factorio.override {
+        username = "kjetil.orbekk@gmail.com";
+        password = "6F[$~/v6I9HlGoiriI!q";
+        releaseType = "alpha";
+      };
+      myFactorio = pwFactorio.overrideDerivation (o: {
+        version = "0.14.20";
+        src = requireFile {
+          name = "factorio_alpha_x64_0.14.20.tar.gz";
+	        url = "test";
+          sha256 = "c7955fdb19895a38d02a536e0bb225ac3bbbc434fcf9c4968fbb4bd5c49329ae";
+        };
+      });
+    in [
+      myMinecraft
+      myFactorio
+      tpacpi-bat
+    ];
+
+  systemd.services.battery_threshold = {
+    description = "Set battery charging thresholds.";
+    path = [ pkgs.tpacpi-bat ];
+    after = [ "basic.target" ];
+    wantedBy = [ "multi-user.target" ];
+    script = ''
+      tpacpi-bat -s ST 1 39
+      tpacpi-bat -s ST 2 39
+      tpacpi-bat -s SP 1 80
+      tpacpi-bat -s SP 2 80
+    '';
+  };
 
   services.tlp.enable = true;
   services.tlp.extraConfig = ''
diff --git a/nixos/shell.nix b/nixos/shell.nix
new file mode 100644
index 0000000..654ec78
--- /dev/null
+++ b/nixos/shell.nix
@@ -0,0 +1,8 @@
+{ nixpkgs ? <nixpkgs>, ...}:
+
+with import nixpkgs {};
+
+{
+  vlc-nightly = callPackage ./vlc-nightly.nix {};
+  stardew-valley = callPackage ./stardew-valley.nix {};
+}
diff --git a/nixos/vlc-nightly.nix b/nixos/vlc-nightly.nix
new file mode 100644
index 0000000..6ae95b4
--- /dev/null
+++ b/nixos/vlc-nightly.nix
@@ -0,0 +1,13 @@
+{vlc, autoconf, automake, libtool, stdenv, fetchurl, gettext, m4}:
+
+with stdenv.lib;
+
+vlc.overrideDerivation (o: rec {
+  buildInputs = [autoconf automake libtool gettext m4] ++ o.buildInputs;
+  version = "3.0.0-20161224-0237";
+  preConfigure = ''export BUILDCC=gcc; libtoolize && ./bootstrap; '' + o.preConfigure;
+  src = fetchurl {
+    url = "https://nightlies.videolan.org/build/source/vlc-${version}-git.tar.xz";
+    sha256 = "0hbn2psqpr4cg9hhphdn4sqm7k5syfi7yflhf9ag33cl7zrqd83x";
+  };
+})