config/per-bundle/browsers.nix

@@ -2,7 +2,11 @@
 {
   environment.systemPackages = with pkgs; [
     # web browser
-    chromium
+    firefox-bin
+    feedreader
+
+    # email
+    thunderbird-bin
 
     # credentials
     keepassxc
@@ -18,6 +22,6 @@
   ];
 
   services.dbus.packages = with pkgs; [
-    chromium keepassxc spotify slack uget
+    firefox-bin feedreader thunderbird-bin keepassxc spotify slack uget
   ];
 }

config/per-bundle/development.nix

@@ -5,14 +5,14 @@
     protobuf hugo awscli 
 
     # language
-    go goimports google-app-engine-go-sdk dep 
+    go goimports dep 
     
     nodejs yarn sassc
     
     elmPackages.elm-format
 
     # container
-    linuxkit moby docker_compose 
+    linuxkit moby docker_compose google-cloud-sdk 
   ]);
   virtualisation.docker = {
     enable        = true;

config/per-bundle/fonts.nix

@@ -2,7 +2,7 @@
 {
   fonts = {
     fonts = with pkgs; [
-      noto-fonts-cjk-jp noto-fonts-emoji
+      noto-fonts noto-fonts-jp noto-fonts-extra noto-fonts-emoji
       myrica myrica-patched genjyuu-gothic
     ];
 
@@ -11,8 +11,8 @@
       penultimate.enable = true;
 
       defaultFonts = {
-        sansSerif = [ "Noto Sans CJK JP"  "Noto Color Emoji" ];
-        serif     = [ "Noto Serif CJK JP" "Noto Color Emoji" ];
+        sansSerif = [ "Noto Sans JP"  "Noto Color Emoji" ];
+        serif     = [ "Noto Serif JP" "Noto Color Emoji" ];
         monospace = [ "Myrica M Patched" "Noto Sans Mono CJK JP" "Noto Color Emoji" ];
       };
     };

config/per-bundle/gnome3.nix

 { config, pkgs, ... }:
 let
   themes = {
-    gtk     = pkgs.arc-theme;
-    icon    = pkgs.zafiro-icons;
+    gtk     = pkgs.plastik-theme;
+    icon    = pkgs.newaita-icons;
     cursor  = pkgs.capitaine-cursors;
   };
 in {
@@ -21,7 +21,7 @@ in {
       extraGSettingsOverridePackages = [
         config.i18n.inputMethod.package
       ] ++ (with pkgs; [
-        gnome3.dconf-editor
+        gnome3.dconf-editor feedreader
       ]);
 
       sessionPath = [
@@ -36,7 +36,7 @@ in {
   };
 
   environment.gnome3.excludePackages = with pkgs.gnome3; [
-    accerciser epiphany
+    accerciser epiphany evolution
     gnome-terminal gnome-weather gnome-todo gnome-maps
     gnome-calendar gnome-clocks gnome-contacts gnome-music
   ];

config/per-bundle/jackaudio.nix

 { config, pkgs, ... }:
 {
-  environment.systemPackages = with pkgs; [
-    (qjackctl.override { libjack2 = jack1; }) jack1
-  ];
-
   boot.kernelModules = [
     "snd-seq" "snd-rawmidi"
   ];
@@ -23,4 +19,8 @@
     { domain = "@audio"; item = "nofile"; type = "soft"; value = "99999"; }
     { domain = "@audio"; item = "nofile"; type = "hard"; value = "99999"; }
   ];
+
+  environment.systemPackages = with pkgs; [
+    qjackctl jack2
+  ];
 }

config/per-bundle/multimedia.nix

@@ -17,6 +17,6 @@
   ];
 
   services.dbus.packages = with pkgs; [
-    deadbeef whipper
+    deadbeef whipper calibre
   ]; 
 }

config/per-bundle/pantheon.nix

+{ config, pkgs, ... }:
+let
+  themes = {
+    gtk     = pkgs.plastik-theme;
+    icon    = pkgs.newaita-icons;
+    cursor  = pkgs.capitaine-cursors;
+  };
+in {
+  services.xserver = {
+    enable  = true;
+    autorun = true;
+
+    desktopManager.xterm.enable = false;
+    desktopManager.default = "none";
+    desktopManager.pantheon = {
+      enable = true;
+      extraGSettingsOverridePackages = [
+        config.i18n.inputMethod.package
+      ] ++ (with pkgs; [
+        gnome3.dconf-editor
+        lightlocker
+        plank
+      ]) ++ (with pkgs.pantheon; [
+        elementary-camera
+        elementary-music
+        elementary-capnet-assist
+        elementary-screenshot-tool
+        elementary-videos
+        elementary-files
+        elementary-dpms-helper
+        elementary-photos
+        elementary-calculator
+        elementary-settings-daemon
+        switchboard-with-plugs
+        wingpanel-with-indicators
+      ]);
+
+      sessionPath = [
+        config.i18n.inputMethod.package
+      ] ++ (with pkgs; [
+        gnome3.dconf
+        gnome3.dconf-editor
+        gnome3.glib.dev
+        dbus-glib
+        lightlocker
+      ]);
+    };
+    displayManager.job.environment = {
+      LANG = "ja_JP.UTF-8";
+    };
+    displayManager.lightdm.greeters.mini = {
+      enable = true;
+      user   = "nyarla";
+      extraConfig = ''
+        [greeter]
+        show-password-label = true
+        password-label-text = nyarla: 
+        invalid-password-text = Invalid
+        show-input-cursor = true
+
+        [greeter-theme]
+        font = "Noto Sans JP"
+        font-size = 1em
+        text-color = "#FFFFFF"
+        error-color = "#EF2929"
+        background-image = ""
+        background-color = "#2E3436"
+        window-color = "#2E3436"
+        border-color = "#FFFFFF"
+        border-width = 1px
+        layout-space = 60
+        password-color = "#729FCF"
+        password-backgroud-color = "#2E3436"
+      '';
+    };
+  };
+
+  environment.pantheon.excludePackages = (with pkgs; [
+    gnome3.epiphany
+    gnome3.geary
+    xterm
+  ]) ++ (with pkgs.pantheon; [
+    elementary-code
+    elementary-calendar
+    elementary-terminal
+  ]);
+
+  environment.systemPackages = (with themes; [
+    gtk icon cursor
+  ]);
+
+  services.dbus.packages = (with pkgs; [
+    lightdm
+    lightdm_gtk_greeter
+    plank
+  ]) ++ (with pkgs.pantheon; [
+    wingpanel
+    switchboard
+  ]);
+
+  programs.qt5ct.enable = true;
+}

config/per-hardware/XPS-9560-JP.nix

@@ -29,8 +29,8 @@
 
   # initrd
   boot.initrd.luks.devices = [
-    { name   = "system";
-      device = "/dev/disk/by-uuid/857e50ed-2066-4417-9621-46ad104b8c32";
+    { name   = "container";
+      device = "/dev/disk/by-uuid/733af657-a327-46cc-ad7f-ca81e3d5aed6";
       preLVM = true;
       allowDiscards = true;
     }
@@ -98,14 +98,13 @@
   '';
 
   # webcam
-  services.uvcvideo.dynctrl = {
-    enable   = true;
-    packages = with pkgs; [ gnome3.cheese ];
-  };
+# services.uvcvideo.dynctrl = {
+#   enable   = true;
+#   packages = with pkgs; [ gnome3.cheese ];
+# };
 
   # Audio
   # ------
-
   # pulseaudio
   hardware.pulseaudio = {
     enable        = true;

config/per-host/NyXPS15.nix

@@ -19,6 +19,10 @@
 
   # i18n.defaultLocale = "en_US.UTF-8";
   i18n.defaultLocale = "ja_JP.UTF-8";
+  i18n.supportedLocales = [
+    "ja_JP.UTF-8/UTF-8"
+    "en_US.UTF-8/UTF-8"
+  ];
 
   # i18n
   # ====
@@ -120,11 +124,4 @@
     (import ../../overlays/modified/default.nix)
     (import ../../overlays/workaround/default.nix)
   ];
-
-  # System
-  # ======
-
-  # NixOS version
-  # -------------
-  system.stateVersion = "19.03";
 }

dotfiles/nyarla/bootstrap/nixos.sh

@@ -31,22 +31,22 @@ ln -sf $DOTFILES/git/gitconfig $HOME/.gitconfig
 ln -sf $DOTFILES/git/gitignore $HOME/.gitignore
 
 # vim
-ln -sf $DOTFILES/vim/init.vim  $HOME/.vimrc
-ln -sf $DOTFILES/vim/init.gvim $HOME/.gvimrc
-
-test -d $HOME/.config/nvim/autoload || mkdir -p $HOME/.config/nvim/autoload/
-test -d $HOME/.config/nvim/colors   || mkdir -p $HOME/.config/nvim/colors/
-
-test -d $HOME/.nvim.d/swap          || mkdir -p $HOME/.vim.d/swap
-test -d $HOME/.vim.d/backup         || mkdir -p $HOME/.vim.d/backup
-
-ln -sf $DOTFILES/vim/init.vim $HOME/.config/nvim/init.vim
+if has go ; then
+  go get -u github.com/vim-volt/volt
+  cd $GOPATH/src/github.com/vim-volt/volt
+  make
+  mkdir -p $GOPATH/bin
+  cp bin/volt $GOPATH/bin/volt
+fi
 
-curl -L https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim        -o $HOME/.config/nvim/autoload/plug.vim
-curl -L https://raw.githubusercontent.com/hukl/Smyck-Color-Scheme/master/smyck.vim -o $HOME/.config/nvim/colors/smyck.vim
+if has volt ; then
+  ln -sf $DOTFILES/volt $HOME/.config/vim-volt
+  volt get -u -l
+  volt build
+fi
 
 # zsh
-ln -sf $DOTFILES/zsh/bootstrap.zsh $HOME/.zshrc
+ln -sf $DOTFILES/zsh/zshrc.zsh $HOME/.zshrc
 
 # mlterm
 test -d $HOME/.mlterm || mkdir -p $HOME/.mlterm
@@ -54,4 +54,3 @@ ln -sf $DOTFILES/mlterm/main    $HOME/.mlterm/main
 ln -sf $DOTFILES/mlterm/aafont  $HOME/.mlterm/aafont
 ln -sf $DOTFILES/mlterm/color   $HOME/.mlterm/color
 ln -sf $DOTFILES/mlterm/key     $HOME/.mlterm/key
-

dotfiles/nyarla/zsh/autoinstall.plugin.zsh

@@ -48,7 +48,7 @@ if ! test -d "$HOME"/.vim.d ; then
   mkdir -p "$HOME"/.vim.d/{backup,swap}
 fi
 
-test -e $HOME/.config/vim-volt || ln -s $DOTFILES/volt $HOME/.config/vim-volt
+test -e $HOME/.config/vim-volt || ln -sf $DOTFILES/volt $HOME/.config/vim-volt
 
 ### FIXME: auto install for vim plugins
 

dotfiles/nyarla/zsh/autoload.plugin.zsh

 #!/usr/bin/env zsh
 
-# Language
-# --------
-case "${TERM:-}" in
-  *)
-    export LANG=en_US.UTF-8
-    export LC_ALL=en_US.UTF-8
-    export LANGUAGE=en_US.UTF-8
-    ;;
-esac
-
 # Golang
 # ------
 export GOPATH="$HOME"/dev

overlays/experimental/pkgs/vmware-host-modules/default.nix

@@ -7,21 +7,21 @@ let
   '';
   vmci-src  = requireFile {
     name    = "vmci.tar";
-    sha256  = "1jv0ba9clyp8s6xyyackf947yy27g0l0r2n02mxknglija6dq4y5";
+    sha256  = "14hz1ca0gxb4wm1ilq131b96j14sxaqplyvyn7xmjav8pckd2b23";
     message = message;
   };
   vsock-src = requireFile {
     name    = "vsock.tar";
-    sha256  = "13zm8mvx3ipb6kzp840ks2zlf933n1r9qrs5aflwldyqm7a0mfac";
+    sha256  = "1sz78yl14fwv4a5sd64qxsq7vz6briq7mss7d8qnplxmp0j45d9p";
     message = message;
   };
   host-src  = fetchurl {
-    url = "https://codeload.github.com/mkubecek/vmware-host-modules/tar.gz/p15.0.4-k5.1";
-    sha256 = "1h8pn69zcz7xdvyqlvx7hlv7c4rwyzxzdd4c9nalr8fd4jgz16gd";
+    url = "https://codeload.github.com/mkubecek/vmware-host-modules/tar.gz/p15.1.0-k5.1";
+    sha256 = "1bb9a39w8bc3snxi69hnbw6naw57blgad16cf443hf7iq72bs9mr";
   };
 in stdenv.mkDerivation rec {
   name    = "vmware-host-modules-${version}";
-  version = "15.0.4";
+  version = "15.1.0";
   srcs    = [ vmci-src vsock-src host-src ];
 
   hardeningDisable = [

overlays/extended/default.nix

 self: super: let
   require = path: args: super.callPackage (import path) args;
 in {
-  fontmerger        = require ./pkgs/font-merger/default.nix { };
-  genjyuu-gothic    = require ./pkgs/genjyuu-gothic/default.nix { };
-  myrica-patched    = require ./pkgs/myrica-patched/default.nix { };
-  nerdfonts-symbols = require ./pkgs/nerdfonts-symbols/default.nix { };
-  noto-fonts-cjk-jp = require ./pkgs/noto-fonts-cjk-jp/default.nix { }; 
-  tmux-up           = require ./pkgs/tmux-up/default.nix { };
-  wcwidth-cjk       = require ./pkgs/wcwidth-cjk/default.nix { };
+  elementary-tweaks = require ./pkgs/elementary-tweaks/default.nix { };
+  fontmerger              = require ./pkgs/font-merger/default.nix { };
+  genjyuu-gothic          = require ./pkgs/genjyuu-gothic/default.nix { };
+  myrica-patched          = require ./pkgs/myrica-patched/default.nix { };
+  newaita-icons           = require ./pkgs/newaita-icons/default.nix { };
+  noto-fonts-jp           = require ./pkgs/noto-fonts-jp/default.nix { };
+  plastik-theme           = require ./pkgs/plastik-theme/default.nix { };
+  switchboard-plug-locale = require ./pkgs/switchboard-plug-locale/default.nix { };
+  tmux-up                 = require ./pkgs/tmux-up/default.nix { };
+  wcwidth-cjk             = require ./pkgs/wcwidth-cjk/default.nix { };
+
+  pantheon                = super.pantheon.overrideScope' (extender: base:  {
+    switchboard = base.switchboard.overrideAttrs (old: rec {
+      nativeBuildInputs = old.nativeBuildInputs ++ [
+        super.makeWrapper
+      ];
+      buildInputs = old.buildInputs ++ [
+        super.gsettings-desktop-schemas
+      ];
+      postFixup = ''
+        wrapProgram $out/bin/io.elementary.switchboard \
+          --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+          --suffix XDG_DATA_DIRS : "$out/share:/run/current-system/sw/share:$GSETTINGS_SCHEMAS_PATH"
+      '';
+    });
+
+    switchboard-plug-keyboard = base.switchboard-plug-keyboard.overrideAttrs (old: rec {
+      postPatch = ''
+        cp ${super.fetchurl {
+          url = "https://raw.githubusercontent.com/geocool/switchboard-plug-keyboard/a5b1693ab74e4453da60e9446054aebd1cbc05e9/src/Shortcuts/Shortcut.vala";
+          sha256 = "0kki9lcz9rrn33369yxy54iwgn2ic42rxrrilisipj3hchwj7wga";
+        }} src/Shortcuts/Shortcut.vala
+      '';
+    });
+
+    switchboard-with-plugs = base.switchboard-with-plugs.override {
+      plugs = base.switchboardPlugs ++ [ self.elementary-tweaks  ];
+    };
+  });
 }

overlays/extended/pkgs/elementary-tweaks/default.nix

+{ stdenv, fetchFromGitHub, pantheon, pkgconfig, meson, python3, ninja
+, vala, gtk3, libgee, gettext, clutter-gtk, libunity, gnome2, polkit 
+, wrapGAppsHook, gobject-introspection }:
+stdenv.mkDerivation rec {
+  pname     = "elementary-tweaks";
+  version   = "git";
+  src       = fetchFromGitHub {
+    owner   = "elementary-tweaks";
+    repo    = pname;
+    rev     = "47574c8b64e1d362db5055b82334717515977a73";
+    sha256  = "1njl51bh7asx5vf806wgs5fp525fdn2kdsvp8f0qhlcws5zkvikh";
+  };
+
+  passthru = {
+    updateScript = pantheon.updateScript {
+      repoName = pname;
+    };
+  };
+
+  nativeBuildInputs = [
+    gettext
+    gobject-introspection
+    meson
+    ninja
+    pkgconfig
+    python3
+    vala
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    pantheon.switchboard
+    pantheon.granite
+    pantheon.elementary-icon-theme
+    clutter-gtk
+    gtk3
+    libgee
+    libunity
+    gnome2.GConf
+    polkit
+  ];
+
+  PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard";
+
+  postPatch = ''
+    chmod +x meson/post_install.py
+    patchShebangs meson/post_install.py
+  '';
+}

overlays/extended/pkgs/newaita-icons/default.nix

+{ stdenv, fetchFromGitHub }:
+stdenv.mkDerivation rec {
+  name    = "Newaita-${version}";
+  version = "git";
+  src     = fetchFromGitHub {
+    owner   = "cbrnix";
+    repo    = "Newaita";
+    rev     = "493381f2adaef8f948e6b3dabd1357bcab57f30f";
+    sha256  = "02l726fhpwpawrfw22ghz8lwfynz6g2kvw4r3kb0r07f9gh84n80";
+  };
+
+  installPhase = ''
+    mkdir -p $out/share/icons
+    mv Newaita-dark $out/share/icons
+    mv Newaita      $out/share/icons
+  '';
+}

overlays/extended/pkgs/noto-fonts-cjk-jp/default.nix → overlays/extended/pkgs/noto-fonts-jp/default.nix

 { stdenv, fetchurl }:
 let
   fonts = [
-    { name = "NotoSansCJKjp-Black"        ; sha256 = "0qw0m62xrc4jg10y27x3vwmp3axq046vg0jyayc2r1fc633dp1kd"; }
-    { name = "NotoSansCJKjp-Bold"         ; sha256 = "0x1m3agz8m1vmm5p6wp28kvqax36zqki7601s88qxlx2dvhm5qvj"; }
-    { name = "NotoSansCJKjp-DemiLight"    ; sha256 = "1dpjxsfd7sr8mdbq2lgr1cb4m53xzrd6cbqj0z9fa0gni9xswc95"; }
-    { name = "NotoSansCJKjp-Light"        ; sha256 = "19kjknjhpngaxnv5f3vhpfzz7yhf9zp1awj17cciip5fks4sw5ia"; }
-    { name = "NotoSansCJKjp-Medium"       ; sha256 = "028m87ydcrxrf063mzv5scm6xc41nxw28svhilmxcczmizvp38h1"; }
-    { name = "NotoSansCJKjp-Regular"      ; sha256 = "1jbjb36zwyf7jmv3fl33palfdr4ci7l0znk74y6qnw18v11q5ydq"; }
-    { name = "NotoSansCJKjp-Thin"         ; sha256 = "107kf4mmkb6swvj95f6zjbw40ga42fxl2lw37pci85lkydk7swqp"; }
+    { name = "NotoSansJP-Black";          sha256 = "1mxfi76g2bdbjwg7370ms2ifq53lvzrnf7kkk47928yljdd1z2i5"; }
+    { name = "NotoSansJP-Bold";           sha256 = "0kr2fic5j9h6i7f3yqwck5lcxnfcv0amsw03kx7bgh3jcdjid1h4"; }
+    { name = "NotoSansJP-DemiLight";      sha256 = "13kclx4p7vrn399hdivns0fwh7f8d150gjhl1xkmlxl128bz4ln0"; }
+    { name = "NotoSansJP-Light";          sha256 = "04aaq4m76a76i0j0ngza9zafhnlm687cv5pij5dqlg4fg721fkcf"; }
+    { name = "NotoSansJP-Medium";         sha256 = "1ply2zzp1z26caclwqbz3hmp6kvg3l8w9y3y6isn1sdmk8r8anx6"; }
+    { name = "NotoSansJP-Regular";        sha256 = "19k1n95mipkzkzkx0ivqssca6b5m7sjyvzq46gjnmg76h6brrcwv"; }
+    { name = "NotoSansJP-Thin";           sha256 = "1ndrnbf1cyjqgs61yypb71cni00ypr950qr4ri218dx4zlxx1d2w"; }
 
-    { name = "NotoSansMonoCJKjp-Bold"     ; sha256 = "0wf8j03h8hw2h43vas1igm8gxdhjjqbfzi8vx7l93kbipqnsal6j"; } 
-    { name = "NotoSansMonoCJKjp-Regular"  ; sha256 = "0psir4w7r09zijw3rh25rjxs3hacam500ws9qfxpkkgv0rgw4qfj"; }
+    { name = "NotoSansMonoCJKjp-Bold";    sha256 = "0vdqyvqvaj7jda0rr1bz7a05wjs1s08d4jippaffvrikhwnxpsly"; }
+    { name = "NotoSansMonoCJKjp-Regular"; sha256 = "0wlrw6aclgg6fgz01vn55rf8jw0zban1zv114slv53qr1qlwrfva"; }
 
-    { name = "NotoSerifCJKjp-Black"       ; sha256 = "1xyi3gx5ygd3r8gmqzqrj3gb4g63swfjslzssh7wz9z0wv7vvd0d"; }
-    { name = "NotoSerifCJKjp-Bold"        ; sha256 = "1wycqbdia4vix1xvh20plsgnjxq3irya0y9bgrnikizdnfm4p4sq"; }
-    { name = "NotoSerifCJKjp-ExtraLight"  ; sha256 = "14lfpmcgkhw7v7mvcj9jaachvyryaf4fy66bws17f891shm6xrf1"; }
-    { name = "NotoSerifCJKjp-Light"       ; sha256 = "05c7jzi1kcjx1r6cry04df47lmq3lvqbb9pi9as6xbn2sxxc4pj8"; }
-    { name = "NotoSerifCJKjp-Medium"      ; sha256 = "1w1qm45xqm9wc0qc2801mws0lv0b90z3jd21a31ch4ib3hfyq728"; }
-    { name = "NotoSerifCJKjp-Regular"     ; sha256 = "126zgi2in71p4mvca25kd75l6msp1z8342qv066vdg6jkdxj9h3r"; }
-    { name = "NotoSerifCJKjp-SemiBold"    ; sha256 = "1ni1g010lwkbfzwnxbv5fda6nn3als6qqz4py2j3nn608xdh4q2s"; }
+    { name = "NotoSerifJP-Black";         sha256 = "0h4s9k245cbjylvnlm1y3xnbd5sk2yjf66d6dqcxrfrbwnw3ljc2"; }
+    { name = "NotoSerifJP-Bold";          sha256 = "10r489hm09qn3l4cj40qmpgqijrbfhwmhfirzdh321cnhi26gyrn"; }
+    { name = "NotoSerifJP-ExtraLight";    sha256 = "0nfvbxcmhpbjz516x8l804py63gcqxhn2hn2cxkp3mgsklqzzwfp"; }
+    { name = "NotoSerifJP-Light";         sha256 = "0pl8bq3axlbjr6il2gjf27bg68r36p5k60v4fk0p6hp7wpqrq313"; }
+    { name = "NotoSerifJP-Medium";        sha256 = "1cbxml3ih4hpmdhz4zdccw59xni89ahx63wlc0iz5m055cylvlga"; }
+    { name = "NotoSerifJP-Regular";       sha256 = "17cdbbgda7d635qc5wschb95lgkn1xsnyb6m3j8gfy9rvvf7aa51"; }
+    { name = "NotoSerifJP-SemiBold";      sha256 = "1l1zf1gf9g5s7sy3awfd9r4vdd81r0ignpixm4x525rpq6qki2jd"; }
   ];
-in
-stdenv.mkDerivation rec {
-  name    = "noto-fonts-cjk-jp-git";
-  version = "2.000";
+
+
+in stdenv.mkDerivation rec {
+  version = "V2.0001";
+  name    = "noto-fonts-jp-${version}";
 
   files = map ({ name, sha256 }: fetchurl {
-    url = "https://raw.githubusercontent.com/googlei18n/noto-cjk/master/${name}.otf";
-    sha256 = "${sha256}";
+    url = "https://raw.githubusercontent.com/googlefonts/noto-cjk/NotoSans${version}/${name}.otf";
+    inherit sha256;
   }) fonts;
 
   unpackPhase = ''
     mkdir -p noto
 
     ${stdenv.lib.strings.concatMapStrings (font: ''
-      cp ${font} noto
+      cp ${font} noto  
     '') files}
   '';
 

overlays/extended/pkgs/plastik-theme/default.nix

+{ stdenv, requireFile }:
+let
+  message = ''
+    Please download from:
+
+      - https://www.opendesktop.org/co/1528244815
+  '';
+
+  gtk = requireFile {
+    name = "Plastik_Master.tar.xz"; 
+    sha256 = "1gix9jnpf1wysppa2jifdlbb26g88f4krwd3il2mad3j2w59ff7n";
+    inherit message;
+  };
+
+  gnome-shell-white = requireFile {
+    name = "Plastik-20180913144229.tar.xz";
+    sha256 = "0xy2pivhzg15qx5k4lrmww5024qd3ir97j9fx5avaks13dw6zy1x";
+    inherit message;
+  };
+
+  gnome-shell-griss = requireFile {
+    name = "Plastik-Griss-20180727042955.tar.xz";
+    sha256 = "1mjn1wyvngqcmcgbqjan4c364x836w521awp30k3kg5103chyi5p";
+    inherit message;
+  };
+
+  gnome-shell-dark = requireFile {
+    name = "PlastikDark-Shell.tar.xz";
+    sha256 = "0apha3vh144nd21r86xn60sy2dnpcq0vq46y3lg0v50rlbdgic0b";
+    inherit message;
+  };
+
+in stdenv.mkDerivation rec {
+  name    = "plastik-theme-${version}";
+  version = "git";
+  srcs    = [ gtk gnome-shell-white gnome-shell-griss gnome-shell-dark ];
+
+  unpackPhase = ''
+    ${stdenv.lib.concatMapStrings (x: ''
+      tar -xf ${x}  
+    '') srcs}
+  '';
+
+  installPhase = ''
+    mkdir -p $out/share/themes
+
+    mv Plastik/gnome-shell            Plastik/Plastik/
+    mv PlastikDark-Shell/gnome-shell  Plastik/Plastik-Dark/
+    mv Plastik-Griss/gnome-shell      Plastik/Plastik-Griss/
+
+    mv Plastik/* $out/share/themes/
+  '';
+}

overlays/extended/pkgs/switchboard-plug-locale/UbuntuInstallerShim.vala

+namespace SwitchboardPlugLocale.Installer {
+  public class UbuntuInstaller : Object {
+    public bool install_cancellable;
+    public TransactionMode transaction_mode;
+    public string transaction_language_code;
+    
+    public signal void install_finished(string langcode);
+    public signal void install_failed();
+    public signal void remove_finished(string langcode);
+    public signal void check_missing_finished(string [] missing);
+    public signal void progress_changed(int progress);
+
+    public enum TransactionMode {
+      INSTALL,
+      REMOVE,
+      INSTALL_MISSING,
+    }
+
+    public UbuntuInstaller () {}
+    public void install(string langage) {}
+    public void instal_packages (string [] packages) {}
+    public async void check_missing_languages() {
+      string [] dummy = {};
+      check_missing_finished (dummy);
+    }
+    public void install_missing_languages() {}
+    public void remove (string languagecode) {}
+    public void cancel_install(){}
+  }
+}

overlays/extended/pkgs/switchboard-plug-locale/default.nix

+{ stdenv, fetchurl, pkgconfig, meson, python3, ninja
+, gettext, vala, gtk3, clutter-gtk, libgee, libunity
+, accountsservice, ibus, gnome3, pantheon, polkit
+, wrapGAppsHook, gobject-introspection }:
+stdenv.mkDerivation rec {
+  pname = "switchboard-plug-locale";
+  version = "2.4.1";
+  src = fetchurl {
+    url     = "https://github.com/elementary/switchboard-plug-locale/archive/2.4.1.tar.gz";
+    sha256  = "02rd92v18xp8vhhmgxj3xcmz8hda7zgayrip6m2bc7rgr2f12m9l";
+  };
+
+  passthru = {
+    updateScript = pantheon.updateScript {
+      repoName = pname;
+    };
+  };
+
+  nativeBuildInputs = [
+    gettext
+    gobject-introspection
+    meson
+    ninja
+    pkgconfig
+    python3
+    vala
+    wrapGAppsHook
+  ];
+
+  buildInputs = [
+    pantheon.switchboard
+    pantheon.granite
+    pantheon.elementary-icon-theme
+    clutter-gtk
+    gtk3
+    libgee
+    libunity
+    accountsservice
+    ibus
+    gnome3.gnome-desktop
+    polkit
+  ];
+
+  PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard";
+
+  prePatch = ''
+    cp ${./UbuntuInstallerShim.vala} src/Installer/UbuntuInstaller.vala
+    sed -i "s:/usr/share/:${accountsservice}/share:g" src/Util.vala
+  '';
+
+  postPatch = ''
+    chmod +x meson/post_install.py
+    patchShebangs meson/post_install.py
+  '';
+}

overlays/workaround/default.nix

 self: super: let
   require = path: args: super.callPackage (import path) args ;
 in { 
+  firefox-bin-unwrapped = super.firefox-bin-unwrapped.override {
+    systemLocale = "ja";
+  };
+
+  thunderbird-bin = let
+    src = super.stdenv.lib.findFirst (x: x.locale == "ja" && x.arch == "linux-x86_64") null (import <nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix>).sources;
+  in super.thunderbird-bin.overrideDerivation (old: {
+    src = super.fetchurl {
+      url     = src.url;
+      sha512  = src.sha512;
+    };
+  });
+
+  google-cloud-sdk = super.google-cloud-sdk.overrideAttrs (old: rec {
+    version = "245.0.0";
+    src = super.fetchurl {
+      url     = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-245.0.0-linux-x86_64.tar.gz";
+      sha256  = "bdc66eea38a78ae5b00c7caaa4848965ef63bce73d4374fc806f94ddfd34f10f";
+    };
+  });
 }

packages/dockerapp/vmware-workstation-player/install

@@ -3,7 +3,7 @@
 state=$HOME/local/dockerapp/vmware
 
 docker run -it --init --name="vmware-postbuild" \
-  --volume=$HOME/Downloads/VMware-Player-15.0.4-12990004.x86_64.bundle:/tmp/vmware.bundle:ro \
+  --volume=$HOME/Downloads/VMware-Player-15.1.0-13591040.x86_64.bundle:/tmp/vmware.bundle:ro \
   \
   --volume=/home/$(id -un)/local/dockerapp/vmware:/app:rw \
   \

packages/dockerapp/vmware-workstation-player/run

@@ -15,7 +15,7 @@ docker run --rm -t --init --privileged --net host \
   \
   --device=/dev                                                     \
   --volume=/sys:/sys:ro                                             \
-  --volume=/run/opengl-driver:/run/opengl-driver:ro                 \
+  --volume=/run/opengl-driver:/opt/opengl-driver:ro                 \
   \
   --volume=/nix:/nix:ro                                             \
   --volume=/run/current-system/sw/bin:/run/current-system/sw/bin:ro \
@@ -32,7 +32,7 @@ docker run --rm -t --init --privileged --net host \
   --volume=$state/vmware:/etc/vmware:rw                             \
   --volume=$state/isoimages:/usr/lib/vmware/isoimages:rw            \
   --volume=$state/home:/app:rw                                      \
-  --volume=/data/vm:/data/vm:rw                                     \
+  --volume=$HOME/local/vm:/data/vm:rw                               \
   --volume=/data/active:/data/active:rw                             \
   --volume=$HOME/Downloads:/data/downloads:rw                       \
   \

packages/dockerapp/vmware-workstation-player/vmware-player.desktop

@@ -4,7 +4,7 @@ Version=1.0
 Name=VMware Player
 Comment=VMware Workstation Player
 Path=/etc/nixos/packages/dockerapp/vmware-workstation-player
-Exec=/etc/nixos/packages/dockerapp/vmware-workstation-player %U
+Exec=/etc/nixos/packages/dockerapp/vmware-workstation-player/run %U
 Icon=virt-manager
 Terminal=false
 StartupNotify=true

profile/NyXPS15.nix

@@ -34,6 +34,6 @@
     ../overlays/experimental/vmware-host.nix
 
     # Optional
-    #../config/per-bundle/jackaudio.nix
+    ../config/per-bundle/jackaudio.nix
   ];
 }

scripts/backup

@@ -13,7 +13,7 @@ main() {
     mirror /data/$dir/ /run/media/nyarla/RAID/$dir/
   done
 
-  if test -d /data/lost+found && test -e /etc/restic/credentials ; then
+  if test -d /data/tmp && test -e /etc/restic/credentials ; then
     source /etc/restic/credentials
     cd /data
     restic backup --exclude-file=/etc/restic/resticignore active apps data tmp