summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeonardo Santiago <[email protected]>2024-04-02 16:42:12 -0300
committerLeonardo Santiago <[email protected]>2024-04-02 16:42:12 -0300
commitb5d2fa60722347f87bb25a1aa83c9d11ceacfd12 (patch)
tree750fc23c8e3f2c6c27b7528574c9f17d29260a94
parent2d32bab6d9082c6c18676517863674bf2ce6089e (diff)
fix some stuff
-rw-r--r--hosts/hanekawa/configuration.nix4
-rw-r--r--modules/emacs/README.org7
-rw-r--r--modules/emacs/emacs.nix10
-rw-r--r--users/leonardo.nix10
4 files changed, 22 insertions, 9 deletions
diff --git a/hosts/hanekawa/configuration.nix b/hosts/hanekawa/configuration.nix
index 81c56bb..e646c98 100644
--- a/hosts/hanekawa/configuration.nix
+++ b/hosts/hanekawa/configuration.nix
@@ -32,8 +32,8 @@
services.touchegg.enable = true;
services.xserver = {
enable = true;
- layout = "br";
- xkbVariant = "";
+ xkb.layout = "br";
+ xkb.variant = "";
libinput = {
enable = true;
touchpad = {
diff --git a/modules/emacs/README.org b/modules/emacs/README.org
index ff1254b..a82a5e2 100644
--- a/modules/emacs/README.org
+++ b/modules/emacs/README.org
@@ -255,6 +255,13 @@ Try to use the package.
(use-package markdown-mode
:mode "\\.md\\'")
#+end_src
+** Coq
+#+begin_src emacs-lisp :tangle yes
+(use-package proof-general
+ :mode "\\.md\\'")
+(use-package company-coq
+ :hook (coq-mode . company-coq-mode))
+#+end_src
* Personal
** Org mode
#+begin_src emacs-lisp :tangle yes
diff --git a/modules/emacs/emacs.nix b/modules/emacs/emacs.nix
index f86e364..a43e38b 100644
--- a/modules/emacs/emacs.nix
+++ b/modules/emacs/emacs.nix
@@ -1,14 +1,14 @@
{ pkgs, inputs, ...}:
let
- outside-emacs = [
- (pkgs.python3.withPackages (p: (with p; [
+ outside-emacs = with pkgs; [
+ (python3.withPackages (p: (with p; [
python-lsp-server
python-lsp-ruff
pylsp-mypy
])))
- pkgs.nil
- pkgs.rust-analyzer
- pkgs.parallel
+ nil
+ rust-analyzer
+ parallel
];
org-tangle-elisp-blocks = (pkgs.callPackage ./org.nix {inherit pkgs; from-elisp = inputs.from-elisp;}).org-tangle ({ language, flags } :
let is-elisp = (language == "emacs-lisp") || (language == "elisp");
diff --git a/users/leonardo.nix b/users/leonardo.nix
index e7b3934..36307eb 100644
--- a/users/leonardo.nix
+++ b/users/leonardo.nix
@@ -77,9 +77,15 @@
startAgent = true;
forwardX11 = true;
};
- services.pipewire.enable = true;
+ services.pipewire = {
+ enable = true;
+ extraConfig.pipewire = {
+ "context.properties"."module.x11.bell" = false;
+ };
+ };
services.openssh.enable = true;
-
+ # services.xserver.xkb.layout
+ # services.xserver.xkb.variant
users.users.leonardo = {
isNormalUser = true;
description = "leonardo";