Permalink
Browse files

nixos bump

  • Loading branch information...
neeasade committed Dec 24, 2018
1 parent 0992bff commit 04d4b7d87689a34abd3b5990f1d3b42009e3e46a
@@ -5,9 +5,9 @@ target="${1:-active}"

case "$target" in
active)
bspc query -N -n .active.descendant_of.window.leaf.!fullscreen
bspc query -N -n .local.descendant_of.window.leaf.!fullscreen
;;
inactive)
bspc query -N -n .active.!descendant_of.window.leaf.!fullscreen
bspc query -N -n .local.!descendant_of.window.leaf.!fullscreen
;;
esac
@@ -9,6 +9,13 @@ die() {
}

# (meant to be eval'd)
getval() {
(
eval "$(get)"
eval printf \%s \$$1
)
}

get() {
echo unset bg fg line prefix suffix activebg activefg activeline
echo THEME_NAME=\"$(basename "$(readlink "$theme_load")")\"

This file was deleted.

Oops, something went wrong.
@@ -1,19 +1,28 @@
# Edit this configuration file to define what should be installed on
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running ‘nixos-help’).

{ config, pkgs, lib, ... }:

{
imports = [
./hardware-configuration.nix
./boot.nix
(import ./packages.nix {inherit config pkgs lib; })
(import ./services.nix {inherit config pkgs; })
];
imports =
[ # Include the results of the hardware scan.
./hardware-configuration.nix
(import ./packages.nix {inherit config pkgs lib; })
(import ./services.nix {inherit config pkgs; })
];

# Use the systemd-boot EFI boot loader.
boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true;

networking.hostName = "littleapple";
networking.wireless.enable = true; # wpa_supplicant.
networking.hostName = "erasmus";
# networking.wireless.enable = true; # wpa_supplicant.

# todo
virtualisation = {
virtualbox = {
host.enable = true;
host.enable = false;
};
};

@@ -28,6 +37,13 @@
pulseaudio.enable = true;
opengl.driSupport32Bit = true;
pulseaudio.support32Bit = true;

#bumblebee.enable = true;
# nvidia testing pls
# nvidiaOptimus.disable = true;
# install nvidia drivers in addition to intel one
# opengl.extraPackages = [ nvidia.out ];
# opengl.extraPackages32 = [ nvidia32.out ];
};

environment.extraInit = ''
@@ -49,14 +65,16 @@
initialPassword="password";
};


nixpkgs.config.allowUnfree = true;

nix.gc.automatic = true;
nix.gc.dates = "weekly";
nix.gc.options = "--delete-older-than 30d";
# nix.useSandbox = true;

# The NixOS release to be compatible with for stateful data such as databases.
system.stateVersion = "17.09";
# This value determines the NixOS release with which your system is to be
# compatible, in order to avoid breaking some software such as database
# servers. You should change this only after NixOS release notes say you
# should.
system.stateVersion = "18.09"; # Did you read the comment?
}

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.
@@ -1,55 +1,49 @@
{ pkgs ? import <nixpkgs> {}, ... }: with pkgs;

let
# ref: http://chriswarbo.net/projects/nixos/useful_hacks.html

sanitiseName = lib.stringAsChars (c: if lib.elem c (lib.lowerChars ++ lib.upperChars)
then c
else "");

