ellmau/nixos
1
0
Fork 0
mirror of https://github.com/ellmau/nixos.git synced 2025-12-19 09:29:36 +01:00
Code Issues Projects Releases Wiki Activity

further stuff

Browse Source
This commit is contained in:
Stefan Ellmauthaler 2021-09-25 22:00:57 +02:00
parent 86164ed72b
commit b45aad9bea
3 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configuration.nix
View File

@ -99,6 +99,7 @@
okular okular
texlive.combined.scheme-full texlive.combined.scheme-full
rustup rustup
rust-analyzer
usbutils usbutils
starship starship
]; ];
@ -106,6 +107,12 @@
#services.emacs.enable = true; #services.emacs.enable = true;
#services.emacs.defaultEditor = true; #services.emacs.defaultEditor = true;
#nixpkgs.overlays = [
# (import (builtins.fetchTarball {
# url = https://github.com/nix-community/emacs-overlay/archive/master.tar.gz;
# }))
#];
environment.shells = [ pkgs.zsh ]; environment.shells = [ pkgs.zsh ];
environment.pathsToLink = [ "/share/zsh" ]; environment.pathsToLink = [ "/share/zsh" ];

11
programs/emacs/default.el
View File

@ -2,7 +2,11 @@
(setq package-enable-at-startup nil) (setq package-enable-at-startup nil)
(package-initialize) (package-initialize)
(load-theme 'spacemacs-dark t) (use-package spacemacs-theme
:ensure t
:config (load-theme 'spacemacs-dark t))
;(load-theme 'spacemacs-dark t)
;; Tab-width ;; Tab-width
(setq tab-width 2) (setq tab-width 2)
@ -30,7 +34,6 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(bind-key "C-c l" 'org-toggle-link-display) ;shows org links in plain text (bind-key "C-c l" 'org-toggle-link-display) ;shows org links in plain text
(require 'org-roam) (require 'org-roam)
(require 'org-roam-protocol) (require 'org-roam-protocol)
(require 'ox-md) (require 'ox-md)
@ -225,8 +228,8 @@
;; If there is more than one, they won't work right. ;; If there is more than one, they won't work right.
'(inhibit-startup-screen t) '(inhibit-startup-screen t)
'(org-agenda-files '("~/org-notes/daily/" "~/org-notes/")) '(org-agenda-files '("~/org-notes/daily/" "~/org-notes/"))
'(package-selected-packages ; '(package-selected-packages
'(projectile-ripgrep projectile yaml-mode ox-pandoc use-package treemacs-all-the-icons treemacs-magit ivy org-roam-server org-roam ob-rust magit zenburn-theme treemacs spacemacs-theme rustic monokai-theme moe-theme lsp-ui gruvbox-theme company-lsp bind-key))) ; '(projectile-ripgrep projectile yaml-mode ox-pandoc use-package treemacs-all-the-icons treemacs-magit ivy org-roam-server org-roam ob-rust magit zenburn-theme treemacs spacemacs-theme rustic monokai-theme moe-theme lsp-ui gruvbox-theme company-lsp bind-key)))
(custom-set-faces (custom-set-faces
;; custom-set-faces was added by Custom. ;; custom-set-faces was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful. ;; If you edit it by hand, you could mess it up, so be careful.

15
programs/emacs/default.nix
View File

@ -8,7 +8,7 @@ let
cp ${defaultEl} $out/share/emacs/site-lisp/default.el cp ${defaultEl} $out/share/emacs/site-lisp/default.el
''; '';
emacsPackage = (pkgs.emacsPackagesGen pkgs.emacsUnstable).emacsWithPackages emacsPackage = (pkgs.emacsPackagesGen pkgs.emacs).emacsWithPackages
(epkgs: (epkgs:
#let #let
# lpkgs = import ./packages.nix { # lpkgs = import ./packages.nix {
@ -23,7 +23,7 @@ let
#]) #])
[(with epkgs.elpaPackages; [ [(with epkgs.elpaPackages; [
auctex auctex
org org
flymake flymake
])] ])]
++ (with epkgs.melpaStablePackages; [ ]) ++ (with epkgs.melpaPackages; [ ++ (with epkgs.melpaStablePackages; [ ]) ++ (with epkgs.melpaPackages; [
@ -46,7 +46,7 @@ let
flycheck flycheck
free-keys free-keys
highlight-indentation highlight-indentation
ivy ivy
json-mode json-mode
less-css-mode less-css-mode
lsp-mode lsp-mode
@ -55,14 +55,14 @@ let
nix-mode nix-mode
nixpkgs-fmt nixpkgs-fmt
org-bullets org-bullets
org-pdftools #org-roam
org-roam #org-roam-server
pasp-mode pasp-mode
pdf-tools pdf-tools
projectile projectile
projectile-ripgrep projectile-ripgrep
rustic rustic
spacemacs-theme spacemacs-theme
sparql-mode sparql-mode
use-package use-package
yaml-mode yaml-mode
@ -74,6 +74,9 @@ in
defaultEditor = true; defaultEditor = true;
package = emacsPackage; package = emacsPackage;
}; };
#nixpkgs.overlays = [ (self: super: { emacsOrig = super.emacs; }) (import (builtins.fetchTarball {
# url = https://github.com/nix-community/emacs-overlay/archive/master.tar.gz;
#})) ];
nixpkgs.overlays = [ nixpkgs.overlays = [
(import (builtins.fetchTarball { (import (builtins.fetchTarball {