Update flake.lock and remove emacs

common/packages.nix

@@ -199,7 +199,7 @@ in
         spotify
         strace
         usbutils
-        virtmanager
+        /* virtmanager */
         vlc
         # Unsupported / broken on darwin:
         aws-sam-cli

flake.lock

@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1642495030,
+        "lastModified": 1645293039,
-        "narHash": "sha256-u1ZlFbLWzkM6zOfuZ1tr0tzTuDWucOYwALPWDWLorkE=",
+        "narHash": "sha256-PwdDu+SkX8dreeuJ/4av1sEluNZdrpdXv8JsRKKg1Yc=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "bcdb6022b3a300abf59cb5d0106c158940f5120e",
+        "rev": "1df878b6f8351795a3bebfbe4fd2d02e1e8b29d6",
         "type": "github"
       },
       "original": {
@@ -58,11 +58,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1644534280,
+        "lastModified": 1645244400,
-        "narHash": "sha256-Gzf/Jq/F1vvTp6XkzPU+pBCj3OSAFLiR7f0ptwRseiI=",
+        "narHash": "sha256-o7KCd6ySFZ9/LbS62aTeuFmBWtP7Tt3Q3RcNjYgTgZU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "6d9d9294d09b5e88df65f8c6651efb8a4d7d2476",
+        "rev": "0232fe1b75e6d7864fd82b5c72f6646f87838fc3",
         "type": "github"
       },
       "original": {
@@ -81,11 +81,11 @@
       },
       "locked": {
         "dir": "contrib",
-        "lastModified": 1644475605,
+        "lastModified": 1645311555,
-        "narHash": "sha256-X5/QiC/nC8ul79z/0o9nIZYFqPzne1HbthGd5jJpsBA=",
+        "narHash": "sha256-Va2UQFMSBYDuUbYOVKEPQj1PV1RxBHbhv0WTJTHqDvE=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "3b4bf887104465fc7e821939ccbc44e9884a7d06",
+        "rev": "8b3799e2c33282bf417ddee15ae71b5aba613c16",
         "type": "github"
       },
       "original": {
@@ -102,11 +102,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1644480792,
+        "lastModified": 1645344796,
-        "narHash": "sha256-opbdPSdAuRLFdwEbbzMuQO/U6bAua3jTxk+CIpN35uM=",
+        "narHash": "sha256-sUaJA5Q6glKRfB2WOcMFi1wOcUQthXRGVego9eetGTk=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "38d6ebe6b54e4778d71f6c64575aa986831c555b",
+        "rev": "957f8d1c54d81031ea2422b97e2bd9518661f78c",
         "type": "github"
       },
       "original": {
@@ -117,11 +117,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1643980037,
+        "lastModified": 1645346782,
-        "narHash": "sha256-RdVHt2mD408WXMjQIOLvUzy8cSUHu8NAbilDmPVxf7E=",
+        "narHash": "sha256-3qd0cu+2kapIP7cdHW9n8zh1wCvRGg83K7/cCj5Xv+A=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "9886a06e4745edb31587d0e9481ad82d35f0d593",
+        "rev": "1ccfe243aa6e94bf80f2a66f6be41d086d37fc87",
         "type": "github"
       },
       "original": {
@@ -133,11 +133,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1644359234,
+        "lastModified": 1644613700,
-        "narHash": "sha256-u/sBnRgrFrn9W8gZMS6vN3ZnJsoTvbws968TpqwlDJQ=",
+        "narHash": "sha256-wLRPJclMH8vsHuFtyI78aF09lw5mbi3lMB6uiK5S2wE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c5051e2b5fe9fab43a64f0e0d06b62c81a890b90",
+        "rev": "23d785aa6f853e6cf3430119811c334025bbef55",
         "type": "github"
       },
       "original": {
@@ -149,11 +149,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1644420267,
+        "lastModified": 1644613700,
-        "narHash": "sha256-rFJuctggkjM412OC6OGPdXogFp7czGDW05ueWqpJbj8=",
+        "narHash": "sha256-wLRPJclMH8vsHuFtyI78aF09lw5mbi3lMB6uiK5S2wE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "98bb5b77c8c6666824a4c13d23befa1e07210ef1",
+        "rev": "23d785aa6f853e6cf3430119811c334025bbef55",
         "type": "github"
       },
       "original": {

home/default.nix

@@ -321,38 +321,6 @@ in
       enableZshIntegration = true;
     };
 
