From 0f34dc08b486662fdfd419146f54070449b95636 Mon Sep 17 00:00:00 2001 From: Kjetil Orbekk Date: Mon, 2 Jan 2017 18:03:31 -0500 Subject: Update pincer system config. --- nixos/configuration.nix | 35 +++++++++++++++++++++++++++++++++-- nixos/pincer.nix | 36 +++++++++++++++++++++++++++++++++--- 2 files changed, 66 insertions(+), 5 deletions(-) (limited to 'nixos') diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 80570d0..64fda3a 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: @@ -53,7 +58,7 @@ pasystray pavucontrol powertop - kde4.digikam + # kde4.digikam emacs25 sshfsFuse xorg.xbacklight @@ -77,10 +82,36 @@ myWine mumble wdfs - + 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 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 = '' -- cgit v1.2.3 From a3fad8e422db175b476588e3c41259a450ed0076 Mon Sep 17 00:00:00 2001 From: Kjetil Orbekk Date: Mon, 2 Jan 2017 18:05:34 -0500 Subject: Add experimental vlc package (doesn't work). --- nixos/shell.nix | 7 +++++++ nixos/vlc-nightly.nix | 13 +++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 nixos/shell.nix create mode 100644 nixos/vlc-nightly.nix (limited to 'nixos') 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 ? , ...}: + +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"; + }; +}) -- cgit v1.2.3 From 95fb569f49c3ea9ad13c860a24245b0812b1c70b Mon Sep 17 00:00:00 2001 From: Kjetil Orbekk Date: Sat, 14 Jan 2017 17:14:59 -0500 Subject: stuff. --- nixos/configuration.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'nixos') diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 89a8277..b9b1a68 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -53,7 +53,7 @@ pasystray pavucontrol powertop - kde4.digikam + # kde4.digikam emacs25 sshfsFuse xorg.xbacklight @@ -77,6 +77,9 @@ myWine minecraft mumble + wdfs + whois + dhcpcd # fonts source-code-pro -- cgit v1.2.3 From 3bbb2dba0255e25b079eb829f7bd196b552ff02e Mon Sep 17 00:00:00 2001 From: Kjetil Orbekk Date: Sat, 11 Feb 2017 18:57:55 -0500 Subject: Random updates. --- nixos/configuration.nix | 11 +++++++++-- nixos/shell.nix | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'nixos') diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 64fda3a..4c35cfe 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; @@ -95,7 +97,6 @@ unzip linssid lxc - gnupg1 nix-repl youtube-dl vlc @@ -106,8 +107,14 @@ haskellPackages.hledger haskellPackages.hledger-ui haskellPackages.hledger-web - haskellPackages.hledger-vty + haskellPackages.hledger-iadd moreutils + ledger + xorg.xhost + binutils + pandoc + + # (callPackage ./stardew-valley.nix {}) #temporary debootstrap diff --git a/nixos/shell.nix b/nixos/shell.nix index 25fe51a..654ec78 100644 --- a/nixos/shell.nix +++ b/nixos/shell.nix @@ -4,4 +4,5 @@ with import nixpkgs {}; { vlc-nightly = callPackage ./vlc-nightly.nix {}; + stardew-valley = callPackage ./stardew-valley.nix {}; } -- cgit v1.2.3 From ebf34f3fdcd09164293fb4ebf4c17afec0d7e782 Mon Sep 17 00:00:00 2001 From: Kjetil Orbekk Date: Tue, 14 Feb 2017 21:13:33 -0500 Subject: Fix fonts and add idris mode to emacs. --- nixos/configuration.nix | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'nixos') diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 3075131..bbbef82 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -34,6 +34,12 @@ 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; -- cgit v1.2.3 From 98dd190e465e4ecc6a43bdd0268cf563d689170f Mon Sep 17 00:00:00 2001 From: Kjetil Orbekk Date: Wed, 15 Feb 2017 08:06:14 -0500 Subject: Install idris. --- nixos/configuration.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'nixos') diff --git a/nixos/configuration.nix b/nixos/configuration.nix index bbbef82..c65ff35 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -92,6 +92,7 @@ wdfs whois dhcpcd + haskellPackages.idris dnsutils # fonts -- cgit v1.2.3