Commit 232fbd9d authored by Naoki OKAMURA's avatar Naoki OKAMURA

improved: cleanup code on config/per-bundle/*.nix.

parent 3bf4925c
{ config, pkgs, ... }:
{
programs.zsh.enable = true;
programs.zsh.syntaxHighlighting.enable = true;
programs.zsh = {
enable = true;
syntaxHighlighting.enable = true;
enableCompletion = true;
};
security.sudo.enable = true;
environment.systemPackages = with pkgs; [
# shell
zsh nix-zsh-completions zsh-completions wcwidth-cjk tmux tmux-up
zsh fzy
wcwidth-cjk
tmux tmux-up
# utilities
file gnused gawk gnumake fzy vimHugeX keychain editorconfig-core-c
patchelf
# files
file gnused gawk
gnumake patchelf
zip unzip bzip2 gzip p7zip gnutar lzma unrar xar cpio dmg2img pbzx
platinum-searcher
restic
whipper
# archiver
unzip zip bzip2 gzip p7zip gnutar lzma
# vcs
git
mercurial
bazaar
subversion
cvs
# VCS
git mercurial bazaar subversion cvs
# remote shell
keychain
mosh
# script
python3 perl
# network
curl wget
bind
# editor
vimHugeX
editorconfig-core-c
# system
lsof
# file-systems
ntfs3g
hfsprogs
exfat exfat-utils
# hardware
gptfdisk
pciutils usbutils
];
services.dbus.packages = with pkgs; [
whipper
];
}
{ config, pkgs, ... }:
{
environment.systemPackages = with pkgs; [
# web browser
firefox-bin
feedreader
# terminal
mlterm
# email
thunderbird-bin
# networks
firefox-bin thunderbird-bin
slack
uget
feedreader
# credentials
keepassxc
keepassxc # TODO: change to pass?
veracrypt
# ebooks
calibre
# music
spotify
deadbeef
spotify
# chat
slack
# graphics
gimp-with-plugins inkscape
# downloader
uget
# office
peek
# windows app
wineUnstable
# X.org
xclip
xdg_utils
];
services.dbus.packages = with pkgs; [
firefox-bin feedreader thunderbird-bin keepassxc spotify slack uget
firefox-bin thunderbird-bin
slack
uget
feedreader
keepassxc
veracrypt
calibre
deadbeef
spotify
gimp-with-plugins inkscape
peek
wineUnstable
xclip
];
}
{ pkgs, ... }:
{
environment.systemPackages = (with pkgs; [
# toolchain
protobuf hugo awscli
environment.systemPackages = with pkgs; [
# websites
hugo sassc
# language
go goimports dep
nodejs yarn sassc
# cloud
awscli google-cloud-sdk
# api
protobuf
# languages
stdenv.cc
go goimports dep
nodejs yarn
elmPackages.elm-format
perl perlPackages.Appcpanminus
# container
linuxkit moby docker_compose google-cloud-sdk
]);
linuxkit moby docker_compose docker
];
virtualisation.docker = {
enable = true;
storageDriver = "overlay2";
......
......@@ -2,8 +2,14 @@
{
fonts = {
fonts = with pkgs; [
# basical fonts
noto-fonts noto-fonts-jp noto-fonts-extra noto-fonts-emoji
myrica myrica-patched genjyuu-gothic
# monospace
myrica myrica-patched
# documenation
genjyuu-gothic
];
fontconfig = {
......
......@@ -15,30 +15,38 @@ in {
wayland = false;
};
desktopManager.xterm.enable = false;
desktopManager.gnome3 = {
enable = true;
extraGSettingsOverridePackages = [
config.i18n.inputMethod.package
] ++ (with pkgs; [
gnome3.dconf-editor feedreader
]);
desktopManager = {
xterm.enable = false;
sessionPath = [
config.i18n.inputMethod.package
] ++ (with pkgs; [
gnome3.dconf-editor
gnome3.dconf
gnome3.glib.dev
dbus-glib
]);
gnome3 = {
enable = true;
extraGSettingsOverridePackages = (with pkgs; [
feedreader
peek
gnome3.dconf-editor # FIXME: really needed?
]) ++ [ config.i18n.inputMethod.package ];
sessionPath = (with pkgs; [
gnome3.dconf-editor # FIXME: really needed?
gnome3.dconf
gnome3.glib.dev
dbus-glib
]);
};
};
};
environment.gnome3.excludePackages = with pkgs.gnome3; [
accerciser epiphany evolution
gnome-terminal gnome-weather gnome-todo gnome-maps
gnome-calendar gnome-clocks gnome-contacts gnome-music
accerciser
evolution
gnome-terminal
gnome-weather
gnome-todo
gnome-maps
gnome-calendar
gnome-clocks
gnome-contacts
gnome-music
];
environment.systemPackages = with themes; [
......
......@@ -4,8 +4,6 @@
fonts.fontconfig.dpi = 192;
environment.variables = {
#GDK_SCALE = "2";
#GDK_DPI_SCALE = "0.5";
QT_AUTO_SCREEN_SCALE_FACTOR = "0";
QT_SCREEN_SCALE_FACTORS = "1.5";
QT_SCALE_FACTOR = "1";
......
{ config, pkgs, ... }:
{
services.xserver.displayManager.sessionCommands = ''
${pkgs.gnome3.dconf.lib}/libexec/dconf-service &
${config.i18n.inputMethod.package}/bin/ibus-daemon -drx --config=${config.i18n.inputMethod.package}/libexec/ibus-dconf
'';
i18n.inputMethod = {
enabled = "ibus";
ibus.engines = with pkgs; [ ibus-skk ];
};
i18n.inputMethod.enabled = "ibus";
i18n.inputMethod.ibus.engines = with pkgs; [ ibus-skk ];
services.dbus.packages = [ config.i18n.inputMethod.package ];
services.dbus.packages = [
config.i18n.inputMethod.package
];
environment.systemPackages = with pkgs; [
skk-dicts skktools
];
services.xserver.displayManager.sessionCommands = ''
${pkgs.gnome3.dconf.lib}/libexec/dconf-service &
${config.i18n.inputMethod.package}/bin/ibus-daemon -drx --config=${config.i18n.inputMethod.package}/libexec/ibus-dconf
'';
}
......@@ -14,13 +14,17 @@
];
security.pam.loginLimits = [
{ domain = "@audio"; item = "memlock"; type = "-"; value = "unlimited"; }
{ domain = "@audio"; item = "rtprio"; type = "-"; value = "99"; }
{ domain = "@audio"; item = "nofile"; type = "soft"; value = "99999"; }
{ domain = "@audio"; item = "nofile"; type = "hard"; value = "99999"; }
{ domain = "@audio"; item = "memlock"; type = "-"; value = "unlimited"; }
{ domain = "@audio"; item = "rtprio"; type = "-"; value = "99"; }
{ domain = "@audio"; item = "nofile"; type = "soft"; value = "99999"; }
{ domain = "@audio"; item = "nofile"; type = "hard"; value = "99999"; }
];
environment.systemPackages = with pkgs; [
qjackctl jack2
];
services.dbus.packages = with pkgs; [
qjackctl jack2
];
}
......@@ -4,28 +4,45 @@
virtmanager remmina spice-gtk looking-glass-client
];
services.dbus.packages = with pkgs; [
virtmanager remmina spice-gtk looking-glass-client
];
boot.kernelModules = [
"kvm" "kvm_intel" "vfio-iommu-type1" "vfio-mdev"
"kvm" "kvm_intel" "kvmgt" # FIXME: support AMD processors
"vfio-iommu-type1" "vfio-mdev"
];
boot.kernelParams = [
"kvm.ignore_msrs=1" "intel_iommu=on" "i915.enable_gvt=1" "vfio-iommu-type1.allow_unsafe_interrupts=1"
"kvm.ignore_msrs=1"
"vfio-iommu-type1.allow_unsafe_interrupts=1"
# TODO:support AMD processors
"drm.debug=0"
"kvm_intel.nested=1"
"kvm_intel.emulate_invalid_guest_state=0"
"intel_iommu=on"
];
services.udev.extraRules = ''
SUBSYSTEM=="vfio", OWNER="root", GROUP="kvm"
'';
virtualisation.kvmgt.enable = true;
virtualisation.kvmgt.vgpus = {
"i915-GVTg_V5_4" = {
uuid = "a297db4a-f4c2-11e6-90f6-d3b88d6c9525";
virtualisation.kvmgt = {
enable = true;
vgpus = {
"i915-GVTg_V5_4" = {
uuid = "a297db4a-f4c2-11e6-90f6-d3b88d6c9525";
};
};
};
virtualisation.libvirtd.enable = true;
virtualisation.libvirtd.qemuRunAsRoot = true;
virtualisation.libvirtd.qemuPackage = pkgs.qemu_kvm;
virtualisation.libvirtd.qemuVerbatimConfig = ''
virtualisation.libvirtd = {
enable = true;
qemuRunAsRoot = true;
qemuPackage = pkgs.qemu_kvm;
qemuVerbatimConfig = ''
user = "nyarla"
group = "kvm"
dynamic_ownership = 1
......@@ -43,9 +60,9 @@
"/dev/rtc",
"/dev/hpet",
"/dev/vfio/vfio",
"/dev/vfio/17",
"/dev/dri/card0",
"/dev/dri/renderD128"
]
'';
'';
};
}
{ config, pkgs, ... }:
{
environment.systemPackages = with pkgs; [
# player
deadbeef
# CD ripper
whipper
] ++ [
# ebook management
calibre
] ++ [
# edit multimedia files
gimp-with-plugins inkscape
] ++ [
wine
];
services.dbus.packages = with pkgs; [
deadbeef whipper calibre
];
}
{ config, pkgs, ... }:
{
environment.systemPackages = with pkgs; [
# terminal emualtor
mlterm
# Xorg utilities
xclip xdg_utils
# disk utilites
gptfdisk veracrypt restic ntfs3g exfat exfat-utils
# device toolchains
pciutils usbutils
];
}
......@@ -2,38 +2,28 @@
{
imports = [
# Hardware and Host
../config/per-host/NyXPS15.nix
../config/per-hardware/XPS-9560-JP.nix
../config/per-host/NyXPS15.nix
# Location
../config/per-location/jp.nix
# Account
../config/per-account/nyarla.nix
# Console
../config/per-bundle/console.nix
../config/per-bundle/development.nix
# Desktop
../config/per-bundle/gnome3-xorg.nix
../config/per-bundle/fonts.nix
../config/per-bundle/hidpi.nix
../config/per-bundle/ibus.nix
../config/per-bundle/toolchains.nix
# Desktop Environment
../config/per-bundle/gnome3.nix
# Desktop Applications
../config/per-bundle/browsers.nix
../config/per-bundle/multimedia.nix
../config/per-bundle/office.nix
# Virtualization and emulators
# ../config/per-bundle/vbox.nix
../overlays/experimental/vmware-host.nix
../config/per-bundle/desktop.nix
# Optional
# Extra
../config/per-bundle/jackaudio.nix
../config/per-bundle/kvm.nix
];
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment