Skip to content
Permalink
Browse files

sync nixos

  • Loading branch information...
neeasade committed Oct 27, 2019
1 parent 5d005d0 commit 3b853ac9c7849e5f3aed8aff0e6ea60a5a3c5dfc
Showing with 124 additions and 20 deletions.
  1. +12 −4 nixos/configuration.nix
  2. +10 −1 nixos/expr/default.nix
  3. +99 −15 nixos/packages.nix
  4. +3 −0 nixos/services.nix
@@ -8,16 +8,24 @@
imports =
[ # Include the results of the hardware scan.
./hardware-configuration.nix
(import ./packages.nix {inherit config pkgs lib; })
(import ./services.nix {inherit config pkgs; })
./packages.nix
./services.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;

boot.extraModulePackages = [ config.boot.kernelPackages.rtlwifi_new ];
# boot.initrd.kernelModules = [ "wl" ];
# boot.kernelModules = [ "kvm-intel" "wl" ];
# boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ];

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

# todo
virtualisation = {
@@ -51,7 +59,7 @@
export GDK_PIXBUF_MODULE_FILE=$(echo ${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/*/loaders.cache)
'';

time.timeZone = "America/Chicago";
time.timeZone = "America/New_York";

users.extraUsers.neeasade = {
isNormalUser = true;
@@ -61,7 +69,7 @@
];
createHome=true;
home="/home/neeasade";
shell="/run/current-system/sw/bin/zsh";
shell="/run/current-system/sw/bin/bash";
initialPassword="password";
};

@@ -15,10 +15,19 @@ in
src = builtins.fetchGit {url = "https://github.com/neeasade/xst"; ref = "master"; };
}));

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

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

dmenu = (pkgs.dmenu.overrideAttrs(old: {
patches = [];
src = builtins.fetchGit {url = "https://github.com/neeasade/dmenu"; ref = "master"; };
}));

bspwm-git = (pkgs.bspwm.overrideAttrs(old: {
src = builtins.fetchGit {url = "https://github.com/baskerville/bspwm"; ref = "master"; };
}));
@@ -33,7 +42,7 @@ in
}));

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

@@ -3,13 +3,14 @@
let
nixcfg = {
allowUnfree = true;
oraclejdk.accept_license = true;

permittedInsecurePackages = [
"samba-3.6.25"
];
};

stable = import (fetchTarball https://github.com/nixos/nixpkgs-channels/archive/nixos-18.09.tar.gz) { config = nixcfg; };
stable = import (fetchTarball https://github.com/nixos/nixpkgs-channels/archive/nixos-19.03.tar.gz) { config = nixcfg; };
rolling = import (fetchTarball https://github.com/nixos/nixpkgs-channels/archive/nixos-unstable.tar.gz) { config = nixcfg; };
edge = import (fetchTarball https://github.com/NixOS/nixpkgs/archive/master.tar.gz) { config = nixcfg; };
expr = import ./expr { inherit pkgs lib; };
@@ -18,10 +19,27 @@ let
# edge = rolling;
# rolling = stable;

core = (with stable; [
core = (with stable; [
# networkmanager
haskellPackages.xmobar
kdeFrameworks.networkmanager-qt
networkmanager_dmenu
xorg.xkbcomp
tldr
toilet
cowsay
fortune
cmatrix
cava
irssi
glxinfo
xorg.xdpyinfo
gnupg
arandr
aspell
stalonetray
# network-manager
networkmanagerapplet
aspellDicts.en
bash-completion
bc
@@ -59,9 +77,14 @@ let
neofetch
nix-prefetch-scripts

wayland
wlroots
wayland-protocols

# nix-repl
ntfs3g
openssl
telnet
p7zip
parallel
pass
@@ -79,33 +102,36 @@ let
unclutter
unrar
unzip
zip
usbutils
vim
vlc
wget
wmname
xclip
xorg.xev
xorg.xkbcomp
xorg.xmodmap
xurls
zathura
zsh

emacs
# needed?
# mesa_drivers
mesa_drivers
libGL


# mesa_glu
]) ++ (with rolling; [
colort
dmenu2
# dunst
# dmenu2
# dmenu
dunst
dzen2
ffmpeg
i3lock
lemonbar-xft
meh
mpvc
qutebrowser
ranger
sxhkd
txtw
@@ -118,9 +144,12 @@ let
# xst
xtitle
youtube-dl
qutebrowser
]) ++ ( with expr; [
# qutebrowser-git
mpvc-git
xst-git
dmenu
bevelbar
gtkrc-reload
neeasade-opt
@@ -135,6 +164,7 @@ let
# (emacs.override { imagemagick = pkgs.imagemagickBig; } )
]);

inherit (pkgs) eggDerivation fetchegg;
extra = (with stable; [
# oomox
gdk_pixbuf
@@ -143,6 +173,11 @@ let
gtk3
sassc

ripgrep
pandoc
imagemagick
graphviz
google-chrome
# (chromium.override {enablePepperFlash = true;})
audacity
bfg-repo-cleaner
@@ -163,7 +198,9 @@ let
]);

games = (with stable; [
# dolphinEmu
minecraft
wesnoth
dolphinEmu
# ioquake3
# minecraft
# wineUnstable
@@ -179,8 +216,13 @@ let
# (wineStaging.override { wineBuild = "wineWow"; })
# (wineStaging.override {wineBuild = "wineWow"; pulseaudioSupport = true; pcapSupport = true; gstreamerSupport = true;})
# configureFlags = "--enable-win64 --with-alsa --with-pulse";
]) ++ (with stable; [
# crispy-doom
]) ++ (with rolling; [
openmw
steam
# openmw-tes3mp
]) ++ (with rolling; [
drawpile
]);

development = (with stable; [
@@ -191,29 +233,65 @@ let
# # praw
# ]))

meson

# chicken
# egg2nix

# chickenPackages_5.chicken
# chickenPackages_5.egg2nix
# chicken-install apropos chicken-doc

# (egg-chicken-doc =
# eggDerivation {
# name = "chicken-doc-4.6.3";

# src = fetchegg {
# name = "numbers";
# version = "4.6.3";
# sha256 = "0aczzpq6f31lk1919aiywknaci69m1apyx905m2ln2qw8zwmwibq";
# };

# buildInputs = [];
# })

# (egg-apropos =
# eggDerivation {

# })

sbcl
lispPackages.quicklisp

# clang
lua
luarocks
autoconf
automake
boot
# comes with ruby already? (collision)
# bundler

clojure

cmake
docker
gcc
ghc
gnumake
go
gradle



guile
jdk8
leiningen
maven
mono
# csi, conflicts with chicken
# mono
nodejs
ruby
cargo
# rustc
# rustfmt
# rustracer
@@ -224,10 +302,17 @@ let
(python36.withPackages(ps: with ps; [
virtualenv
django
pyqt5
selenium
# pyqt5
praw
]))
]);
]) ++ (with expr; [
# boot-new
]) ++ (with edge; [
# boot
# chickenPackages_5.chicken
# chickenPackages_5.egg2nix
]);

basefonts = (with pkgs; [
roboto-mono
@@ -243,7 +328,6 @@ let
fira
fira-code
font-awesome-ttf
font-droid
noto-fonts
powerline-fonts
roboto
@@ -60,6 +60,7 @@ in
default = "bspwm";
bspwm = {
package = expr.bspwm-git;
#package = pkgs.bspwm;
enable = true;
};
};
@@ -72,6 +73,8 @@ in
displayManager.lightdm = {
enable = true;
};

displayManager.xserverArgs = [ "-logfile" "/var/log/X.log" ];
};

printing = {

0 comments on commit 3b853ac

Please sign in to comment.
You can’t perform that action at this time.