diff options
author | Kjetil Orbekk <kjetil.orbekk@gmail.com> | 2017-01-14 17:15:30 -0500 |
---|---|---|
committer | Kjetil Orbekk <kjetil.orbekk@gmail.com> | 2017-01-14 17:15:30 -0500 |
commit | 8bfcf2b124ee80aea9a1fc062eb6120422a975de (patch) | |
tree | 1d2693744815645db77af1ced8d76c6eb6562d36 /nixos | |
parent | 95fb569f49c3ea9ad13c860a24245b0812b1c70b (diff) | |
parent | a3fad8e422db175b476588e3c41259a450ed0076 (diff) |
Merge branch 'master' of sabaki.orbekk.com:/storage/projects/dotfiles
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/configuration.nix | 33 | ||||
-rw-r--r-- | nixos/pincer.nix | 41 | ||||
-rw-r--r-- | nixos/shell.nix | 7 | ||||
-rw-r--r-- | nixos/vlc-nightly.nix | 13 |
4 files changed, 91 insertions, 3 deletions
diff --git a/nixos/configuration.nix b/nixos/configuration.nix index b9b1a68..c424997 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -25,6 +25,11 @@ # 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; # List packages installed in system profile. To search by name, run: @@ -75,15 +80,41 @@ geeqie gnupg myWine - minecraft mumble wdfs whois dhcpcd + dnsutils # fonts source-code-pro inconsolata + wirelesstools + xbindkeys + imagemagick + ghc + net_snmp + #rxvt-unicode-with-perl-with-unicode3-with-plugins + unzip + linssid + lxc + gnupg1 + nix-repl + youtube-dl + vlc + unrar + mosh + tldr + fira-code + haskellPackages.hledger + haskellPackages.hledger-ui + haskellPackages.hledger-web + haskellPackages.hledger-vty + moreutils + + #temporary + debootstrap + wget # haskellPackages.xmonad # haskellPackages.xmonad-contrib diff --git a/nixos/pincer.nix b/nixos/pincer.nix index ee5f7ee..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; @@ -48,6 +48,43 @@ }; }; + environment.systemPackages = with pkgs; + let + myMinecraft = minecraft.override { + jre = oraclejre8; + }; + 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 = '' # Needed for either SSD or btrfs. diff --git a/nixos/shell.nix b/nixos/shell.nix new file mode 100644 index 0000000..25fe51a --- /dev/null +++ b/nixos/shell.nix @@ -0,0 +1,7 @@ +{ nixpkgs ? <nixpkgs>, ...}: + +with import nixpkgs {}; + +{ + vlc-nightly = callPackage ./vlc-nightly.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"; + }; +}) |