derped/nixos
1
0
Fork 0
Code Releases Activity

i3 config already set in desktop/i3.nix; updated package sets; fixed faulty udev line.

Browse source
This commit is contained in:
Kevin Baensch 2019-05-08 19:32:00 +02:00
parent 6c744f089e
commit dc0c983517
3 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
config/etc.nix
View file

@ -4,7 +4,6 @@ with lib;
{ {
environment.etc = mkIf (elem "etcfiles" config.machine.conffiles) { environment.etc = mkIf (elem "etcfiles" config.machine.conffiles) {
"i3/config".source = ./etc/i3/config;
"i3/py3status".source = ./etc/i3/py3status; "i3/py3status".source = ./etc/i3/py3status;
"sway/config".source = mkDefault ./etc/sway/config; "sway/config".source = mkDefault ./etc/sway/config;
"mpv/input.conf".source = ./etc/mpv/input.conf; "mpv/input.conf".source = ./etc/mpv/input.conf;

18
pkgs/pkgsets.nix
View file

@ -6,7 +6,8 @@
with lib; with lib;
let let
optPkgs = package: pkgstring: optionals (elem pkgstring config.machine.pkgs) package; cfg = config.machine;
optPkgs = package: pkgstring: optionals (elem pkgstring cfg.pkgs) package;
gitpkgs = import /nixpkgs/default.nix {}; gitpkgs = import /nixpkgs/default.nix {};
# Programms I'm likely to want on every machine and/or may execute as root # Programms I'm likely to want on every machine and/or may execute as root
@ -20,17 +21,20 @@ let
git git
gnupg gnupg
gptfdisk gptfdisk
haskellPackages.nix-derivation
home-manager home-manager
htop htop
hwinfo hwinfo
indent indent
iptables iptables
jp
lrzip lrzip
lsof lsof
lshw lshw
macchanger macchanger
mkpasswd mkpasswd
netcat netcat
nix-diff
nix-index nix-index
nix-plugins nix-plugins
nix-prefetch-git nix-prefetch-git
@ -109,7 +113,7 @@ let
pkgs.ledger pkgs.ledger
yaml-mode yaml-mode
company company
/* C/C++ */ irony company-irony company-irony-c-headers flycheck-irony clang-format /* C/C++ */ irony company-irony company-irony-c-headers flycheck-irony clang-format pkgs.clang-tools
/* Haskell */ haskell-mode flycheck-haskell /* Haskell */ haskell-mode flycheck-haskell
/* Org */ org org-ref pdf-tools org-bullets org-caldav /* Org */ org org-ref pdf-tools org-bullets org-caldav
/* Rust */ rust-mode flycheck-rust racer /* Rust */ rust-mode flycheck-rust racer
@ -214,10 +218,8 @@ let
# flask_sqlalchemy # flask_sqlalchemy
# flask_testing # flask_testing
# flask_wtf # flask_wtf
# flaskbabel # flaskbabel
/* temporarily fix python stuff */ ] ++ optionals (elem "i3" cfg.desktop.wms) [ py3status pytz tzlocal ]);
py3status pytz tzlocal
]);
rustpkgs = with pkgs; [ rustpkgs = with pkgs; [
rustup rustup
@ -270,8 +272,8 @@ in {
++ (optPkgs xpkgs "xpkgs"); ++ (optPkgs xpkgs "xpkgs");
services.emacs = { services.emacs = {
enable = (elem "emacs" config.machine.pkgs); enable = (elem "emacs" cfg.pkgs);
install = (elem "emacs" config.machine.pkgs); install = (elem "emacs" cfg.pkgs);
package = emacs; package = emacs;
}; };
} }

2
services/udev.nix
View file

@ -4,7 +4,7 @@ with lib;
mkIf (elem "udev" config.machine.services) { mkIf (elem "udev" config.machine.services) {
services.udev.extraRules = '' services.udev.extraRules = ''
Valve USB devices # Valve USB devices
SUBSYSTEM=="usb", ATTRS{idVendor}=="28de", TAG+="uaccess", TAG+="udev-acl" SUBSYSTEM=="usb", ATTRS{idVendor}=="28de", TAG+="uaccess", TAG+="udev-acl"
# Steam Controller udev write access # Steam Controller udev write access