Merge branch 'main' of https://forge.room409.xyz/miloignis/nix_config

flake.nix

@@ -49,6 +49,9 @@
           };
           commonConfigFunc = ({ config, lib, pkgs, modulesPath, ... }: (specificPkgs: {
                   nixpkgs.config.allowUnfree = true;
+                  nixpkgs.config.permittedInsecurePackages = [
+                      "olm-3.2.16"
+                  ];
                   nix.settings.experimental-features = [ "nix-command" "flakes" ];
                   networking.networkmanager.enable = true;  # Easiest to use and most distros use this by default.
                   time.timeZone = "America/New_York";
@@ -121,7 +124,7 @@
                     extraPackages = with pkgs; [
                       swaylock # lockscreen
                       swayidle
-                      xwayland # for legacy apps
+                      #xwayland # for legacy apps
                       #waybar # status bar
                       mako # notification daemon
                       kanshi # autorandr

home-manager/home.nix

@@ -14,7 +14,8 @@
                   fonts.fontconfig.enable = true;
                   home.packages = with pkgs; [
                     fira-code jetbrains-mono iosevka monoid recursive inter
-                    xwayland-satellite swww
+                    xwayland-satellite
+                    swww
                     niri
                   ]; 
 
@@ -516,6 +517,7 @@
                     '';
                   };
                   programs.emacs = {
+                    package = pkgs.emacs-pgtk;
                     enable = true;
                     extraConfig = ''
                       (menu-bar-mode   -1)
@@ -528,38 +530,41 @@
                       (setq show-paren-delay 0)
                       (show-paren-mode)
 
-                      ;(require 'smartparens-config)
-
-
                       (setq evil-want-C-u-scroll t)
+                      (setq evil-want-keybinding nil)
                       (evil-mode 1)
                       (evil-set-undo-system 'undo-redo)
                       (setq key-chord-two-keys-delay 0.5)
                       (key-chord-define evil-insert-state-map "jk" 'evil-normal-state)
+                      (evil-collection-init)
                       (key-chord-mode 1)
-                      (custom-set-variables
+
-                      ;; custom-set-variables was added by Custom.
+                      (add-to-list 'auto-mode-alist '("\\.epub\\'" . nov-mode))
-                      ;; If you edit it by hand, you could mess it up, so be careful.
+                      (add-hook 'prog-mode-hook 'display-line-numbers-mode)
-                      ;; Your init file should contain only one such instance.
+                      ;(load-theme 'dracula t)
-                      ;; If there is more than one, they won't work right.
-                      '(custom-safe-themes
-                      '("3ff4a0ad1a2da59a72536e6030291cf663314c14c8a5a9eb475f3c28436d071d" default)))
-                      (custom-set-faces
-                      ;; custom-set-faces was added by Custom.
-                      ;; If you edit it by hand, you could mess it up, so be careful.
-                      ;; Your init file should contain only one such instance.
-                      ;; If there is more than one, they won't work right.
-                      )
-                      (load-theme 'dracula t)
                     '';
                     extraPackages = epkgs: with epkgs; [
                       evil key-chord magit proof-general
-                      #paredit
+                      ement nov evil-collection
-                      #smartparens
+                      rainbow-delimiters
-                      #parinfer-rust-mode
+                      dracula-theme
-                      rainbow-delimiters dracula-theme
                     ];
                   };
+                  services.pantalaimon = {
+                    package = pkgs.pantalaimon.overridePythonAttrs { doCheck = false; };
+                    enable = true;
+                    settings = {
+                        Default = {
+                          LogLevel = "Debug";
+                          SSL = true;
+                        };
+                        local-matrix = {
+                          Homeserver = "https://synapse.room409.xyz";
+                          ListenAddress = "127.0.0.1";
+                          ListenPort = "8009";
+                        };
+                    };
+                  };
                   programs.iamb = {
                     enable = true;
                     settings = {