Merge branch 'master' of github.com:ngyj/dots

Author: yokodake

.Xresources

@@ -63,5 +63,5 @@ urxvt.scrollWithBuffer: true
 !! urls
 urxvt.matcher.button:   C1
 urxvt.perl-ext-common:  default,matcher
-urxvt.url-launcher:     firefox
+urxvt.url-launcher:     firefox-devedition
 

.emacs.d/user.el

@@ -1,7 +1,6 @@
 ;; *scratch*
 (setq initial-major-mode 'org-mode)
 
-
 ;; pretty
 (set-default-font "Fira Code")
 
@@ -70,6 +69,12 @@
 (setq flymake-start-syntax-check-on-newline nil)
 (setq flycheck-check-syntax-automatically '(save mode-enabled))
 
+;; CLOS
+(use-package slime
+  :ensure t
+  :config
+  (setq inferior-lisp-program "~/.nix-profile/bin/sbcl")
+  (setq slime-contribs '(slime-fancy)))
 
 
 ;; keybinds
@@ -97,6 +102,9 @@
             (setq indent-tabs-mode t)
             (setq tab-width 2)
             (setq python-indent 8)))
+(add-hook 'css-mode-hook
+          (lambda ()
+            (setq css-indent-offset 2)))
 
 (load-file (let ((coding-system-for-read 'utf-8))
                 (shell-command-to-string "agda-mode locate")))
@@ -112,3 +120,10 @@
   (desktop-save "~/.emacs.d/.#desktop#"))
 (global-set-key (kbd "C-c r l") 'load-desktop-default)
 (global-set-key (kbd "C-c r s") 'save-desktop-default)
+
+
+;; quicklisp
+
+(load (expand-file-name "~/quicklisp/slime-helper.el"))
+;; Replace "sbcl" with the path to your implementation
+(setq inferior-lisp-program "sbcl")

.shell/aliases

@@ -102,4 +102,5 @@
     alias setusint='setxkbmap -layout us -variant intl'
     alias setus='setxkbmap -layout us'
     alias setdvp='setxkbmap -layout us -variant dvp'
+    alias ss='scrot -s'
 # }}}

.shell/env

@@ -1,4 +1,10 @@
+# anime folder
 animu=/home/aigis/Anime
+
+# do not delete bash_history
+export HISTSIZE=
+export HISTFILESIZE=
+
 ## Programming envs {{{
 # haskell
 export PATH=$PATH:~/.cabal/bin:~/.local/bin
@@ -10,7 +16,7 @@ export PATH="$PATH:$HOME/.cargo/bin"
 eval `opam config env`
 
 # rakudo
-export PATH=$PATH:~/build/rakudo/rakudo-star-2018.04/install/bin/:~/build/rakudo/rakudo-star-2018.04/install/share/perl6/site/bin
+#export PATH=$PATH:~/build/rakudo/rakudo-star-2018.04/install/bin/:~/build/rakudo/rakudo-star-2018.04/install/share/perl6/site/bin
 # }}}
 
 ## Software envs {{{

.xmonad/xmobarrc

@@ -10,7 +10,7 @@ Config { font = "xft:Fira Code:size=10"
        , overrideRedirect = False
        , border = BottomBM 0
        , borderColor = "#3e3e3e"
-       , commands = [ Run Network "enp3s0" [ "-t"       , "d:<rx> u:<tx>"
+       , commands = [ Run Network "wlp1s0" [ "-t"       , "d:<rx> u:<tx>"
                                            , "-L"       , "100"
                                            , "-H"       , "700"
                                            , "-m"       , "4"
@@ -63,6 +63,5 @@ Config { font = "xft:Fira Code:size=10"
                     ]
        , sepChar = "%"
        , alignSep = "}{"
-       , template = " %StdinReader% }{%mpd% / %disku% / %coretemp% / %memory% / %enp3s0% / <fc=#ede7b4>%date%</fc>  "
+       , template = " %StdinReader% }{%battery% / %disku% / %coretemp% / %memory% / %wlp1s0% / <fc=#ede7b4>%date%</fc>  "
        }
-

.xmonad/xmonad.hs

@@ -162,7 +162,7 @@ main = do
        ]
        `additionalKeysP`
        [(otherMasks ++ "M-" ++ [key], screenWorkspace scr >>= flip whenJust (windows . action))
-         | (key, scr) <- zip "wer" [2,0,1]
+         | (key, scr) <- zip "wer" [0,1,2]
          , (otherMasks, action) <- [ ("", W.view)
                                    , ("S-", W.shift)]
        ]

configuration.nix

@@ -40,7 +40,7 @@
       #windowManager.i3.enable = true;
       windowManager.xmonad.enable = true;
       windowManager.xmonad.extraPackages = self: [ self.xmonad-contrib ];
-      windowManager.xmonad.haskellPackages = pkgs.haskell.packages.ghc822;
+      windowManager.xmonad.haskellPackages = pkgs.haskell.packages.ghc865;
       windowManager.default = "xmonad";
     };
     sshd.enable = true;
@@ -95,38 +95,54 @@
     maxJobs = pkgs.stdenv.lib.mkForce 4;
   };
 
+  virtualisation.virtualbox.host.enable = true;
+
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
+    ahoviewer
+    anki
     binutils
     cabal2nix
+    curl
     emacs
     feh
+    ffmpeg
     firefox-devedition-bin
     git
     haskellPackages.hlint
     haskellPackages.xmobar
     htop
     jpegoptim
+    kdeApplications.kio-extras
+    keepassxc
+    krita
+    krusader
     mpv
     networkmanager
     nitrogen
     nix-bash-completions
+    nomacs
     ntfs3g
     optipng
     p7zip
     pavucontrol
+    gnome3.polari
     psmisc
     racket
     ripgrep
     rofi
+    rustup
     rxvt_unicode
     scrot
+    spotify
+    tmsu
     unzip
     vim
     # vimus
     wget
     which
+    wine
     xlibs.xsetroot
     xscreensaver
     zathura