Merge branch 'master' of github.com:IvanMalison/dotfiles

This commit is contained in:
Ivan Malison 2018-06-24 20:21:36 -07:00
commit 103ba029a5
No known key found for this signature in database
GPG Key ID: 62530EFBE99DC2F8
5 changed files with 17 additions and 5 deletions

View File

@ -1,3 +1,3 @@
#!/usr/bin/env zsh #!/usr/bin/env zsh
synergy_init_with_client imalison-arch.local synergy_init_with_client imalison-home.local

View File

@ -90,15 +90,16 @@ in
fonts = { fonts = {
fonts = with pkgs; [ fonts = with pkgs; [
fira-mono
dejavu_fonts dejavu_fonts
noto-fonts-emoji
emojione emojione
twemoji-color-font fira-mono
source-code-pro font-awesome-ttf
noto-fonts-emoji
roboto roboto
source-code-pro
source-sans-pro source-sans-pro
source-serif-pro source-serif-pro
twemoji-color-font
]; ];
fontconfig = { fontconfig = {
defaultFonts = { defaultFonts = {

8
nixos/extra.nix Normal file
View File

@ -0,0 +1,8 @@
{ config, pkgs, ... }:
{
environment.systemPackages = with pkgs; [
gimp
texlive.combined.scheme-full
];
boot.extraModulePackages = with pkgs; [ xboxdrv ];
}

View File

@ -5,6 +5,7 @@
<nixpkgs/nixos/modules/installer/scan/not-detected.nix> <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
../configuration.nix ../configuration.nix
../games.nix ../games.nix
../extra.nix
]; ];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "sd_mod" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "sd_mod" ];

View File

@ -4,6 +4,8 @@
imports = [ imports = [
<nixpkgs/nixos/modules/installer/scan/not-detected.nix> <nixpkgs/nixos/modules/installer/scan/not-detected.nix>
../configuration.nix ../configuration.nix
../games.nix
../extra.nix
]; ];
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "sd_mod" ]; boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "sd_mod" ];