-    emacs = {
-      enable = true;
-      extraPackages = epkgs:
-        (with epkgs; [
-          all-the-icons
-          centaur-tabs
-          doom-modeline
-          doom-themes
-          evil
-          evil-collection
-          evil-commentary
-          evil-matchit
-          evil-numbers
-          evil-surround
-          evil-visualstar
-          flycheck
-          highlight-parentheses
-          htmlize
-          hydra
-          lsp-mode
-          magit
-          markdown-mode
-          markdown-toc
-          org-superstar
-          ox-pandoc
-          ripgrep
-          spinner
-          treemacs
-          xclip
-        ]);
-    };
-
     neovim = {
       enable = true;
       viAlias = true;
@@ -390,6 +358,5 @@ in
 
   home.file.".config/nvim/lua".source = ./nvim/lua;
   home.file.".config/srv".source = ./srv;
-  home.file.".emacs.d/init.el".source = ./init.el;
 
 }

home/init.el

@@ -1,95 +0,0 @@
-;; Enable Mouse
-(xterm-mouse-mode)
-
-;; Enable xclip
-(require 'xclip)
-(define-globalized-minor-mode global-xclip-mode
-  xclip-mode xclip-mode)
-(global-xclip-mode 1)
-
-;; Set up fonts early.
-(set-face-attribute 'default
-                     nil
-                     :height 120
-                     :family "Fira Code Mono")
-(set-face-attribute 'variable-pitch
-                     nil
-                     :family "Fira CodeSans")
-
-;; Fix clipboard
-(setq select-enable-clipboard t)
-
-;; Enable Line Numbers
-(global-display-line-numbers-mode 1)
-
-;; Disable lock files
-(setq create-lockfiles nil)
-
-;; Enable Evil
-(setq evil-want-C-i-jump nil)
-(require 'evil)
-(evil-mode 1)
-
-;; Set Theme
-(load-theme 'doom-gruvbox t)
-
-;; Disable startup message.
-(setq inhibit-startup-message t
-      inhibit-startup-echo-area-message (user-login-name))
-
-;; Accept 'y' and 'n' rather than 'yes' and 'no'.
-(defalias 'yes-or-no-p 'y-or-n-p)
-
-;; Centaur Tabs
-(require 'centaur-tabs)
-(centaur-tabs-mode t)
-(global-set-key (kbd "C-<prior>")  'centaur-tabs-backward)
-(global-set-key (kbd "C-<next>") 'centaur-tabs-forward)
-(setq centaur-tabs-style "bar"
-      centaur-tabs-height 32
-      centaur-tabs-set-icons t
-      centaur-tabs-set-modified-marker t
-      centaur-tabs-set-bar 'under
-      x-underline-at-descent-line t)
-
-;; Trailing white space
-(setq-default show-trailing-whitespace t)
-
-;; Prefer UTF-8.
-(prefer-coding-system 'utf-8)
-
-;; Disable some GUI distractions.
-(tool-bar-mode -1)
-(blink-cursor-mode 0)
-
-;; Enable highlighting of current line.
-(global-hl-line-mode 1)
-
-;; Always show line and column number in the mode line.
-(line-number-mode)
-(column-number-mode)
-
-;; Increment and decrement numbers easily
-(global-set-key (kbd "C-c +") 'evil-numbers/inc-at-pt)
-(global-set-key (kbd "C-c -") 'evil-numbers/dec-at-pt)
-
-;; Enable Mouse scrolling
-(unless (display-graphic-p)
-  ;; activate mouse-based scrolling
-  (xterm-mouse-mode 1)
-  (global-set-key (kbd "<mouse-4>") 'scroll-down-line)
-  (global-set-key (kbd "<mouse-5>") 'scroll-up-line)
-  )
-
-;; Enable Flycheck
-(global-flycheck-mode)
-(setq-default flycheck-disabled-checkers '(emacs-lisp-checkdoc))
-
-;; An easier way to toggle comments
-(evil-commentary-mode)
-
-;; Enable transient mark mode
-(transient-mark-mode 1)
-
-;;;;Org mode configuration
-(require 'org)