Update and fix.
parent
75391937cd
commit
23b21c1994
|
@ -17,6 +17,7 @@
|
||||||
(bind-keys :map global-map
|
(bind-keys :map global-map
|
||||||
("C-c l" . org-store-link)
|
("C-c l" . org-store-link)
|
||||||
("C-c a" . org-agenda)
|
("C-c a" . org-agenda)
|
||||||
|
("C-c b" . org-iswitchb)
|
||||||
("C-c c" . org-capture))
|
("C-c c" . org-capture))
|
||||||
#+END_SRC
|
#+END_SRC
|
||||||
** config
|
** config
|
||||||
|
@ -24,6 +25,7 @@
|
||||||
(setq org-pretty-entities t)
|
(setq org-pretty-entities t)
|
||||||
(setq org-startup-indented t)
|
(setq org-startup-indented t)
|
||||||
(setq org-src-fontify-natively t)
|
(setq org-src-fontify-natively t)
|
||||||
|
(setq org-completion-use-ido t)
|
||||||
(setq org-src-tab-acts-natively t)
|
(setq org-src-tab-acts-natively t)
|
||||||
(setq org-ellipsis "⬎")
|
(setq org-ellipsis "⬎")
|
||||||
(setq org-log-done t)
|
(setq org-log-done t)
|
||||||
|
@ -47,7 +49,7 @@
|
||||||
|
|
||||||
(setq org-default-notes-file "~/org/refile.org")
|
(setq org-default-notes-file "~/org/refile.org")
|
||||||
|
|
||||||
|
(setq org-agenda-todo-ignore-scheduled t)
|
||||||
|
|
||||||
(setq org-capture-templates
|
(setq org-capture-templates
|
||||||
'(("l" "Today I learned"
|
'(("l" "Today I learned"
|
||||||
|
@ -69,11 +71,21 @@
|
||||||
|
|
||||||
|
|
||||||
#+END_SRC
|
#+END_SRC
|
||||||
** add template for elisp
|
** add templates
|
||||||
#+BEGIN_SRC emacs-lisp
|
#+BEGIN_SRC emacs-lisp
|
||||||
(add-to-list 'org-structure-template-alist
|
(add-to-list 'org-structure-template-alist
|
||||||
'("el" "#+BEGIN_SRC emacs-lisp\n?\n#+END_SRC"))
|
'("el" "#+BEGIN_SRC emacs-lisp\n?\n#+END_SRC"))
|
||||||
|
(add-to-list 'org-structure-template-alist
|
||||||
|
'("py" "#+BEGIN_SRC python\n?\n#+END_SRC"))
|
||||||
|
(org-babel-do-load-languages
|
||||||
|
'org-babel-load-languages
|
||||||
|
'((python . t)
|
||||||
|
(sh . t)
|
||||||
|
))
|
||||||
#+END_SRC
|
#+END_SRC
|
||||||
|
|
||||||
|
#+RESULTS:
|
||||||
|
|
||||||
** org-bullets
|
** org-bullets
|
||||||
#+BEGIN_SRC emacs-lisp
|
#+BEGIN_SRC emacs-lisp
|
||||||
(use-package org-bullets
|
(use-package org-bullets
|
||||||
|
@ -184,6 +196,21 @@
|
||||||
;; (global-set-key (kbd "C-x l") 'counsel-locate)
|
;; (global-set-key (kbd "C-x l") 'counsel-locate)
|
||||||
;; (global-set-key (kbd "C-S-o") 'counsel-rhythmbox)
|
;; (global-set-key (kbd "C-S-o") 'counsel-rhythmbox)
|
||||||
;; (define-key read-expression-map (kbd "C-r") 'counsel-expression-history)
|
;; (define-key read-expression-map (kbd "C-r") 'counsel-expression-history)
|
||||||
|
** projectile
|
||||||
|
#+BEGIN_SRC emacs-lisp
|
||||||
|
(use-package projectile
|
||||||
|
:config
|
||||||
|
(projectile-global-mode t)
|
||||||
|
(use-package counsel-projectile))
|
||||||
|
#+END_SRC
|
||||||
|
** ggtags
|
||||||
|
#+BEGIN_SRC emacs-lisp
|
||||||
|
(use-package ggtags
|
||||||
|
:demand
|
||||||
|
:bind ("M-." . ggtags-find-tag-dwim))
|
||||||
|
#+END_SRC
|
||||||
|
|
||||||
|
|
||||||
** TODO i3-emacs
|
** TODO i3-emacs
|
||||||
* editing
|
* editing
|
||||||
** line numbers
|
** line numbers
|
||||||
|
|
|
@ -178,10 +178,14 @@ ${kill-and-restart haskellPackages.arbtt "arbtt-capture"}
|
||||||
|
|
||||||
bindsym XF86MonBrightnessUp exec ${light}/bin/light -A 5
|
bindsym XF86MonBrightnessUp exec ${light}/bin/light -A 5
|
||||||
bindsym XF86MonBrightnessDown exec ${light}/bin/light -U 5
|
bindsym XF86MonBrightnessDown exec ${light}/bin/light -U 5
|
||||||
|
bindsym ctrl+XF86MonBrightnessUp exec ${light}/bin/light -A 1
|
||||||
|
bindsym ctrl+XF86MonBrightnessDown exec ${light}/bin/light -U 1
|
||||||
bindsym XF86AudioLowerVolume exec ${alsaUtils}/bin/amixer set Master 1%-
|
bindsym XF86AudioLowerVolume exec ${alsaUtils}/bin/amixer set Master 1%-
|
||||||
bindsym XF86AudioRaiseVolume exec ${alsaUtils}/bin/amixer set Master 1%+
|
bindsym XF86AudioRaiseVolume exec ${alsaUtils}/bin/amixer set Master 1%+
|
||||||
bindsym XF86AudioMute exec ${alsaUtils}/bin/amixer set Master toggle
|
bindsym XF86AudioMute exec ${alsaUtils}/bin/amixer set Master toggle
|
||||||
bindsym $mod+Shift+s exec --no-startup-id ${screenshot_public}/bin/screenshot_public
|
bindsym $mod+Shift+s exec --no-startup-id ${screenshot_public}/bin/screenshot_public
|
||||||
|
bindsym Print exec --no-startup-id ${screenshot_public}/bin/screenshot_public
|
||||||
|
bindsym $mod+p exec --no-startup-id passmenu
|
||||||
workspace_auto_back_and_forth yes
|
workspace_auto_back_and_forth yes
|
||||||
|
|
||||||
hide_edge_borders smart
|
hide_edge_borders smart
|
||||||
|
|
|
@ -309,6 +309,7 @@ format-charging-underline = #ffb52a
|
||||||
time-format = %H:%M
|
time-format = %H:%M
|
||||||
label-charging = %percentage%% - %time%
|
label-charging = %percentage%% - %time%
|
||||||
label-discharging = %percentage%% - %time%
|
label-discharging = %percentage%% - %time%
|
||||||
|
label-full = %percentage%%
|
||||||
format-discharging = <ramp-capacity> <label-discharging>
|
format-discharging = <ramp-capacity> <label-discharging>
|
||||||
format-discharging-underline = ${self.format-charging-underline}
|
format-discharging-underline = ${self.format-charging-underline}
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,10 @@
|
||||||
|
|
||||||
{
|
{
|
||||||
allowUnfree = true;
|
allowUnfree = true;
|
||||||
|
chromium = {
|
||||||
|
vaapiSupport = true;
|
||||||
|
|
||||||
|
};
|
||||||
# chromium = {
|
# chromium = {
|
||||||
# enablePepperFlash = true;
|
# enablePepperFlash = true;
|
||||||
# enablePepperPDF = true;
|
# enablePepperPDF = true;
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
self: super:
|
self: super:
|
||||||
let
|
let
|
||||||
|
pkgold = super;
|
||||||
overrideOlder = original: override: let
|
overrideOlder = original: override: let
|
||||||
lib = super.lib;
|
lib = super.lib;
|
||||||
newpkgver = lib.getVersion (override original);
|
newpkgver = lib.getVersion (override original);
|
||||||
|
@ -7,6 +8,16 @@ let
|
||||||
in if (lib.versionOlder oldpkgver newpkgver) then original.overrideDerivation override else original;
|
in if (lib.versionOlder oldpkgver newpkgver) then original.overrideDerivation override else original;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
i3lock-color = overrideOlder super.i3lock-color (attrs: rec {
|
||||||
|
version = "2.9.1-2017-09-10";
|
||||||
|
name = "i3lock-color-${version}";
|
||||||
|
src = super.fetchFromGitHub {
|
||||||
|
owner = "chrjguill";
|
||||||
|
repo = "i3lock-color";
|
||||||
|
rev = "d03fbe70c92505627af61a1464f2eaafe9fcbfd5";
|
||||||
|
sha256 = "12vw90n6pmz1fxqv55nlwpbfzj9wap6b7rcrxjgfl0snqx3nijlg";
|
||||||
|
};
|
||||||
|
});
|
||||||
# spotify = overrideOlder pkgs.spotify (attrs: rec {
|
# spotify = overrideOlder pkgs.spotify (attrs: rec {
|
||||||
# version = "1.0.48.103.g15edf1ec-94";
|
# version = "1.0.48.103.g15edf1ec-94";
|
||||||
# name = "spotify-${version}";
|
# name = "spotify-${version}";
|
||||||
|
@ -16,4 +27,9 @@ in
|
||||||
# };
|
# };
|
||||||
#});
|
#});
|
||||||
|
|
||||||
|
haskellPackages = with super.haskell.lib; super.haskellPackages.extend (self: super:{
|
||||||
|
X11 = overrideCabal super.X11 (drv: {
|
||||||
|
librarySystemDepends = drv.librarySystemDepends ++ [ pkgold.xorg.libXScrnSaver ];
|
||||||
|
});
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,6 +17,12 @@ self: super: {
|
||||||
'';
|
'';
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
i3-gaps = super.i3-gaps.overrideDerivation (attrs: {
|
||||||
|
patches = [(super.fetchpatch {
|
||||||
|
url = "https://github.com/Lucus16/i3/commit/65a5afda81ddd1618b4a62b7188173c82ee5f985.patch";
|
||||||
|
sha256 = "1s943069afamizrz5pmll6cmrzgnlv3v93bmnykifhr0mnavbhph";
|
||||||
|
})];
|
||||||
|
});
|
||||||
|
|
||||||
# wine = pkgs.wine.override { wineRelease = "staging"; wineBuild = "wineWow"; };
|
# wine = pkgs.wine.override { wineRelease = "staging"; wineBuild = "wineWow"; };
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,8 +6,11 @@ self: super: {
|
||||||
counsel
|
counsel
|
||||||
flycheck
|
flycheck
|
||||||
ivy
|
ivy
|
||||||
|
ivy-hydra
|
||||||
magit
|
magit
|
||||||
projectile
|
projectile
|
||||||
|
epkgs.melpaPackages.counsel-projectile
|
||||||
|
ggtags
|
||||||
use-package
|
use-package
|
||||||
org-bullets
|
org-bullets
|
||||||
solarized-theme
|
solarized-theme
|
||||||
|
@ -17,13 +20,15 @@ self: super: {
|
||||||
evil-tutor
|
evil-tutor
|
||||||
evil-surround
|
evil-surround
|
||||||
epkgs.evil-goggles
|
epkgs.evil-goggles
|
||||||
|
epkgs.ox-mediawiki
|
||||||
|
epkgs.hledger-mode
|
||||||
# evil-commentary
|
# evil-commentary
|
||||||
password-store
|
password-store
|
||||||
pass
|
pass
|
||||||
linum-relative
|
linum-relative
|
||||||
(epkgs.trivialBuild {
|
(epkgs.trivialBuild {
|
||||||
pname = "emacs-nix-mode";
|
pname = "emacs-nix-mode";
|
||||||
src = pkgs.fetchFromGitHub {
|
src = super.fetchFromGitHub {
|
||||||
owner = "matthewbauer";
|
owner = "matthewbauer";
|
||||||
repo = "nix-mode";
|
repo = "nix-mode";
|
||||||
rev = "v1.2.1";
|
rev = "v1.2.1";
|
||||||
|
|
|
@ -16,6 +16,7 @@ in {
|
||||||
xorg.xrandr
|
xorg.xrandr
|
||||||
pavucontrol
|
pavucontrol
|
||||||
light nitrogen
|
light nitrogen
|
||||||
|
dropbox # really?
|
||||||
# wpa_supplicant_gui
|
# wpa_supplicant_gui
|
||||||
xclip siji fira-mono playerctl font-awesome-ttf
|
xclip siji fira-mono playerctl font-awesome-ttf
|
||||||
];
|
];
|
||||||
|
@ -40,12 +41,13 @@ in {
|
||||||
spotify
|
spotify
|
||||||
quasselClient
|
quasselClient
|
||||||
leafpad
|
leafpad
|
||||||
# calibre
|
calibre
|
||||||
|
wpa_supplicant_gui
|
||||||
#py2.plover
|
#py2.plover
|
||||||
wireshark meld
|
wireshark meld
|
||||||
discord
|
discord
|
||||||
fanficfare
|
fanficfare
|
||||||
wpa_supplicant_gui
|
hledger hledger-web
|
||||||
];
|
];
|
||||||
|
|
||||||
media = mkEnv "y-media" [
|
media = mkEnv "y-media" [
|
||||||
|
@ -87,8 +89,8 @@ in {
|
||||||
java = openjdk;
|
java = openjdk;
|
||||||
|
|
||||||
games = mkEnv "y-games" [
|
games = mkEnv "y-games" [
|
||||||
# steam openttd wine winetricks minecraft
|
# steam openttd wine winetricks minecraft nottetris2
|
||||||
# steam nottetris2 # ftb
|
steam
|
||||||
];
|
];
|
||||||
|
|
||||||
js = mkEnv "y-jsdev" [
|
js = mkEnv "y-jsdev" [
|
||||||
|
@ -108,7 +110,7 @@ in {
|
||||||
# so check with nix-env -q first
|
# so check with nix-env -q first
|
||||||
hosts = with self; with self.envs; {
|
hosts = with self; with self.envs; {
|
||||||
ascanius = [apps code de games envs.js pdf nix media gcc misc scripts coins];
|
ascanius = [apps code de games envs.js pdf nix media gcc misc scripts coins];
|
||||||
jarvis = [apps code de games envs.js pdf nix media gcc misc scripts];
|
jarvis = [apps code de games envs.js pdf nix media gcc misc scripts myEmacs];
|
||||||
woodhouse = [de media misc kodi chromium spotify];
|
woodhouse = [de media misc kodi chromium spotify];
|
||||||
pennyworth = [];
|
pennyworth = [];
|
||||||
frumar = [bup gitAndTools.git-annex rtorrent pyroscope];
|
frumar = [bup gitAndTools.git-annex rtorrent pyroscope];
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
{ jdk, ant, libusb, makeWrapper, stdenv, lib, fetchurl }:
|
{ jdk7, ant, libusb, makeWrapper, stdenv, lib, fetchurl }:
|
||||||
let lejospkg = type: attrs:
|
let lejospkg = type: attrs:
|
||||||
stdenv.mkDerivation ({
|
stdenv.mkDerivation ({
|
||||||
name = "lejos-${type}-${attrs.version}";
|
name = "lejos-${type}-${attrs.version}";
|
||||||
JDK_PATH = jdk;
|
JDK_PATH = jdk7;
|
||||||
buildPhase = ''
|
buildPhase = ''
|
||||||
pushd build
|
pushd build
|
||||||
ant
|
ant
|
||||||
|
@ -18,7 +18,7 @@ let lejospkg = type: attrs:
|
||||||
done
|
done
|
||||||
runHook postInstall
|
runHook postInstall
|
||||||
'';
|
'';
|
||||||
buildInputs = [ jdk ant libusb makeWrapper ];
|
buildInputs = [ jdk7 ant libusb makeWrapper ];
|
||||||
} // attrs);
|
} // attrs);
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{ pkgs ? import <nixpkgs> {}
|
{ pkgs ? import <nixpkgs> {}
|
||||||
, stdenv ? pkgs.stdenv
|
, stdenv ? pkgs.stdenv
|
||||||
, fetchgit ? pkgs.fetchgit
|
, fetchgit ? pkgs.fetchgit
|
||||||
, samba3_light ? pkgs.samba3_light
|
, samba4 ? pkgs.samba4
|
||||||
, lib ? pkgs.lib
|
, lib ? pkgs.lib
|
||||||
}:
|
}:
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
|
@ -18,6 +18,6 @@ stdenv.mkDerivation {
|
||||||
installPhase = ''
|
installPhase = ''
|
||||||
mkdir -p $out/bin
|
mkdir -p $out/bin
|
||||||
install ./peage-print $out/bin
|
install ./peage-print $out/bin
|
||||||
wrapProgram $out/bin/peage-print --suffix PATH : ${samba3_light}/bin
|
wrapProgram $out/bin/peage-print --suffix PATH : ${samba4}/bin
|
||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue