home: major refactor bits -> modules
This commit is contained in:
parent
b2d9cbee42
commit
23d8b3afbc
|
|
@ -1,44 +0,0 @@
|
|||
{ config, pkgs, lib, ... }:
|
||||
|
||||
let
|
||||
util = import ../util.nix { inherit pkgs; };
|
||||
settingsFormat = pkgs.formats.json { };
|
||||
hostname = lib.strings.fileContents /etc/hostname;
|
||||
in {
|
||||
home.packages = [ pkgs.resilio-sync ];
|
||||
home.file.".cache/rslsync/debug.txt".text = ''
|
||||
80000000
|
||||
0
|
||||
'';
|
||||
|
||||
systemd.user.services = let
|
||||
confFile = settingsFormat.generate "rslsync.conf" {
|
||||
device_name = util.capitalise hostname;
|
||||
storage_path = toString ~/.cache/rslsync;
|
||||
pid_file = toString ~/.cache/rslsync/rslsync.pid;
|
||||
|
||||
use_upnp = true;
|
||||
|
||||
download_limit = 0;
|
||||
upload_limit = 0;
|
||||
|
||||
directory_root = toString ~/.;
|
||||
|
||||
webui.listen = "0.0.0.0:8888";
|
||||
};
|
||||
in {
|
||||
rslsync = {
|
||||
Unit = {
|
||||
Description = "Resilio Sync per-user service";
|
||||
After = "network.target";
|
||||
};
|
||||
Service = {
|
||||
Type = "simple";
|
||||
ExecStart =
|
||||
"${pkgs.resilio-sync}/bin/rslsync --nodaemon --config ${confFile}";
|
||||
Restart = "on-abort";
|
||||
};
|
||||
Install = { WantedBy = [ "default.target" ]; };
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,9 +1,5 @@
|
|||
{
|
||||
allowUnfree = true;
|
||||
|
||||
packageOverrides = pkgs:
|
||||
let util = import ./util.nix { inherit pkgs; };
|
||||
in { kitty = util.nixGLWrapMaybe pkgs.kitty "kitty"; };
|
||||
|
||||
joypixels.acceptLicense = true;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,17 +8,8 @@ let
|
|||
in {
|
||||
programs.home-manager.enable = true;
|
||||
|
||||
imports = [
|
||||
./modules
|
||||
|
||||
./bits/desktop.nix
|
||||
./bits/sway.nix
|
||||
./bits/shell.nix
|
||||
./bits/firefox.nix
|
||||
./bits/emacs.nix
|
||||
./bits/vim.nix
|
||||
./bits/audio.nix
|
||||
] ++ lib.lists.optional (pathExists host-config) host-config;
|
||||
imports = [ ./modules ./profiles ]
|
||||
++ lib.lists.optional (pathExists host-config) host-config;
|
||||
|
||||
home.username = "jez";
|
||||
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
ref: refs/heads/main
|
||||
|
|
@ -1,46 +0,0 @@
|
|||
[alias]
|
||||
st = status
|
||||
a = add
|
||||
ci = commit
|
||||
h = help
|
||||
co = checkout
|
||||
d = diff
|
||||
b = branch
|
||||
m = merge
|
||||
l = log
|
||||
graph = log --oneline --graph
|
||||
shl = log --oneline --graph --decorate
|
||||
ignore = update-index --assume-unchanged
|
||||
unignore = update-index --no-assume-unchanged
|
||||
ignored = !git ls-files -v | grep \"^[[:lower:]]\"
|
||||
[color]
|
||||
ui = auto
|
||||
[giggle]
|
||||
main-window-maximized = false
|
||||
main-window-geometry = 943x632+66+24
|
||||
history-view-vpane-position = 357
|
||||
main-window-view = HistoryView
|
||||
file-view-vpane-position = 582
|
||||
[core]
|
||||
excludesfile = ~/.gitignore.global
|
||||
[include]
|
||||
path = .gitconfig.local
|
||||
[difftool "sourcetree"]
|
||||
cmd = opendiff \"$LOCAL\" \"$REMOTE\"
|
||||
path =
|
||||
[push]
|
||||
default = simple
|
||||
[url "git@github.com:"]
|
||||
insteadOf = gh:
|
||||
[url "git@gitlab.com:"]
|
||||
insteadOf = gl:
|
||||
[github]
|
||||
user = jezcope
|
||||
[fetch]
|
||||
recurseSubmodules = true
|
||||
[init]
|
||||
templateDir = /home/jez/.config/dotfiles/git/template
|
||||
[pull]
|
||||
rebase = false
|
||||
[pager]
|
||||
branch = false
|
||||
|
|
@ -1,34 +0,0 @@
|
|||
.*.sw[op]
|
||||
.DS_Store
|
||||
._*
|
||||
.sconsign.dblite
|
||||
*.pyc
|
||||
doc/tags
|
||||
|
||||
# TeX output cruft
|
||||
*.log
|
||||
*.aux
|
||||
*.lol
|
||||
*.out
|
||||
*.toc
|
||||
*.bcf
|
||||
*.bbl
|
||||
*.blg
|
||||
*.nav
|
||||
*.run.xml
|
||||
*.snm
|
||||
*.fdb_latexmk
|
||||
*.fls
|
||||
*.vrb
|
||||
|
||||
.sass-cache
|
||||
~$*
|
||||
.*.un~
|
||||
*~
|
||||
\#*
|
||||
.\#*
|
||||
*.bak
|
||||
.ipynb_checkpoints
|
||||
.~lock.*\#
|
||||
.stfolder
|
||||
.vscode
|
||||
|
|
@ -1,934 +0,0 @@
|
|||
;; -*- mode: emacs-lisp; lexical-binding: t -*-
|
||||
;; This file is loaded by Spacemacs at startup.
|
||||
;; It must be stored in your home directory.
|
||||
|
||||
(defun dotspacemacs/layers ()
|
||||
"Layer configuration:
|
||||
This function should only modify configuration layer settings."
|
||||
(setq-default
|
||||
;; Base distribution to use. This is a layer contained in the directory
|
||||
;; `+distribution'. For now available distributions are `spacemacs-base'
|
||||
;; or `spacemacs'. (default 'spacemacs)
|
||||
dotspacemacs-distribution 'spacemacs
|
||||
|
||||
;; Lazy installation of layers (i.e. layers are installed only when a file
|
||||
;; with a supported type is opened). Possible values are `all', `unused'
|
||||
;; and `nil'. `unused' will lazy install only unused layers (i.e. layers
|
||||
;; not listed in variable `dotspacemacs-configuration-layers'), `all' will
|
||||
;; lazy install any layer that support lazy installation even the layers
|
||||
;; listed in `dotspacemacs-configuration-layers'. `nil' disable the lazy
|
||||
;; installation feature and you have to explicitly list a layer in the
|
||||
;; variable `dotspacemacs-configuration-layers' to install it.
|
||||
;; (default 'unused)
|
||||
dotspacemacs-enable-lazy-installation 'unused
|
||||
|
||||
;; If non-nil then Spacemacs will ask for confirmation before installing
|
||||
;; a layer lazily. (default t)
|
||||
dotspacemacs-ask-for-lazy-installation t
|
||||
|
||||
;; List of additional paths where to look for configuration layers.
|
||||
;; Paths must have a trailing slash (i.e. `~/.mycontribs/')
|
||||
dotspacemacs-configuration-layer-path (list spacemacs-private-directory)
|
||||
|
||||
;; List of configuration layers to load.
|
||||
dotspacemacs-configuration-layers
|
||||
'(
|
||||
(ivy :variables
|
||||
aw-keys (string-to-list "aoeuhtns")
|
||||
avy-keys aw-keys)
|
||||
|
||||
(colors :variables
|
||||
colors-colorize-identifiers 'variables)
|
||||
|
||||
helpful
|
||||
treemacs deft
|
||||
(elfeed :variables
|
||||
rmh-elfeed-org-files '("~/Notes/Roam/feeds.org"))
|
||||
auto-completion
|
||||
spell-checking
|
||||
syntax-checking
|
||||
emoji
|
||||
git github
|
||||
(ranger :variables
|
||||
ranger-parent-depth 2)
|
||||
(shell :variables
|
||||
shell-default-height 30
|
||||
shell-default-position 'bottom
|
||||
shell-default-shell 'eshell)
|
||||
lsp
|
||||
(org :variables
|
||||
org-enable-reveal-js-support t
|
||||
org-enable-bootstrap-support t
|
||||
org-enable-roam-support t)
|
||||
org-agendas
|
||||
(markdown :variables
|
||||
markdown-list-indent-width 2
|
||||
markdown-asymmetric-header t)
|
||||
restructuredtext asciidoc
|
||||
pandoc
|
||||
pdf
|
||||
bibtex
|
||||
latex html csv json
|
||||
emacs-lisp python haskell rust
|
||||
c-c++ ruby yaml javascript ess
|
||||
tidalcycles
|
||||
windows-scripts
|
||||
nixos docker systemd ansible
|
||||
)
|
||||
;; List of additional packages that will be installed without being
|
||||
;; wrapped in a layer. If you need some configuration for these
|
||||
;; packages, then consider creating a layer. You can also put the
|
||||
;; configuration in `dotspacemacs/user-config'.
|
||||
;; To use a local version of a package, use the `:location' property:
|
||||
;; '(your-package :location "~/path/to/your-package/")
|
||||
;; Also include the dependencies as they will not be resolved automatically.
|
||||
dotspacemacs-additional-packages
|
||||
'(focus
|
||||
direnv
|
||||
wc-mode
|
||||
mpdel
|
||||
ebib
|
||||
org-noter
|
||||
elpher
|
||||
pocket-reader
|
||||
(matrix-client :location (recipe :fetcher github :repo "alphapapa/matrix-client.el"
|
||||
:files (:defaults "logo.png" "matrix-client-standalone.el.sh")))
|
||||
)
|
||||
|
||||
;; A list of packages that cannot be updated.
|
||||
dotspacemacs-frozen-packages '()
|
||||
|
||||
;; A list of packages that will not be installed and loaded.
|
||||
dotspacemacs-excluded-packages '(org-brain)
|
||||
|
||||
;; Defines the behaviour of Spacemacs when installing packages.
|
||||
;; Possible values are `used-only', `used-but-keep-unused' and `all'.
|
||||
;; `used-only' installs only explicitly used packages and deletes any unused
|
||||
;; packages as well as their unused dependencies. `used-but-keep-unused'
|
||||
;; installs only the used packages but won't delete unused ones. `all'
|
||||
;; installs *all* packages supported by Spacemacs and never uninstalls them.
|
||||
;; (default is `used-only')
|
||||
dotspacemacs-install-packages 'used-only))
|
||||
|
||||
(defun dotspacemacs/init ()
|
||||
"Initialization:
|
||||
This function is called at the very beginning of Spacemacs startup,
|
||||
before layer configuration.
|
||||
It should only modify the values of Spacemacs settings."
|
||||
;; This setq-default sexp is an exhaustive list of all the supported
|
||||
;; spacemacs settings.
|
||||
(setq-default
|
||||
;; If non-nil then enable support for the portable dumper. You'll need
|
||||
;; to compile Emacs 27 from source following the instructions in file
|
||||
;; EXPERIMENTAL.org at to root of the git repository.
|
||||
;; (default nil)
|
||||
dotspacemacs-enable-emacs-pdumper nil
|
||||
|
||||
;; Name of executable file pointing to emacs 27+. This executable must be
|
||||
;; in your PATH.
|
||||
;; (default "emacs")
|
||||
dotspacemacs-emacs-pdumper-executable-file "emacs"
|
||||
|
||||
;; Name of the Spacemacs dump file. This is the file will be created by the
|
||||
;; portable dumper in the cache directory under dumps sub-directory.
|
||||
;; To load it when starting Emacs add the parameter `--dump-file'
|
||||
;; when invoking Emacs 27.1 executable on the command line, for instance:
|
||||
;; ./emacs --dump-file=$HOME/.emacs.d/.cache/dumps/spacemacs-27.1.pdmp
|
||||
;; (default spacemacs-27.1.pdmp)
|
||||
dotspacemacs-emacs-dumper-dump-file (format "spacemacs-%s.pdmp" emacs-version)
|
||||
|
||||
;; If non-nil ELPA repositories are contacted via HTTPS whenever it's
|
||||
;; possible. Set it to nil if you have no way to use HTTPS in your
|
||||
;; environment, otherwise it is strongly recommended to let it set to t.
|
||||
;; This variable has no effect if Emacs is launched with the parameter
|
||||
;; `--insecure' which forces the value of this variable to nil.
|
||||
;; (default t)
|
||||
dotspacemacs-elpa-https t
|
||||
|
||||
;; Maximum allowed time in seconds to contact an ELPA repository.
|
||||
;; (default 5)
|
||||
dotspacemacs-elpa-timeout 5
|
||||
|
||||
;; Set `gc-cons-threshold' and `gc-cons-percentage' when startup finishes.
|
||||
;; This is an advanced option and should not be changed unless you suspect
|
||||
;; performance issues due to garbage collection operations.
|
||||
;; (default '(100000000 0.1))
|
||||
dotspacemacs-gc-cons '(100000000 0.1)
|
||||
|
||||
;; Set `read-process-output-max' when startup finishes.
|
||||
;; This defines how much data is read from a foreign process.
|
||||
;; Setting this >= 1 MB should increase performance for lsp servers
|
||||
;; in emacs 27.
|
||||
;; (default (* 1024 1024))
|
||||
dotspacemacs-read-process-output-max (* 1024 1024)
|
||||
|
||||
;; If non-nil then Spacelpa repository is the primary source to install
|
||||
;; a locked version of packages. If nil then Spacemacs will install the
|
||||
;; latest version of packages from MELPA. (default nil)
|
||||
dotspacemacs-use-spacelpa nil
|
||||
|
||||
;; If non-nil then verify the signature for downloaded Spacelpa archives.
|
||||
;; (default t)
|
||||
dotspacemacs-verify-spacelpa-archives t
|
||||
|
||||
;; If non-nil then spacemacs will check for updates at startup
|
||||
;; when the current branch is not `develop'. Note that checking for
|
||||
;; new versions works via git commands, thus it calls GitHub services
|
||||
;; whenever you start Emacs. (default nil)
|
||||
dotspacemacs-check-for-update nil
|
||||
|
||||
;; If non-nil, a form that evaluates to a package directory. For example, to
|
||||
;; use different package directories for different Emacs versions, set this
|
||||
;; to `emacs-version'. (default 'emacs-version)
|
||||
dotspacemacs-elpa-subdirectory 'emacs-version
|
||||
|
||||
;; One of `vim', `emacs' or `hybrid'.
|
||||
;; `hybrid' is like `vim' except that `insert state' is replaced by the
|
||||
;; `hybrid state' with `emacs' key bindings. The value can also be a list
|
||||
;; with `:variables' keyword (similar to layers). Check the editing styles
|
||||
;; section of the documentation for details on available variables.
|
||||
;; (default 'vim)
|
||||
dotspacemacs-editing-style 'vim
|
||||
|
||||
;; If non-nil show the version string in the Spacemacs buffer. It will
|
||||
;; appear as (spacemacs version)@(emacs version)
|
||||
;; (default t)
|
||||
dotspacemacs-startup-buffer-show-version t
|
||||
|
||||
;; Specify the startup banner. Default value is `official', it displays
|
||||
;; the official spacemacs logo. An integer value is the index of text
|
||||
;; banner, `random' chooses a random text banner in `core/banners'
|
||||
;; directory. A string value must be a path to an image format supported
|
||||
;; by your Emacs build.
|
||||
;; If the value is nil then no banner is displayed. (default 'official)
|
||||
dotspacemacs-startup-banner 'official
|
||||
|
||||
;; List of items to show in startup buffer or an association list of
|
||||
;; the form `(list-type . list-size)`. If nil then it is disabled.
|
||||
;; Possible values for list-type are:
|
||||
;; `recents' `bookmarks' `projects' `agenda' `todos'.
|
||||
;; List sizes may be nil, in which case
|
||||
;; `spacemacs-buffer-startup-lists-length' takes effect.
|
||||
dotspacemacs-startup-lists '((bookmarks . 5)
|
||||
(recents . 5)
|
||||
(projects . 7))
|
||||
|
||||
;; True if the home buffer should respond to resize events. (default t)
|
||||
dotspacemacs-startup-buffer-responsive t
|
||||
|
||||
;; Default major mode for a new empty buffer. Possible values are mode
|
||||
;; names such as `text-mode'; and `nil' to use Fundamental mode.
|
||||
;; (default `text-mode')
|
||||
dotspacemacs-new-empty-buffer-major-mode 'text-mode
|
||||
|
||||
;; Default major mode of the scratch buffer (default `text-mode')
|
||||
dotspacemacs-scratch-mode 'org-mode
|
||||
|
||||
dotspacemacs-initial-scratch-message "#+STARTUP: showall\n\n* Scratch\n\nUse this buffer for quick, throwaway notes\n\n#+begin_src emacs-lisp\n\n#+end_src"
|
||||
|
||||
dotspacemacs-scratch-buffer-persistent t
|
||||
dotspacemacs-scratch-buffer-unkillable t
|
||||
|
||||
;; List of themes, the first of the list is loaded when spacemacs starts.
|
||||
;; Press `SPC T n' to cycle to the next theme in the list (works great
|
||||
;; with 2 themes variants, one dark and one light)
|
||||
dotspacemacs-themes
|
||||
'(doom-molokai
|
||||
doom-one
|
||||
base16-darktooth
|
||||
base16-monokai
|
||||
base16-tomorrow-night
|
||||
base16-dracula
|
||||
base16-nord
|
||||
base16-grayscale-dark
|
||||
base16-grayscale-light
|
||||
base16-materia
|
||||
base16-gruvbox-dark-hard
|
||||
base16-gruvbox-light-hard
|
||||
base16-outrun-dark
|
||||
base16-atelier-savanna
|
||||
base16-solarized-dark
|
||||
solarized-dark
|
||||
base16-solarized-light
|
||||
solarized-light
|
||||
poet)
|
||||
|
||||
;; Set the theme for the Spaceline. Supported themes are `spacemacs',
|
||||
;; `all-the-icons', `custom', `doom', `vim-powerline' and `vanilla'. The
|
||||
;; first three are spaceline themes. `doom' is the doom-emacs mode-line.
|
||||
;; `vanilla' is default Emacs mode-line. `custom' is a user defined themes,
|
||||
;; refer to the DOCUMENTATION.org for more info on how to create your own
|
||||
;; spaceline theme. Value can be a symbol or list with additional properties.
|
||||
;; (default '(spacemacs :separator wave :separator-scale 1.5))
|
||||
dotspacemacs-mode-line-theme '(spacemacs :separator arrow)
|
||||
|
||||
;; If non-nil the cursor color matches the state color in GUI Emacs.
|
||||
;; (default t)
|
||||
dotspacemacs-colorize-cursor-according-to-state t
|
||||
|
||||
;; Default font or prioritized list of fonts.
|
||||
dotspacemacs-default-font
|
||||
(let* ((height (display-pixel-height))
|
||||
(font-size
|
||||
(cond ((<= height 720) 12.0)
|
||||
((<= height 1080) 13.0)
|
||||
(t 14.0))))
|
||||
`(("Iosevka" :size ,font-size :weight light)
|
||||
("Fira Code" :size ,font-size)
|
||||
("Fira Mono" :size ,font-size)
|
||||
("Consolas" :size ,font-size)))
|
||||
|
||||
;; The leader key (default "SPC")
|
||||
dotspacemacs-leader-key "SPC"
|
||||
|
||||
;; The key used for Emacs commands `M-x' (after pressing on the leader key).
|
||||
;; (default "SPC")
|
||||
dotspacemacs-emacs-command-key "SPC"
|
||||
|
||||
;; The key used for Vim Ex commands (default ":")
|
||||
dotspacemacs-ex-command-key ":"
|
||||
|
||||
;; The leader key accessible in `emacs state' and `insert state'
|
||||
;; (default "M-m")
|
||||
dotspacemacs-emacs-leader-key "M-m"
|
||||
|
||||
;; Major mode leader key is a shortcut key which is the equivalent of
|
||||
;; pressing `<leader> m`. Set it to `nil` to disable it. (default ",")
|
||||
dotspacemacs-major-mode-leader-key ","
|
||||
|
||||
;; Major mode leader key accessible in `emacs state' and `insert state'.
|
||||
;; (default "C-M-m" for terminal mode, "<M-return>" for GUI mode).
|
||||
;; Thus M-RET should work as leader key in both GUI and terminal modes.
|
||||
;; C-M-m also should work in terminal mode, but not in GUI mode.
|
||||
dotspacemacs-major-mode-emacs-leader-key (if window-system "<M-return>" "C-M-m")
|
||||
|
||||
;; These variables control whether separate commands are bound in the GUI to
|
||||
;; the key pairs `C-i', `TAB' and `C-m', `RET'.
|
||||
;; Setting it to a non-nil value, allows for separate commands under `C-i'
|
||||
;; and TAB or `C-m' and `RET'.
|
||||
;; In the terminal, these pairs are generally indistinguishable, so this only
|
||||
;; works in the GUI. (default nil)
|
||||
dotspacemacs-distinguish-gui-tab nil
|
||||
|
||||
;; Name of the default layout (default "Default")
|
||||
dotspacemacs-default-layout-name "Default"
|
||||
|
||||
;; If non-nil the default layout name is displayed in the mode-line.
|
||||
;; (default nil)
|
||||
dotspacemacs-display-default-layout t
|
||||
|
||||
;; If non-nil then the last auto saved layouts are resumed automatically upon
|
||||
;; start. (default nil)
|
||||
dotspacemacs-auto-resume-layouts nil
|
||||
|
||||
;; If non-nil, auto-generate layout name when creating new layouts. Only has
|
||||
;; effect when using the "jump to layout by number" commands. (default nil)
|
||||
dotspacemacs-auto-generate-layout-names nil
|
||||
|
||||
;; Size (in MB) above which spacemacs will prompt to open the large file
|
||||
;; literally to avoid performance issues. Opening a file literally means that
|
||||
;; no major mode or minor modes are active. (default is 1)
|
||||
dotspacemacs-large-file-size 1
|
||||
|
||||
;; Location where to auto-save files. Possible values are `original' to
|
||||
;; auto-save the file in-place, `cache' to auto-save the file to another
|
||||
;; file stored in the cache directory and `nil' to disable auto-saving.
|
||||
;; (default 'cache)
|
||||
dotspacemacs-auto-save-file-location 'cache
|
||||
|
||||
;; Maximum number of rollback slots to keep in the cache. (default 5)
|
||||
dotspacemacs-max-rollback-slots 5
|
||||
|
||||
;; If non-nil, the paste transient-state is enabled. While enabled, after you
|
||||
;; paste something, pressing `C-j' and `C-k' several times cycles through the
|
||||
;; elements in the `kill-ring'. (default nil)
|
||||
dotspacemacs-enable-paste-transient-state nil
|
||||
|
||||
;; Which-key delay in seconds. The which-key buffer is the popup listing
|
||||
;; the commands bound to the current keystroke sequence. (default 0.4)
|
||||
dotspacemacs-which-key-delay 0.4
|
||||
|
||||
;; Which-key frame position. Possible values are `right', `bottom' and
|
||||
;; `right-then-bottom'. right-then-bottom tries to display the frame to the
|
||||
;; right; if there is insufficient space it displays it at the bottom.
|
||||
;; (default 'bottom)
|
||||
dotspacemacs-which-key-position 'bottom
|
||||
|
||||
;; Control where `switch-to-buffer' displays the buffer. If nil,
|
||||
;; `switch-to-buffer' displays the buffer in the current window even if
|
||||
;; another same-purpose window is available. If non-nil, `switch-to-buffer'
|
||||
;; displays the buffer in a same-purpose window even if the buffer can be
|
||||
;; displayed in the current window. (default nil)
|
||||
dotspacemacs-switch-to-buffer-prefers-purpose nil
|
||||
|
||||
;; If non-nil a progress bar is displayed when spacemacs is loading. This
|
||||
;; may increase the boot time on some systems and emacs builds, set it to
|
||||
;; nil to boost the loading time. (default t)
|
||||
dotspacemacs-loading-progress-bar t
|
||||
|
||||
;; If non-nil the frame is fullscreen when Emacs starts up. (default nil)
|
||||
;; (Emacs 24.4+ only)
|
||||
dotspacemacs-fullscreen-at-startup nil
|
||||
|
||||
;; If non-nil `spacemacs/toggle-fullscreen' will not use native fullscreen.
|
||||
;; Use to disable fullscreen animations in OSX. (default nil)
|
||||
dotspacemacs-fullscreen-use-non-native nil
|
||||
|
||||
;; If non-nil the frame is maximized when Emacs starts up.
|
||||
;; Takes effect only if `dotspacemacs-fullscreen-at-startup' is nil.
|
||||
;; (default nil) (Emacs 24.4+ only)
|
||||
dotspacemacs-maximized-at-startup nil
|
||||
|
||||
;; If non-nil the frame is undecorated when Emacs starts up. Combine this
|
||||
;; variable with `dotspacemacs-maximized-at-startup' in OSX to obtain
|
||||
;; borderless fullscreen. (default nil)
|
||||
dotspacemacs-undecorated-at-startup nil
|
||||
|
||||
;; A value from the range (0..100), in increasing opacity, which describes
|
||||
;; the transparency level of a frame when it's active or selected.
|
||||
;; Transparency can be toggled through `toggle-transparency'. (default 90)
|
||||
dotspacemacs-active-transparency 90
|
||||
|
||||
;; A value from the range (0..100), in increasing opacity, which describes
|
||||
;; the transparency level of a frame when it's inactive or deselected.
|
||||
;; Transparency can be toggled through `toggle-transparency'. (default 90)
|
||||
dotspacemacs-inactive-transparency 90
|
||||
|
||||
;; If non-nil show the titles of transient states. (default t)
|
||||
dotspacemacs-show-transient-state-title t
|
||||
|
||||
;; If non-nil show the color guide hint for transient state keys. (default t)
|
||||
dotspacemacs-show-transient-state-color-guide t
|
||||
|
||||
;; If non-nil unicode symbols are displayed in the mode line.
|
||||
;; If you use Emacs as a daemon and wants unicode characters only in GUI set
|
||||
;; the value to quoted `display-graphic-p'. (default t)
|
||||
dotspacemacs-mode-line-unicode-symbols t
|
||||
|
||||
;; If non-nil smooth scrolling (native-scrolling) is enabled. Smooth
|
||||
;; scrolling overrides the default behavior of Emacs which recenters point
|
||||
;; when it reaches the top or bottom of the screen. (default t)
|
||||
dotspacemacs-smooth-scrolling t
|
||||
|
||||
;; Control line numbers activation.
|
||||
;; If set to `t', `relative' or `visual' then line numbers are enabled in all
|
||||
;; `prog-mode' and `text-mode' derivatives. If set to `relative', line
|
||||
;; numbers are relative. If set to `visual', line numbers are also relative,
|
||||
;; but lines are only visual lines are counted. For example, folded lines
|
||||
;; will not be counted and wrapped lines are counted as multiple lines.
|
||||
;; This variable can also be set to a property list for finer control:
|
||||
;; '(:relative nil
|
||||
;; :visual nil
|
||||
;; :disabled-for-modes dired-mode
|
||||
;; doc-view-mode
|
||||
;; markdown-mode
|
||||
;; org-mode
|
||||
;; pdf-view-mode
|
||||
;; text-mode
|
||||
;; :size-limit-kb 1000)
|
||||
;; When used in a plist, `visual' takes precedence over `relative'.
|
||||
;; (default nil)
|
||||
dotspacemacs-line-numbers t
|
||||
|
||||
;; Code folding method. Possible values are `evil' and `origami'.
|
||||
;; (default 'evil)
|
||||
dotspacemacs-folding-method 'evil
|
||||
|
||||
;; If non-nil `smartparens-strict-mode' will be enabled in programming modes.
|
||||
;; (default nil)
|
||||
dotspacemacs-smartparens-strict-mode nil
|
||||
|
||||
;; If non-nil pressing the closing parenthesis `)' key in insert mode passes
|
||||
;; over any automatically added closing parenthesis, bracket, quote, etc...
|
||||
;; This can be temporary disabled by pressing `C-q' before `)'. (default nil)
|
||||
dotspacemacs-smart-closing-parenthesis t
|
||||
|
||||
;; Select a scope to highlight delimiters. Possible values are `any',
|
||||
;; `current', `all' or `nil'. Default is `all' (highlight any scope and
|
||||
;; emphasis the current one). (default 'all)
|
||||
dotspacemacs-highlight-delimiters 'all
|
||||
|
||||
;; If non-nil, start an Emacs server if one is not already running.
|
||||
;; (default nil)
|
||||
dotspacemacs-enable-server t
|
||||
|
||||
;; Set the emacs server socket location.
|
||||
;; If nil, uses whatever the Emacs default is, otherwise a directory path
|
||||
;; like \"~/.emacs.d/server\". It has no effect if
|
||||
;; `dotspacemacs-enable-server' is nil.
|
||||
;; (default nil)
|
||||
dotspacemacs-server-socket-dir nil
|
||||
|
||||
;; If non-nil, advise quit functions to keep server open when quitting.
|
||||
;; (default nil)
|
||||
dotspacemacs-persistent-server nil
|
||||
|
||||
;; List of search tool executable names. Spacemacs uses the first installed
|
||||
;; tool of the list. Supported tools are `rg', `ag', `pt', `ack' and `grep'.
|
||||
;; (default '("rg" "ag" "pt" "ack" "grep"))
|
||||
dotspacemacs-search-tools '("rg" "ag" "pt" "ack" "grep")
|
||||
|
||||
;; Format specification for setting the frame title.
|
||||
;; %a - the `abbreviated-file-name', or `buffer-name'
|
||||
;; %t - `projectile-project-name'
|
||||
;; %I - `invocation-name'
|
||||
;; %S - `system-name'
|
||||
;; %U - contents of $USER
|
||||
;; %b - buffer name
|
||||
;; %f - visited file name
|
||||
;; %F - frame name
|
||||
;; %s - process status
|
||||
;; %p - percent of buffer above top of window, or Top, Bot or All
|
||||
;; %P - percent of buffer above bottom of window, perhaps plus Top, or Bot or All
|
||||
;; %m - mode name
|
||||
;; %n - Narrow if appropriate
|
||||
;; %z - mnemonics of buffer, terminal, and keyboard coding systems
|
||||
;; %Z - like %z, but including the end-of-line format
|
||||
;; (default "%I@%S")
|
||||
dotspacemacs-frame-title-format "%I@%S"
|
||||
|
||||
;; Format specification for setting the icon title format
|
||||
;; (default nil - same as frame-title-format)
|
||||
dotspacemacs-icon-title-format nil
|
||||
|
||||
;; Delete whitespace while saving buffer. Possible values are `all'
|
||||
;; to aggressively delete empty line and long sequences of whitespace,
|
||||
;; `trailing' to delete only the whitespace at end of lines, `changed' to
|
||||
;; delete only whitespace for changed lines or `nil' to disable cleanup.
|
||||
;; (default nil)
|
||||
dotspacemacs-whitespace-cleanup 'changed
|
||||
|
||||
;; If non nil activate `clean-aindent-mode' which tries to correct
|
||||
;; virtual indentation of simple modes. This can interfer with mode specific
|
||||
;; indent handling like has been reported for `go-mode'.
|
||||
;; If it does deactivate it here.
|
||||
;; (default t)
|
||||
dotspacemacs-use-clean-aindent-mode t
|
||||
|
||||
;; If non-nil shift your number row to match the entered keyboard layout
|
||||
;; (only in insert state). Currently supported keyboard layouts are:
|
||||
;; `qwerty-us', `qwertz-de' and `querty-ca-fr'.
|
||||
;; New layouts can be added in `spacemacs-editing' layer.
|
||||
;; (default nil)
|
||||
dotspacemacs-swap-number-row nil
|
||||
|
||||
;; Either nil or a number of seconds. If non-nil zone out after the specified
|
||||
;; number of seconds. (default nil)
|
||||
dotspacemacs-zone-out-when-idle nil
|
||||
|
||||
;; Run `spacemacs/prettify-org-buffer' when
|
||||
;; visiting README.org files of Spacemacs.
|
||||
;; (default nil)
|
||||
dotspacemacs-pretty-docs nil
|
||||
|
||||
;; If nil the home buffer shows the full path of agenda items
|
||||
;; and todos. If non nil only the file name is shown.
|
||||
dotspacemacs-home-shorten-agenda-source nil
|
||||
|
||||
vim-style-visual-feedback t))
|
||||
|
||||
(defun dotspacemacs/user-env ()
|
||||
"Environment variables setup.
|
||||
This function defines the environment variables for your Emacs session. By
|
||||
default it calls `spacemacs/load-spacemacs-env' which loads the environment
|
||||
variables declared in `~/.spacemacs.env' or `~/.spacemacs.d/.spacemacs.env'.
|
||||
See the header of this file for more information."
|
||||
(spacemacs/load-spacemacs-env))
|
||||
|
||||
(defun dotspacemacs/user-init ()
|
||||
"Initialization for user code:
|
||||
This function is called immediately after `dotspacemacs/init', before layer
|
||||
configuration.
|
||||
It is mostly for variables that should be set before packages are loaded.
|
||||
If you are unsure, try setting them in `dotspacemacs/user-config' first."
|
||||
(setq jc/dotfiles-dir (expand-file-name ".config/dotfiles" user-home-directory)
|
||||
jc/notes-dir (expand-file-name "Notes" user-home-directory)
|
||||
org-roam-directory (expand-file-name "Roam" jc/notes-dir)
|
||||
|
||||
configuration-layer-elpa-archives '(("melpa" . "melpa.org/packages/")
|
||||
("org" . "orgmode.org/elpa/")
|
||||
("gnu" . "elpa.gnu.org/packages/"))
|
||||
spacemacs-private-directory (expand-file-name ".spacemacs.d/private/" user-home-directory))
|
||||
(make-directory spacemacs-private-directory t)
|
||||
|
||||
(when (equal (system-name) "WXLT203936")
|
||||
(setq url-proxy-services '(("no_proxy" . "bl\\.uk")
|
||||
("http" . "public-cache.bl.uk:3128")
|
||||
("https" . "public-cache.bl.uk:3128"))
|
||||
|
||||
spell-checking-enable-by-default nil
|
||||
|
||||
jc/notes-dir "f:/Notes"))
|
||||
)
|
||||
|
||||
(defun dotspacemacs/user-load ()
|
||||
"Library to load while dumping.
|
||||
This function is called only while dumping Spacemacs configuration. You can
|
||||
`require' or `load' the libraries of your choice that will be included in the
|
||||
dump."
|
||||
)
|
||||
|
||||
(defun dotspacemacs/user-config ()
|
||||
"Configuration for user code:
|
||||
This function is called at the very end of Spacemacs startup, after layer
|
||||
configuration.
|
||||
Put your configuration code here, except for variables that should be set
|
||||
before packages are loaded."
|
||||
|
||||
;;; Web browsing ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
(setq browse-url-browser-function #'eww-browse-url
|
||||
browse-url-generic-program "xdg-open")
|
||||
|
||||
;;; org-mode ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
(require 'org-protocol)
|
||||
|
||||
(setq org-directory jc/notes-dir
|
||||
jc/logbook-file (f-expand "logbook.org" jc/notes-dir))
|
||||
|
||||
(with-eval-after-load 'projectile
|
||||
(add-to-list 'projectile-globally-ignored-directories ".sync"))
|
||||
|
||||
(add-hook 'focus-out-hook (lambda () (evil-write-all nil)))
|
||||
|
||||
(add-hook 'markdown-mode-hook
|
||||
(lambda ()
|
||||
(local-set-key (kbd "<C-return>") 'markdown-insert-list-item)))
|
||||
(add-hook 'org-mode-hook 'org-indent-mode)
|
||||
(add-to-list 'auto-mode-alist '("\\.org_archive\\'" . org-mode))
|
||||
|
||||
(setq jc/agenda-file-home (f-expand "Todo/todo-home.org" jc/notes-dir)
|
||||
jc/agenda-file-work (f-expand "Todo/todo-work.org" jc/notes-dir)
|
||||
|
||||
org-archive-location "%s_archive::datetree/"
|
||||
jc/agenda-file-home-archive (concat jc/agenda-file-home "_archive")
|
||||
jc/agenda-file-work-archive (concat jc/agenda-file-work "_archive")
|
||||
|
||||
jc/agenda-files-all (list jc/agenda-file-work jc/agenda-file-home)
|
||||
org-agenda-files jc/agenda-files-all
|
||||
|
||||
org-refile-targets `((,jc/agenda-files-all . (:maxlevel . 3))
|
||||
(nil . (:maxlevel . 3)))
|
||||
org-refile-use-outline-path nil
|
||||
|
||||
org-capture-templates
|
||||
`(("t" "Task" entry
|
||||
(file "/home/jez/Notes/Todo/inbox.org")
|
||||
"* TODO %?")
|
||||
("n" "Note" entry
|
||||
(file "/home/jez/Notes/Todo/inbox.org")
|
||||
"* %?"))
|
||||
|
||||
org-enforce-todo-dependencies t
|
||||
org-agenda-dim-blocked-tasks t
|
||||
org-tags-exclude-from-inheritance '("track" "project")
|
||||
|
||||
org-id-track-globally t
|
||||
org-id-link-to-org-use-id t
|
||||
|
||||
org-superstar-headline-bullets-list '("◉" "○" "●" "⋄" "►")
|
||||
org-superstar-item-bullet-alist '((?- . ?•)
|
||||
(?+ . ?▪)
|
||||
(?* . ?★))
|
||||
|
||||
org-super-agenda-groups
|
||||
'((:name "Future"
|
||||
:and (:todo t :scheduled future)
|
||||
:order 6)
|
||||
(:name "Active projects"
|
||||
:and (:todo t :children ("TODO" "COOL" "WARM" "HOT" "DOING"))
|
||||
:order 15)
|
||||
(:name "Waiting projects"
|
||||
:and (:todo t :children ("WAITING" "DELEGATED"))
|
||||
:order 14)
|
||||
(:name "On-hold projcts"
|
||||
:and (:todo t :children ("ONHOLD"))
|
||||
:todo "ONHOLD"
|
||||
:order 14)
|
||||
(:name "Stuck projects"
|
||||
:tag "project"
|
||||
:and (:todo t :children t)
|
||||
:order 13)
|
||||
(:name "Overdue"
|
||||
:and (:todo t :deadline past)
|
||||
:face (:foreground "red"))
|
||||
(:name "Due today"
|
||||
:and (:todo t :deadline today)
|
||||
:face (:foreground "orange"))
|
||||
(:name "Due tomorrow"
|
||||
:and (:todo t :deadline +2))
|
||||
(:name "Blocked"
|
||||
:and (:todo t :pred jc/agenda-line-blocked-p)
|
||||
:order 8)
|
||||
(:name "Doing (2)"
|
||||
:todo "DOING")
|
||||
(:name "Hot (3)"
|
||||
:todo "HOT")
|
||||
(:name "Warm (5)"
|
||||
:todo "WARM")
|
||||
(:name "Cool (8)"
|
||||
:todo "COOL")
|
||||
(:name "Backlog"
|
||||
:todo "TODO"
|
||||
:order 1)
|
||||
(:name "Waiting"
|
||||
:todo "WAITING"
|
||||
:order 2)
|
||||
(:name "Delegated"
|
||||
:todo "DELEGATED"
|
||||
:order 4)
|
||||
(:name "On hold"
|
||||
:todo "ONHOLD"
|
||||
:order 4))
|
||||
|
||||
org-ql-views
|
||||
`(("Working: Contexts"
|
||||
:title "Tasks by context"
|
||||
:buffers-files org-agenda-files
|
||||
:query (and (not (or (done) (todo "ONHOLD" "WAITING" "DELEGATED")) )
|
||||
(not (scheduled :from tomorrow))
|
||||
(tags "email" "phone" "online"))
|
||||
:sort todo
|
||||
:super-groups ((:auto-tags t)))
|
||||
("Working: Kanban"
|
||||
:title "Kanban"
|
||||
:buffers-files org-agenda-files
|
||||
:query (and (todo "DOING" "HOT" "WARM" "COOL" "TODO")
|
||||
(not (or (scheduled :from tomorrow)
|
||||
(property "Project" "t")
|
||||
(children))))
|
||||
:super-groups org-super-agenda-groups)
|
||||
("Working: Focus"
|
||||
:title "Focus"
|
||||
:buffers-files org-agenda-files
|
||||
:query (and (todo "DOING" "HOT")
|
||||
(not (or (scheduled :from tomorrow)
|
||||
(property "Project" "t")
|
||||
(children))))
|
||||
:super-groups org-super-agenda-groups)
|
||||
("Working: People agendas"
|
||||
:title "Agendas"
|
||||
:buffers-files org-agenda-files
|
||||
:query (and (todo "DELEGATED" "WAITING" "DISCUSS")
|
||||
(tags "BM" "RK" "TR"))
|
||||
:super-groups ((:auto-tags t)))
|
||||
("Process: Inbox"
|
||||
:buffers-files ,(f-expand "Todo/inbox.org" jc/notes-dir))
|
||||
("Review: Recently closed"
|
||||
:title "Closed in the last 2 weeks"
|
||||
:buffers-files ,(list jc/agenda-file-work jc/agenda-file-work-archive)
|
||||
:query (closed :from -14)
|
||||
:super-groups ((:auto-ts t)))
|
||||
("Review: Stuck projects"
|
||||
:buffers-files org-agenda-files
|
||||
:query (and (todo)
|
||||
(or (tags "project")
|
||||
(children))
|
||||
(not (children (not (done))))))
|
||||
("Review: Strategic areas"
|
||||
:buffers-files org-agenda-files
|
||||
:query (property "Track")
|
||||
:super-groups ((:name "Progressing"
|
||||
:order 5
|
||||
:children ("TODO" "COOL" "WARM" "HOT" "DOING"))
|
||||
(:name "Discussion needed"
|
||||
:order 4
|
||||
:children ("DISCUSS"))
|
||||
(:name "Waiting"
|
||||
:order 10
|
||||
:children ("WAITING" "DELEGATED"))
|
||||
(:name "On hold"
|
||||
:order 10
|
||||
:children ("ONHOLD"))
|
||||
(:name "Stalled"
|
||||
:order 0
|
||||
:anything t)))))
|
||||
|
||||
;;; org-roam ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
(setq org-roam-db-update-method 'immediate
|
||||
org-roam-tag-sources '(prop first-directory)
|
||||
|
||||
org-roam-dailies-directory "daily/"
|
||||
org-roam-dailies-capture-templates
|
||||
'(("w" "work" entry
|
||||
#'org-roam-capture--get-point
|
||||
"* %?"
|
||||
:file-name "daily/work/%<%Y/%m/%Y-%m-%d>"
|
||||
:head "#+title: Work notes: %<%a %d %b %Y>\n\n")
|
||||
("h" "home" entry
|
||||
#'org-roam-capture--get-point
|
||||
"* %?"
|
||||
:file-name "daily/home/%<%Y/%m/%Y-%m-%d>"
|
||||
:head "#+title: Home notes: %<%a %d %b %Y>\n\n"))
|
||||
|
||||
org-roam-graph-exclude-matcher "daily/"
|
||||
org-roam-graph-extra-config '(("rankdir" . "LR")
|
||||
("concentrate" . "true"))
|
||||
org-roam-graph-edge-extra-config '(("dir" . "none")))
|
||||
|
||||
(add-to-list 'org-capture-templates
|
||||
`("e" "Exercise log entry" entry
|
||||
(file+olp+datetree ,(f-expand "exercise-log.org" org-roam-directory))
|
||||
"* %?")
|
||||
t)
|
||||
|
||||
(unless (f-exists? org-roam-directory)
|
||||
(f-mkdir org-roam-directory))
|
||||
|
||||
(org-roam-mode 1)
|
||||
(require 'org-roam-protocol)
|
||||
|
||||
(defun jc/search-org-roam () "search org-roam with ripgrep"
|
||||
(interactive)
|
||||
(counsel-rg nil org-roam-directory
|
||||
"" "org-roam search: "))
|
||||
|
||||
(spacemacs/set-leader-keys
|
||||
"jr" #'org-roam-find-file
|
||||
"jR" #'jc/search-org-roam
|
||||
"aors" #'jc/search-org-roam
|
||||
|
||||
"aordt" #'org-roam-dailies-find-today
|
||||
"aordy" #'org-roam-dailies-find-yesterday
|
||||
"aordT" #'org-roam-dailies-find-tomorrow
|
||||
"aordd" #'org-roam-dailies-find-date)
|
||||
|
||||
(spacemacs/set-leader-keys-for-major-mode 'org-mode
|
||||
"TAB" 'org-cycle-agenda-files)
|
||||
|
||||
(define-minor-mode writing-mode
|
||||
"Preferred writing setup"
|
||||
:lighter " wr"
|
||||
|
||||
(if writing-mode
|
||||
(writing-mode-on)
|
||||
(writing-mode-off)))
|
||||
|
||||
(defun writing-mode-on ()
|
||||
(text-scale-set 2)
|
||||
(writeroom-mode 1)
|
||||
(display-line-numbers-mode 0)
|
||||
(focus-mode 1)
|
||||
(centered-cursor-mode 1))
|
||||
|
||||
(defun writing-mode-off ()
|
||||
(text-scale-set 0)
|
||||
(writeroom-mode 0)
|
||||
(display-line-numbers-mode 1)
|
||||
(focus-mode 0)
|
||||
(centered-cursor-mode 0))
|
||||
|
||||
(setq focus-mode-to-thing '((prog-mode . defun)
|
||||
(text-mode . paragraph)))
|
||||
(spacemacs/set-leader-keys
|
||||
"t C-f" #'focus-mode
|
||||
"t R" #'writing-mode)
|
||||
|
||||
(spacemacs/toggle-visual-line-navigation-globally-on)
|
||||
|
||||
(defun jc/fix-python-date (str)
|
||||
(replace-regexp-in-string "\\([+-][0-9][0-9]\\)\\([0-9][0-9]\\)"
|
||||
"\\1:\\2"
|
||||
str))
|
||||
|
||||
(defun jc/update-post-date ()
|
||||
(interactive)
|
||||
(save-mark-and-excursion
|
||||
(goto-char (point-min))
|
||||
(re-search-forward "^date: ")
|
||||
(kill-line)
|
||||
(insert (jc/fix-python-date (format-time-string "%FT%T%z")))))
|
||||
|
||||
(add-hook 'org-mode-hook #'org-indent-mode)
|
||||
|
||||
(defun jc/agenda-line-blocked-p (item)
|
||||
(get-text-property 0 'org-todo-blocked item))
|
||||
|
||||
(spacemacs/declare-prefix "o" "custom")
|
||||
|
||||
(defmacro jc/org-ql-view-command (name)
|
||||
`(lambda () (interactive)
|
||||
(org-ql-view ,name)))
|
||||
(defmacro jc/org-todo-list-with-file-command (filename)
|
||||
`(lambda () (interactive)
|
||||
(let ((org-agenda-files (list ,filename)))
|
||||
(org-todo-list))))
|
||||
(defalias 'jc/describe-leader-key 'spacemacs/declare-prefix)
|
||||
|
||||
(spacemacs/declare-prefix "ot" "Todo lists")
|
||||
(spacemacs/declare-prefix "oc" "Capture")
|
||||
(spacemacs/set-leader-keys
|
||||
"occ" #'org-capture
|
||||
"oct" #'org-roam-dailies-capture-today
|
||||
"ocy" #'org-roam-dailies-capture-yesterday
|
||||
"ocd" #'org-roam-dailies-capture-date
|
||||
|
||||
"ott" #'org-todo-list
|
||||
"otw" (jc/org-todo-list-with-file-command jc/agenda-file-work)
|
||||
"oth" (jc/org-todo-list-with-file-command jc/agenda-file-home)
|
||||
"otq" #'org-ql-view
|
||||
"otk" (jc/org-ql-view-command "Working: Kanban")
|
||||
"otf" (jc/org-ql-view-command "Working: Focus")
|
||||
|
||||
"&" 'async-shell-command)
|
||||
(jc/describe-leader-key "ott" "current todo list")
|
||||
(jc/describe-leader-key "otw" "work todo list")
|
||||
(jc/describe-leader-key "oth" "home todo list")
|
||||
(jc/describe-leader-key "otk" "kanban view")
|
||||
(jc/describe-leader-key "otf" "focus view")
|
||||
|
||||
|
||||
(direnv-mode 1)
|
||||
|
||||
;; Fix git-gutter+ errors with tramp incompatibility
|
||||
(with-eval-after-load 'git-gutter+
|
||||
(defun git-gutter+-remote-default-directory (dir file)
|
||||
(let* ((vec (tramp-dissect-file-name file))
|
||||
(method (tramp-file-name-method vec))
|
||||
(user (tramp-file-name-user vec))
|
||||
(domain (tramp-file-name-domain vec))
|
||||
(host (tramp-file-name-host vec))
|
||||
(port (tramp-file-name-port vec)))
|
||||
(tramp-make-tramp-file-name method user domain host port dir)))
|
||||
|
||||
(defun git-gutter+-remote-file-path (dir file)
|
||||
(let ((file (tramp-file-name-localname (tramp-dissect-file-name file))))
|
||||
(replace-regexp-in-string (concat "\\`" dir) "" file))))
|
||||
|
||||
(evil-set-initial-state 'org-brain-visualize-mode 'emacs)
|
||||
(add-hook 'org-capture-mode-hook 'evil-insert-state t)
|
||||
|
||||
(add-to-list 'auto-mode-alist '("\\.tmpl\\'" . web-mode))
|
||||
(setq web-mode-enable-engine-detection t)
|
||||
|
||||
(add-to-list 'auto-mode-alist '("Pipfile\\'" . toml-mode))
|
||||
|
||||
(spacemacs/toggle-highlight-current-line-globally-off)
|
||||
|
||||
;;; EWW (text-based web browser) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
(spacemacs/set-leader-keys
|
||||
"arw" #'eww
|
||||
"sw" #'eww-search-words)
|
||||
|
||||
;;; pocket-reader.el ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
(spacemacs/set-leader-keys
|
||||
"arp" #'pocket-reader)
|
||||
(with-eval-after-load 'elfeed
|
||||
(require 'pocket-reader)
|
||||
(bind-key (kbd "B") #'pocket-reader-elfeed-search-add-link elfeed-search-mode-map)
|
||||
(bind-key (kbd "B") #'pocket-reader-elfeed-entry-add-link elfeed-show-mode-map))
|
||||
|
||||
;;; Elpher (gopher/gemini client) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||
(spacemacs/set-leader-keys
|
||||
"arg" #'elpher)
|
||||
)
|
||||
|
||||
(defun dotspacemacs/emacs-custom-settings ()
|
||||
"Emacs custom settings.
|
||||
This is an auto-generated function, do not modify its content directly, use
|
||||
Emacs customize menu instead.
|
||||
This function is called at the very end of Spacemacs initialization."
|
||||
(setq custom-file (f-expand "custom.el" spacemacs-private-directory))
|
||||
(unless (f-file? custom-file)
|
||||
(f-touch custom-file))
|
||||
(load custom-file)
|
||||
)
|
||||
|
|
@ -1 +0,0 @@
|
|||
/custom.el
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
# Private directory
|
||||
|
||||
The content of this directory is ignored by Git. This is the default place
|
||||
where to store your private configuration layers.
|
||||
|
||||
To create a new configuration layer:
|
||||
|
||||
SPC SPC configuration-layer/create-layer RET
|
||||
|
||||
Then enter the name of your configuration in the prompt.
|
||||
|
||||
A directory named after the created configuration layer will be created here
|
||||
along with template files within it (packages.el and extensions.el, more info
|
||||
on the meaning of those files can be found in the [documentation][conf_layers]).
|
||||
|
||||
Each created file has further guidance written in them.
|
||||
|
||||
Once the configuration is done, restart Emacs to load, install and configure
|
||||
your layer.
|
||||
|
||||
[conf_layers]: https://github.com/syl20bnr/spacemacs/blob/master/doc/DOCUMENTATION.org#extensions-and-packages
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
# Private directory for local packages
|
||||
|
||||
The content of this directory is ignored by Git.
|
||||
|
||||
This is the place to store the local packages that you define in
|
||||
the `dotspacemacs-additional-packages` variable of your dotfile.
|
||||
|
|
@ -1 +0,0 @@
|
|||
(configuration-layer/declare-layer 'org)
|
||||
|
|
@ -1,75 +0,0 @@
|
|||
;;; packages.el --- org-agendas layer packages file for Spacemacs.
|
||||
;;
|
||||
;; Copyright (c) 2012-2018 Sylvain Benner & Contributors
|
||||
;;
|
||||
;; Author: Jez Cope <jez@erwin>
|
||||
;; URL: https://github.com/syl20bnr/spacemacs
|
||||
;;
|
||||
;; This file is not part of GNU Emacs.
|
||||
;;
|
||||
;;; License: GPLv3
|
||||
|
||||
;;; Commentary:
|
||||
|
||||
;; See the Spacemacs documentation and FAQs for instructions on how to implement
|
||||
;; a new layer:
|
||||
;;
|
||||
;; SPC h SPC layers RET
|
||||
;;
|
||||
;;
|
||||
;; Briefly, each package to be installed or configured by this layer should be
|
||||
;; added to `org-agendas-packages'. Then, for each package PACKAGE:
|
||||
;;
|
||||
;; - If PACKAGE is not referenced by any other Spacemacs layer, define a
|
||||
;; function `org-agendas/init-PACKAGE' to load and initialize the package.
|
||||
|
||||
;; - Otherwise, PACKAGE is already referenced by another Spacemacs layer, so
|
||||
;; define the functions `org-agendas/pre-init-PACKAGE' and/or
|
||||
;; `org-agendas/post-init-PACKAGE' to customize the package as it is loaded.
|
||||
|
||||
;;; Code:
|
||||
|
||||
(defconst org-agendas-packages
|
||||
'(org-ql org-super-agenda org-sidebar)
|
||||
"The list of Lisp packages required by the org-agendas layer.
|
||||
|
||||
Each entry is either:
|
||||
|
||||
1. A symbol, which is interpreted as a package to be installed, or
|
||||
|
||||
2. A list of the form (PACKAGE KEYS...), where PACKAGE is the
|
||||
name of the package to be installed or loaded, and KEYS are
|
||||
any number of keyword-value-pairs.
|
||||
|
||||
The following keys are accepted:
|
||||
|
||||
- :excluded (t or nil): Prevent the package from being loaded
|
||||
if value is non-nil
|
||||
|
||||
- :location: Specify a custom installation location.
|
||||
The following values are legal:
|
||||
|
||||
- The symbol `elpa' (default) means PACKAGE will be
|
||||
installed using the Emacs package manager.
|
||||
|
||||
- The symbol `local' directs Spacemacs to load the file at
|
||||
`./local/PACKAGE/PACKAGE.el'
|
||||
|
||||
- A list beginning with the symbol `recipe' is a melpa
|
||||
recipe. See: https://github.com/milkypostman/melpa#recipe-format")
|
||||
|
||||
(defun org-agendas/init-org-ql ()
|
||||
(use-package org-ql
|
||||
:defer t))
|
||||
|
||||
(defun org-agendas/init-org-super-agenda ()
|
||||
(use-package org-super-agenda
|
||||
:defer t
|
||||
:init (with-eval-after-load 'org-agenda
|
||||
(org-super-agenda-mode 1))))
|
||||
|
||||
(defun org-agendas/init-org-sidebar ()
|
||||
(use-package org-sidebar
|
||||
:defer t))
|
||||
|
||||
;;; packages.el ends here
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
# Private directory for Yatemplate templates
|
||||
|
||||
The content of this directory is ignored by Git. This is the default place
|
||||
where to store your private templates.
|
||||
|
||||
This path will be loaded automatically and used whenever Yatemplate loads.
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
[Unit]
|
||||
Description=Start gpg-agent
|
||||
|
||||
[Service]
|
||||
Type=forking
|
||||
ExecStart=/usr/bin/gpg-agent --daemon --enable-ssh-support --write-env-file=<%= @box_homedir %>/.gnupg/gpg-agent.env
|
||||
|
||||
[Install]
|
||||
WantedBy=default.target
|
||||
|
|
@ -1,123 +0,0 @@
|
|||
# Make $path array ignore non-unique elements
|
||||
typeset -U path
|
||||
|
||||
PLATFORM=`uname -s`
|
||||
|
||||
# Set up environment for nix
|
||||
[[ -r /etc/profile.d/nix.sh ]] && source /etc/profile.d/nix.sh
|
||||
[[ -r ~/.nix-profile/etc/profile.d/nix.sh ]] && source ~/.nix-profile/etc/profile.d/nix.sh
|
||||
source ~/.nix-profile/etc/profile.d/hm-session-vars.sh
|
||||
export NIX_PATH=$HOME/.nix-defexpr/channels${NIX_PATH:+:}$NIX_PATH
|
||||
|
||||
export HTML_TIDY=~/.htmltidy.conf
|
||||
|
||||
# Exclude some gems from being installed on non-Mac systems
|
||||
BUNDLE_WITHOUT=darwin_only
|
||||
|
||||
export WORKON_HOME=$HOME/.virtualenvs
|
||||
export PROJECT_HOME=$HOME/Projects
|
||||
export VIRTUALENVWRAPPER_PYTHON=/usr/bin/python
|
||||
|
||||
export RSYNC_PARTIAL_DIR=.rsync-partial
|
||||
|
||||
if [[ -z ${SSH_CONNECTION} ]]; then
|
||||
# Don't clobber forwarded SSH agent stuff
|
||||
local GPG_ENV=~/.gnupg/gpg-agent.env
|
||||
if [[ -s ${GPG_ENV} ]]; then
|
||||
# GnuPG version 2.0
|
||||
. ${GPG_ENV} > /dev/null
|
||||
export GPG_AGENT_INFO
|
||||
export SSH_AUTH_SOCK
|
||||
export SSH_AGENT_PID
|
||||
else
|
||||
# GnuPG version 2.1+
|
||||
# if gpgconf --list-dirs | grep agent-ssh-socket > /dev/null; then
|
||||
case $(gpgconf --list-dirs) in
|
||||
*agent-ssh-socket*)
|
||||
export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket) ;;
|
||||
*)
|
||||
export SSH_AUTH_SOCK=~/.gnupg/S.gpg-agent.ssh ;;
|
||||
esac
|
||||
fi
|
||||
export GPG_TTY=$(tty)
|
||||
echo "UPDATESTARTUPTTY" | gpg-connect-agent > /dev/null 2>&1
|
||||
fi
|
||||
|
||||
# Source local rvm config
|
||||
if [[ -s "$HOME/.rvmrc" ]]; then
|
||||
source "$HOME/.rvmrc"
|
||||
fi
|
||||
|
||||
# Try some common options for rvm location
|
||||
if [[ -z "$rvm_path" ]]; then
|
||||
if [[ -s "/usr/local/rvm/scripts/rvm" ]]; then
|
||||
rvm_path=/usr/local/rvm
|
||||
elif [[ -s "$HOME/.rvm/scripts/rvm" ]]; then
|
||||
rvm_path=$HOME/.rvm
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ -n "$EMACS" ]]; then # If we're running a terminal inside emacs
|
||||
export EDITOR=$(which emacsclient)
|
||||
else
|
||||
export EDITOR="$(which emacsclient) -t"
|
||||
export ALTERNATE_EDITOR=$(which vim)
|
||||
fi
|
||||
|
||||
# Platform specific config
|
||||
if [[ $PLATFORM = 'Darwin' ]]; then
|
||||
manpath=(/opt/local/share/man $manpath)
|
||||
|
||||
export GOPATH=~/Library/Go
|
||||
export BUNDLE_WITHOUT=
|
||||
elif [[ $PLATFORM = 'Linux' ]]; then
|
||||
whence pacman-color > /dev/null && alias -g pacman=pacman-color
|
||||
|
||||
export GOPATH=~/.go
|
||||
fi
|
||||
|
||||
# Polybar config variables
|
||||
export PB_MAIN_MONITOR=DP1
|
||||
export PB_WIFI_IFACE=wlan0
|
||||
|
||||
# Host specific config
|
||||
case $(hostname) in
|
||||
arianrhod)
|
||||
export PB_MAIN_MONITOR=eDP1
|
||||
export PB_WIFI_IFACE=wlp2s0
|
||||
;;
|
||||
erwin)
|
||||
export PB_MAIN_MONITOR=DisplayPort-0
|
||||
export PB_WIFI_IFACE=wifi1
|
||||
;;
|
||||
|
||||
WXLT203936)
|
||||
export http_proxy="http://public-cache.bl.uk:3128/"
|
||||
export https_proxy="${http_proxy}"
|
||||
;;
|
||||
esac
|
||||
|
||||
# Password manager
|
||||
export PASSWORD_STORE_DIR="$REFERENCE_DIR/Passwords"
|
||||
export PASSWORD_STORE_KEY=9E42CE071C4559D1
|
||||
|
||||
# Fix glibc locales for nix packages
|
||||
# See https://gist.github.com/peti/2c818d6cb49b0b0f2fd7c300f8386bc3 for details
|
||||
export LOCALE_ARCHIVE_2_27=$(nix-build --no-out-link "<nixpkgs>" -A glibcLocales)/lib/locale/locale-archive
|
||||
export LOCALE_ARCHIVE_2_11=/usr/lib/locale/locale-archive
|
||||
|
||||
# Non-version-tracked config
|
||||
if [[ -s "$HOME/.zshenv.local" ]]; then
|
||||
source "$HOME/.zshenv.local"
|
||||
fi
|
||||
|
||||
# Create $GOPATH if it doesn't exist
|
||||
mkdir -p $GOPATH
|
||||
|
||||
if ! setopt | grep login >/dev/null; then
|
||||
source ~/.zshenv.path
|
||||
fi
|
||||
|
||||
# Local Variables:
|
||||
# mode: sh
|
||||
# End:
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
path=($HOME/.local/bin $HOME/bin $HOME/bin/shared $path)
|
||||
|
||||
# Source rvm if it seems to be installed (i.e. $rvm_path set)
|
||||
if [[ -n "$rvm_path" ]]; then
|
||||
source "$rvm_path/scripts/rvm" # This loads RVM into a shell session.
|
||||
PATH=$PATH:$rvm_path/bin # Add RVM to PATH for scripting
|
||||
fi
|
||||
|
||||
# Set up virtualenvwrapper
|
||||
if which virtualenvwrapper.sh > /dev/null; then
|
||||
source virtualenvwrapper.sh
|
||||
fi
|
||||
|
||||
# Go path
|
||||
path=($GOPATH/bin $path)
|
||||
|
||||
export PATH
|
||||
|
||||
# Local Variables:
|
||||
# mode: sh
|
||||
# End:
|
||||
|
|
@ -1,89 +0,0 @@
|
|||
# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.
|
||||
# Initialization code that may require console input (password prompts, [y/n]
|
||||
# confirmations, etc.) must go above this block; everything else may go below.
|
||||
if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
|
||||
source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
|
||||
fi
|
||||
|
||||
# Mental note: this is sourced for *interactive* sessions
|
||||
|
||||
PLATFORM=$(uname -s)
|
||||
|
||||
ZSH=$HOME/.zsh/oh-my-zsh
|
||||
ZSH_CUSTOM=$HOME/.zsh/omz-custom
|
||||
|
||||
# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
|
||||
ZSH_THEME="powerlevel10k/powerlevel10k"
|
||||
|
||||
p10k_config=~/.zsh/p10k.zsh
|
||||
if [[ $XDG_SESSION_TYPE == tty ]]; then
|
||||
p10k_config=~/.zsh/p10k-console.zsh
|
||||
fi
|
||||
[[ ! -f $p10k_config ]] || source $p10k_config
|
||||
|
||||
plugins=(
|
||||
# omz builtins
|
||||
git
|
||||
thor
|
||||
rake
|
||||
fd
|
||||
fzf
|
||||
fasd
|
||||
virtualenv
|
||||
rvm
|
||||
extract
|
||||
vagrant
|
||||
docker
|
||||
pipenv
|
||||
git-flow
|
||||
archlinux
|
||||
|
||||
# mine
|
||||
kitty
|
||||
|
||||
# third-party
|
||||
zsh-autosuggestions
|
||||
zsh-completions
|
||||
zsh-syntax-highlighting
|
||||
)
|
||||
|
||||
alias e='emacsclient -c'
|
||||
alias et='emacsclient -t'
|
||||
|
||||
alias sc='systemctl'
|
||||
alias scu='systemctl --user'
|
||||
alias s3cmd_ovh='s3cmd -c ~/Private/Cloud/OVH/s3cmd.conf'
|
||||
|
||||
DISABLE_AUTO_UPDATE="true"
|
||||
|
||||
export FZF_BASE=$(fzf-share)
|
||||
|
||||
source $ZSH/oh-my-zsh.sh
|
||||
|
||||
# Set up completion
|
||||
fpath=(~/.zsh/zsh-completions $fpath)
|
||||
setopt dvorak
|
||||
zstyle ':completion:*' completer _expand _complete _ignored _correct _approximate
|
||||
zstyle ':completion:*' format 'Completing %d'
|
||||
zstyle ':completion:*' group-name ''
|
||||
zstyle :compinstall filename "~/.zshrc"
|
||||
autoload -Uz compinit
|
||||
compinit
|
||||
|
||||
# Set up history
|
||||
HISTFILE=~/.histfile
|
||||
HISTSIZE=10000
|
||||
SAVEHIST=1000
|
||||
setopt sharehistory appendhistory extendedhistory extendedglob notify histignorealldups nohistverify histignorespace
|
||||
|
||||
# Set up locale
|
||||
export LANG=en_GB.UTF-8
|
||||
|
||||
# A few more options
|
||||
setopt noclobber multios
|
||||
|
||||
source ~/.zshenv.path
|
||||
|
||||
# Local Variables:
|
||||
# mode: sh
|
||||
# End:
|
||||
|
|
@ -1,8 +1,5 @@
|
|||
{ config, lib, pkgs, ... }:
|
||||
|
||||
{
|
||||
imports = [
|
||||
./gopass.nix
|
||||
./protonmail.nix
|
||||
];
|
||||
imports = [ ./gopass.nix ./protonmail.nix ./resilio.nix ./wal.nix ];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,54 @@
|
|||
{ config, pkgs, lib, nixosConfig, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
inherit (nixosConfig.networking) hostName;
|
||||
cfg = config.services.resilio-sync;
|
||||
settingsFormat = pkgs.formats.json { };
|
||||
|
||||
capitalise = str:
|
||||
let chars = stringToCharacters str;
|
||||
in concatStrings ([ (toUpper (head chars)) ] ++ (tail chars));
|
||||
in {
|
||||
options.services.resilio-sync.enable = mkEnableOption "resilio-sync";
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
home.packages = [ pkgs.resilio-sync ];
|
||||
home.file.".cache/rslsync/debug.txt".text = ''
|
||||
80000000
|
||||
0
|
||||
'';
|
||||
|
||||
systemd.user.services = let
|
||||
confFile = settingsFormat.generate "rslsync.conf" {
|
||||
device_name = capitalise hostName;
|
||||
storage_path = toString ~/.cache/rslsync;
|
||||
pid_file = toString ~/.cache/rslsync/rslsync.pid;
|
||||
|
||||
use_upnp = true;
|
||||
|
||||
download_limit = 0;
|
||||
upload_limit = 0;
|
||||
|
||||
directory_root = toString ~/.;
|
||||
|
||||
webui.listen = "0.0.0.0:8888";
|
||||
};
|
||||
in {
|
||||
rslsync = {
|
||||
Unit = {
|
||||
Description = "Resilio Sync per-user service";
|
||||
After = "network.target";
|
||||
};
|
||||
Service = {
|
||||
Type = "simple";
|
||||
ExecStart =
|
||||
"${pkgs.resilio-sync}/bin/rslsync --nodaemon --config ${confFile}";
|
||||
Restart = "on-abort";
|
||||
};
|
||||
Install = { WantedBy = [ "default.target" ]; };
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
{ lib, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
{
|
||||
imports = mapAttrsToList (k: _: ./. + ("/" + k))
|
||||
(filterAttrs (_: v: v == "directory") (builtins.readDir ./.));
|
||||
}
|
||||
|
|
@ -3,14 +3,13 @@
|
|||
with lib;
|
||||
|
||||
{
|
||||
imports = [
|
||||
../modules/wal.nix
|
||||
];
|
||||
|
||||
home.packages = with pkgs;
|
||||
let
|
||||
gn = pkgs.gnome3;
|
||||
evolution = pkgs.evolutionWithPlugins.override { plugins = [ pkgs.evolution pkgs.evolution-ews ]; };
|
||||
evolution = pkgs.evolutionWithPlugins.override {
|
||||
plugins = [ pkgs.evolution pkgs.evolution-ews ];
|
||||
};
|
||||
in [
|
||||
keybase-gui
|
||||
|
||||
|
|
@ -59,16 +58,14 @@ with lib;
|
|||
nextcloud-client
|
||||
];
|
||||
|
||||
home.file = {
|
||||
".face".source = ../dotfiles/images/cat.jpg;
|
||||
};
|
||||
home.file = { ".face".source = ./images/cat.jpg; };
|
||||
xdg.configFile = {
|
||||
"wofi".source = ../dotfiles/wofi;
|
||||
"wofi".source = ./wofi;
|
||||
"kitty/sessions/default.conf".text = ''
|
||||
layout tall
|
||||
cd ~
|
||||
'';
|
||||
"waybar".source = ../dotfiles/waybar;
|
||||
"waybar".source = ./waybar;
|
||||
};
|
||||
|
||||
home.activation = {
|
||||
|
|
@ -87,7 +84,8 @@ with lib;
|
|||
"https://bafybeiff7bjww2dicbqhfubiq67wma6qrjkkndk6s773glwiystzir2goe.ipfs.dweb.link/"
|
||||
];
|
||||
name = "wallpaper.jpg";
|
||||
sha256 = "b6b9b88e10715e9e7dfd33dc80ecfff90fa58f0529e6f7c88f67f34991da57e0";
|
||||
sha256 =
|
||||
"b6b9b88e10715e9e7dfd33dc80ecfff90fa58f0529e6f7c88f67f34991da57e0";
|
||||
};
|
||||
shell.enable = true;
|
||||
sway.enable = true;
|
||||
|
|
@ -142,7 +140,7 @@ with lib;
|
|||
enable_audio_bell = false;
|
||||
visual_bell_duration = "0.1";
|
||||
};
|
||||
extraConfig = strings.fileContents ../colours/gruvbox-kitty.conf;
|
||||
extraConfig = strings.fileContents ./colours/gruvbox-kitty.conf;
|
||||
};
|
||||
|
||||
programs.chromium.enable = true;
|
||||
|
Before Width: | Height: | Size: 51 KiB After Width: | Height: | Size: 51 KiB |
|
|
@ -31,10 +31,10 @@
|
|||
|
||||
home.file = {
|
||||
".doom.d" = {
|
||||
source = ../dotfiles/doom;
|
||||
source = ./doom.d;
|
||||
recursive = true;
|
||||
};
|
||||
".doom.d/snippets".source = ../dotfiles/emacs/snippets;
|
||||
".doom.d/snippets".source = ./snippets;
|
||||
};
|
||||
|
||||
programs.firefox.profiles.default.settings = {
|
||||
|
|
@ -116,7 +116,7 @@
|
|||
latex ; writing papers in Emacs has never been so fun
|
||||
markdown ; writing docs for people to ignore
|
||||
nix ; I hereby declare "nix geht mehr!"
|
||||
(org +pretty +roam +pandoc +noter) ; organize your plain life in plain text
|
||||
(org +pretty +roam2 +pandoc +noter) ; organize your plain life in plain text
|
||||
python ; beautiful is better than ugly
|
||||
rust ; Fe2O3.unwrap().unwrap().unwrap().unwrap()
|
||||
sh ; she sells {ba,z,fi}sh shells on the C xor
|
||||
|
|
@ -3,14 +3,9 @@
|
|||
{
|
||||
home.file = {
|
||||
".zsh" = {
|
||||
source = ../dotfiles/zsh;
|
||||
source = ./zsh;
|
||||
recursive = true;
|
||||
};
|
||||
# ".zsh/omz-custom/plugins/zsh-syntax-highlighting" = {
|
||||
# source = fetchGit {
|
||||
# url = "https://github.com/zsh-users/zsh-syntax-highlighting.git";
|
||||
# };
|
||||
# };
|
||||
};
|
||||
|
||||
home.packages = with pkgs; [
|
||||
|
|
@ -1,32 +0,0 @@
|
|||
{ pkgs, ... }:
|
||||
|
||||
let
|
||||
lib = pkgs.lib;
|
||||
nixGL = pkgs.callPackage
|
||||
(fetchTarball "https://github.com/guibou/nixGL/archive/master.tar.gz") {
|
||||
inherit pkgs;
|
||||
};
|
||||
in {
|
||||
inherit nixGL;
|
||||
|
||||
nixGLWrapMaybe = let
|
||||
makeGLWrapper = pkg: cmd:
|
||||
with nixGL;
|
||||
pkgs.writeScriptBin cmd ''
|
||||
#!${pkgs.stdenv.shell}
|
||||
exec ${nixGLCommon nixGLIntel}/bin/nixGL ${pkg}/bin/${cmd} "$@"
|
||||
'';
|
||||
nixGLWrap = pkg: cmd:
|
||||
let wrapped = makeGLWrapper pkg cmd;
|
||||
in pkgs.symlinkJoin {
|
||||
name = "nixGL-${pkg.name}";
|
||||
paths = [ wrapped pkg ];
|
||||
};
|
||||
isNixOS = builtins.pathExists /etc/NIXOS;
|
||||
in pkg: cmd: if isNixOS then pkg else (nixGLWrap pkg cmd);
|
||||
|
||||
capitalise = str:
|
||||
let chars = lib.stringToCharacters str;
|
||||
in lib.concatStrings
|
||||
([ (lib.toUpper (lib.head chars)) ] ++ (lib.tail chars));
|
||||
}
|
||||
Loading…
Reference in New Issue