summaryrefslogtreecommitdiffstats
path: root/jeschli
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2019-11-14 21:11:07 +0100
committerlassulus <lassulus@lassul.us>2019-11-14 21:11:07 +0100
commita9b1f239dc06854e51447bf0838ce9e9669527a7 (patch)
treed8d09704823d3f3b51d3d7c272ee171c5739d31c /jeschli
parentd89080f8fab1f854461be15199dfa87f15c665e3 (diff)
parentebc0a63cb7115c80b71a45b6e9959452f567ff1e (diff)
Merge remote-tracking branch 'enklave/master'
Diffstat (limited to 'jeschli')
-rw-r--r--jeschli/1systems/reagenzglas/config.nix2
-rw-r--r--jeschli/2configs/emacs-org-agenda.nix4
-rw-r--r--jeschli/2configs/emacs.nix40
-rw-r--r--jeschli/2configs/rust.nix1
-rw-r--r--jeschli/krops.nix2
5 files changed, 33 insertions, 16 deletions
diff --git a/jeschli/1systems/reagenzglas/config.nix b/jeschli/1systems/reagenzglas/config.nix
index b6ae3c201..7596f17d6 100644
--- a/jeschli/1systems/reagenzglas/config.nix
+++ b/jeschli/1systems/reagenzglas/config.nix
@@ -6,6 +6,7 @@
<stockholm/jeschli>
<stockholm/jeschli/2configs/emacs.nix>
<stockholm/jeschli/2configs/firefox.nix>
+ <stockholm/jeschli/2configs/rust.nix>
<stockholm/jeschli/2configs/python.nix>
./desktop.nix
./i3-configuration.nix
@@ -38,6 +39,7 @@
wget vim git
rofi
ag
+ alacritty
];
users.users.ombi = {
diff --git a/jeschli/2configs/emacs-org-agenda.nix b/jeschli/2configs/emacs-org-agenda.nix
index 79540977c..f9139fcfe 100644
--- a/jeschli/2configs/emacs-org-agenda.nix
+++ b/jeschli/2configs/emacs-org-agenda.nix
@@ -114,8 +114,8 @@ let
("NEXT" ("WAITING") ("CANCELLED") ("HOLD"))
("DONE" ("WAITING") ("CANCELLED") ("HOLD")))))
-(setq org-directory "~/git/org")
-(setq org-default-notes-file "~/git/org/refile.org")
+(setq org-directory "~/projects/notes_private")
+(setq org-default-notes-file "~/projects/notes_private/refile.org")
;; I use C-c c to start capture mode
(global-set-key (kbd "C-c c") 'org-capture)
diff --git a/jeschli/2configs/emacs.nix b/jeschli/2configs/emacs.nix
index 46354bd62..f866bbca9 100644
--- a/jeschli/2configs/emacs.nix
+++ b/jeschli/2configs/emacs.nix
@@ -62,9 +62,6 @@ let
magit = ''
(global-set-key (kbd "C-x g") 'magit-status) ; "Most Magit commands are commonly invoked from the status buffer"
-
- (with-eval-after-load 'magit
- (require 'forge))
'';
windowCosmetics = ''
@@ -163,6 +160,11 @@ let
(global-set-key (kbd "<f8>") 'delete-other-windows)
'';
+ lspMode = ''
+ (require 'lsp-mode)
+ (add-hook 'rust-mode-hook #'lsp)
+ '';
+
dotEmacs = pkgs.writeText "dot-emacs" ''
${packageRepos}
@@ -177,11 +179,20 @@ let
${orgAgendaView}
${myFunctionKeys}
+ ${lspMode}
'';
#emacsWithCustomPackages
emacsPkgs= epkgs: [
- #testing
+ # testing lsp mode
+ epkgs.melpaPackages.lsp-ui
+ epkgs.melpaPackages.company-lsp
+ epkgs.melpaPackages.lsp-treemacs
+ epkgs.melpaPackages.helm-lsp
+ epkgs.melpaPackages.dap-mode
+ epkgs.melpaPackages.lsp-mode
+
+ # testing
epkgs.melpaPackages.web-mode
epkgs.melpaPackages.js2-mode
epkgs.melpaPackages.xref-js2
@@ -189,7 +200,6 @@ let
epkgs.melpaPackages.academic-phrases
epkgs.melpaPackages.gitlab
- epkgs.melpaPackages.forge
epkgs.melpaPackages.helm
epkgs.melpaPackages.weechat
@@ -200,6 +210,7 @@ let
epkgs.melpaPackages.evil
epkgs.melpaPackages.google-this
epkgs.melpaPackages.monokai-alt-theme
+ epkgs.melpaPackages.zenburn-theme
# development
epkgs.melpaPackages.magit
@@ -208,7 +219,7 @@ let
epkgs.melpaPackages.haskell-mode
# rust
epkgs.melpaPackages.rust-mode
- epkgs.melpaPackages.flycheck-rust
+# epkgs.melpaPackages.flycheck-rust
epkgs.melpaPackages.racer
# python
@@ -219,16 +230,19 @@ let
epkgs.orgPackages.org-plus-contrib
epkgs.melpaPackages.smex
epkgs.melpaPackages.org-mime
+ epkgs.melpaPackages.orgit
+
epkgs.elpaPackages.which-key
];
-emacsWithOverlay = (pkgsWithOverlay.emacsWithPackagesFromUsePackage {
- config = builtins.readFile dotEmacs; # builtins.readFile ./emacs.el;
- # Package is optional, defaults to pkgs.emacs
- package = pkgsWithOverlay.emacsGit;
- # Optionally provide extra packages not in the configuration file
- extraEmacsPackages = emacsPkgs;
- });
+
+ emacsWithOverlay = pkgsWithOverlay.emacsWithPackagesFromUsePackage {
+ config = builtins.readFile dotEmacs; # builtins.readFile ./emacs.el;
+ # Package is optional, defaults to pkgs.emacs
+ package = pkgsWithOverlay.emacsGit;
+ # Optionally provide extra packages not in the configuration file
+ extraEmacsPackages = emacsPkgs;
+ };
myEmacs = pkgs.writeDashBin "my-emacs" ''
exec ${emacsWithOverlay}/bin/emacs -q -l ${dotEmacs} "$@"
diff --git a/jeschli/2configs/rust.nix b/jeschli/2configs/rust.nix
index dbd90ebf5..46addb15c 100644
--- a/jeschli/2configs/rust.nix
+++ b/jeschli/2configs/rust.nix
@@ -3,5 +3,6 @@
{
environment.systemPackages = with pkgs; [
rustup
+ gcc
];
}
diff --git a/jeschli/krops.nix b/jeschli/krops.nix
index 9a8a76676..59edd4273 100644
--- a/jeschli/krops.nix
+++ b/jeschli/krops.nix
@@ -11,7 +11,7 @@
nixos-config.symlink = "stockholm/jeschli/1systems/${name}/config.nix";
nixpkgs-unstable.git = {
url = "https://github.com/nixos/nixpkgs-channels";
- ref = "nixos-unstable";
+ ref = (lib.importJSON ../krebs/nixpkgs-unstable.json).rev;
};
secrets = if test then {
file = toString ./2configs/tests/dummy-secrets;