summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jeschli/1systems/reagenzglas/config.nix11
-rw-r--r--jeschli/2configs/emacs.nix34
2 files changed, 37 insertions, 8 deletions
diff --git a/jeschli/1systems/reagenzglas/config.nix b/jeschli/1systems/reagenzglas/config.nix
index a3bc7b5b0..91c2ed548 100644
--- a/jeschli/1systems/reagenzglas/config.nix
+++ b/jeschli/1systems/reagenzglas/config.nix
@@ -9,8 +9,8 @@
<stockholm/jeschli/2configs/rust.nix>
<stockholm/jeschli/2configs/haskell.nix>
<stockholm/jeschli/2configs/python.nix>
- ./desktop.nix
- ./i3-configuration.nix
+# ./desktop.nix
+# ./i3-configuration.nix
./hardware-configuration.nix
];
@@ -39,6 +39,8 @@
environment.systemPackages = with pkgs; [
ag
alacritty
+ google-chrome
+ chromium
copyq
direnv
go
@@ -67,6 +69,11 @@
#Enable ssh daemon
services.openssh.enable = true;
+ #Enable clight
+ services.clight.enable = true;
+ services.geoclue2.enable = true;
+ location.provider = "geoclue2";
+
users.users.root.openssh.authorizedKeys.keys = [
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDM1xtX/SF2IzfAIzrXvH4HsW05eTBX8U8MYlEPadq0DS/nHC45hW2PSEUOVsH0UhBRAB+yClVLyN+JAYsuOoQacQqAVq9R7HAoFITdYTMJCxVs4urSRv0pWwTopRIh1rlI+Q0QfdMoeVtO2ZKG3KoRM+APDy2dsX8LTtWjXmh/ZCtpGl1O8TZtz2ZyXyv9OVDPnQiFwPU3Jqs2Z036c+kwxWlxYc55FRuqwRtQ48c/ilPMu+ZvQ22j1Ch8lNuliyAg1b8pZdOkMJF3R8b46IQ8FEqkr3L1YQygYw2M50B629FPgHgeGPMz3mVd+5lzP+okbhPJjMrUqZAUwbMGwGzZ ombi@nixos"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKFXgtbgeivxlMKkoEJ4ANhtR+LRMSPrsmL4U5grFUME jeschli@nixos"
diff --git a/jeschli/2configs/emacs.nix b/jeschli/2configs/emacs.nix
index 0a81048fa..cffa1c744 100644
--- a/jeschli/2configs/emacs.nix
+++ b/jeschli/2configs/emacs.nix
@@ -9,7 +9,7 @@ let
];
};
- orgAgendaView = import ./emacs-org-agenda.nix;
+# orgAgendaView = import ./emacs-org-agenda.nix;
packageRepos = ''
(require 'package) ;; You might already have this line
@@ -179,7 +179,6 @@ let
${theme}
${windowCosmetics}
- ${orgAgendaView}
${myFunctionKeys}
${lspMode}
'';
@@ -202,9 +201,14 @@ let
epkgs.melpaPackages.academic-phrases
epkgs.melpaPackages.gitlab
- epkgs.melpaPackages.helm
epkgs.melpaPackages.weechat
+# helm
+ epkgs.melpaPackages.helm
+ epkgs.melpaPackages.helm-fuzzier
+ epkgs.melpaPackages.helm-ag
+
+
# emacs convenience
epkgs.melpaPackages.ag
epkgs.melpaPackages.company
@@ -235,12 +239,15 @@ let
epkgs.melpaPackages.org-mime
epkgs.melpaPackages.orgit
-
epkgs.elpaPackages.which-key
+
+ epkgs.exwm
+ epkgs.melpaPackages.desktop-environment
+ epkgs.melpaPackages.helm-exwm
];
emacsWithOverlay = pkgsWithOverlay.emacsWithPackagesFromUsePackage {
- config = builtins.readFile dotEmacs; # builtins.readFile ./emacs.el;
+ config = builtins.readFile ./elisp/init.el;
# Package is optional, defaults to pkgs.emacs
package = pkgsWithOverlay.emacsGit;
# Optionally provide extra packages not in the configuration file
@@ -260,6 +267,21 @@ let
'';
in {
environment.systemPackages = [
- myEmacs myEmacsWithDaemon myEmacsClient
+ myEmacs myEmacsWithDaemon myEmacsClient emacsWithOverlay
];
+
+ services.xserver = {
+ enable = true;
+ xkbOptions = "caps:super";
+ exportConfiguration = true;
+
+ displayManager.slim.enable = true;
+ windowManager.default = "exwm";
+
+ # Set up the login session
+ windowManager.session = [{
+ name = "exwm";
+ start = "${emacsWithOverlay}/bin/emacs -q -l " + builtins.toString ./elisp/init.el;
+ }];
+ };
}