fetchGitHashless = args: stdenv.lib.overrideDerivation
# Use a dummy hash, to appease fetchgit's assertions
(fetchgit (args // { sha256 = hashString "sha256" args.url; }))

# Remove the hash-checking
(old: {
outputHash = null;
outputHashAlgo = null;
outputHashMode = null;
sha256 = null;
});

# Get the commit ID for the given ref in the given repo
latestGitCommit = { url, ref ? "HEAD" }:
runCommand "repo-${sanitiseName ref}-${sanitiseName url}"
{
# Avoids caching. This is a cheap operation and needs to be up-to-date
version = toString builtins.currentTime;

# Required for SSL
GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt";

buildInputs = [ git gnused ];
}
''
REV=$(git ls-remote "${url}" "${ref}") || exit 1
printf '"%s"' $(echo "$REV" |
head -n1 |
sed -e 's/\s.*//g' ) > "$out"
'';

fetchLatestGit = { url, ref ? "HEAD" }@args:
with { rev = import (latestGitCommit { inherit url ref; }); };
fetchGitHashless (removeAttrs (args // { inherit rev; }) [ "ref" ]);
# I'm not sure of the correct form here rn
placeholder = "temp";
in
rec {
bspwm-git = callPackage ./bspwm { inherit fetchLatestGit; };
qutebrowser-git = callPackage ./qutebrowser { inherit fetchLatestGit; };
wmutils-opt-git = callPackage ./wmutils-opt { inherit fetchLatestGit; };
neeasade-opt = callPackage ./neeasade-opt { inherit fetchLatestGit; };
gtkrc-reload = callPackage ./gtkrc-reload { inherit fetchLatestGit; };
txth = callPackage ./txth { inherit fetchLatestGit; };
bevelbar = callPackage ./bevelbar { };
xdo = callPackage ./xdo { inherit fetchLatestGit; };
rec {
gtkrc-reload = callPackage ./gtkrc-reload {};

bevelbar = (pkgs.bevelbar.overrideAttrs(old: {
src = builtins.fetchGit {url = "https://www.uninformativ.de/git/bevelbar.git"; ref = "master"; };
}));

xst-git = (pkgs.xst.overrideAttrs(old: {
src = builtins.fetchGit {url = "https://github.com/neeasade/xst"; ref = "master"; };
}));

txth = (pkgs.txtw.overrideAttrs(old: {
src = builtins.fetchGit {url = "https://github.com/neeasade/txth"; ref = "master"; };
}));

bspwm-git = (pkgs.bspwm.overrideAttrs(old: {
src = builtins.fetchGit {url = "https://github.com/baskerville/bspwm"; ref = "master"; };
}));

qutebrowser-git = (pkgs.qutebrowser.overrideAttrs(old: {
src = builtins.fetchGit {url = "https://github.com/qutebrowser/qutebrowser"; ref = "master"; };
}));

wmutils-opt-git = (pkgs.wmutils-opt.overrideAttrs(old: {
buildInputs = old.buildInputs ++ [ pkgs.xorg.xcbutil ];
src = builtins.fetchGit {url = "https://github.com/wmutils/opt"; ref = "master"; };
}));

wmutils-core-git = (pkgs.wmutils-opt.overrideAttrs(old: {
buildInputs = old.buildInputs ++ [ pkgs.xorg.xcbutil ];
src = builtins.fetchGit {url = "https://github.com/wmutils/core"; ref = "master"; };
}));

neeasade-opt = (pkgs.wmutils-opt.overrideAttrs(old: {
buildInputs = old.buildInputs ++ [ pkgs.xorg.xcbutil ];
src = builtins.fetchGit {url = "https://github.com/neeasade/opt"; ref = "master"; };
}));

xdo-git = (
pkgs.xdo.overrideAttrs(old: {
src = builtins.fetchGit {url = "https://github.com/baskerville/xdo"; ref = "master"; };
}));
}
@@ -1,10 +1,10 @@
{ stdenv, fetchLatestGit, pkgconfig, gtk2 }:
{ stdenv, pkgconfig, gtk2 }:

stdenv.mkDerivation rec {
name = "gtkrc-reload-v${version}";
version = "1.0";

src = fetchLatestGit { url = "https://github.com/neeasade/gtkrc-reload"; };
src = builtins.fetchGit {url = "https://github.com/neeasade/gtkrc-reload"; ref = "master"; };

buildInputs = [ pkgconfig gtk2 ];

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.
@@ -8,24 +8,20 @@
[ <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
];

boot.initrd.availableKernelModules = [ "ahci" "ohci_pci" "ehci_pci" "pata_atiixp" "xhci_pci" "usb_storage" "usbhid" "sd_mod" "sr_mod" ];
boot.kernelModules = [ "kvm-amd" ];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
boot.kernelModules = [ "kvm-intel" ];
boot.extraModulePackages = [ ];

fileSystems."/" =
{ device = "/dev/disk/by-uuid/d51b5579-ccc6-4e7b-b5d5-8a06898ca409";
{ device = "/dev/disk/by-uuid/af237de7-fdd4-4cc2-8db3-f8fc33b9a5c6";
fsType = "ext4";
};

fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/A20A-267C";
{ device = "/dev/disk/by-uuid/8CC6-209C";
fsType = "vfat";
};

swapDevices =
[ { device = "/dev/disk/by-uuid/f20e85be-ce18-474b-8b10-37d70b8f2a3d"; }
];

fileSystems."/media/LIVEWIRE" =
{ device = "/dev/disk/by-uuid/2cf891b0-4adf-4fa0-bd80-e335303a1b13";
fsType = "btrfs";
@@ -36,15 +32,19 @@
fsType = "ext4";
};

fileSystems."/media/VOLTAGE" =
{ device = "/dev/disk/by-uuid/00ebaffa-6c52-4422-8168-4a84622bad0c";
fsType = "btrfs";
};
# fileSystems."/media/VOLTAGE" =
# { device = "/dev/disk/by-uuid/00ebaffa-6c52-4422-8168-4a84622bad0c";
# fsType = "btrfs";
# };

fileSystems."/media/KICKSTART" =
{ device = "/dev/disk/by-uuid/84894ed7-8e80-49a5-8951-ac61c23a6564";
fsType = "btrfs";
};
swapDevices =
[ { device = "/dev/disk/by-uuid/8d5ee437-0eed-4723-8692-8c85305058f0"; }
];

nix.maxJobs = lib.mkDefault 8;
nix.maxJobs = lib.mkDefault 6;
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
}
Oops, something went wrong.

0 comments on commit 04d4b7d

Please sign in to comment.