This commit is contained in:
Alexander Bantyev 2021-10-29 18:51:45 +03:00
parent 398a54fbaa
commit a9fa65bf05
Signed by: balsoft
GPG Key ID: E081FF12ADCB4AD5
4 changed files with 32 additions and 29 deletions

View File

@ -120,11 +120,11 @@
}, },
"emacs-overlay": { "emacs-overlay": {
"locked": { "locked": {
"lastModified": 1634894954, "lastModified": 1635442555,
"narHash": "sha256-jtMHKW7azForQWsPZwFBVd6q8l9isvj9ZsDwakaBF+M=", "narHash": "sha256-jmyXAFevCDcIi9EqBVEu+NbAbjJK8Z2SVldk4vCX5L8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "e594a3e8a7d0fbed07a4ed61a7b3eb8f15ece547", "rev": "f0adc9b0fc342e78969bc7eed41d2a8463b02470",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -236,11 +236,11 @@
"utils": "utils_2" "utils": "utils_2"
}, },
"locked": { "locked": {
"lastModified": 1633903606, "lastModified": 1635436840,
"narHash": "sha256-JbNJfOyh+3bYzPboH6rnrK5c8o7x1KZBuEuNlyBkjSc=", "narHash": "sha256-6FJsbugjqT7A1gmUfsUP0Kt4VX1eRiZkoee4GIu+JCg=",
"owner": "soywod", "owner": "soywod",
"repo": "himalaya", "repo": "himalaya",
"rev": "767eee95f52f86000b76f2f10dde951046214bff", "rev": "ae31f48bb546f842f0fb9e36288ecba9cec8890d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -254,11 +254,11 @@
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1634851225, "lastModified": 1635394434,
"narHash": "sha256-fwtGHHl7fTELucIRBKO5JORD8QP9Lo9PwY9nrJuEybE=", "narHash": "sha256-aOllNFaasxQalCt2D0FXrgOMsn0TZZue42uNkjH896I=",
"owner": "rycee", "owner": "rycee",
"repo": "home-manager", "repo": "home-manager",
"rev": "cfe82d9f444a1b77f135070f1c1ee63fa061f2fd", "rev": "158bc593983ef26daeb9cc73fd659f64b4d1998a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -367,11 +367,11 @@
"nheko": { "nheko": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1634484839, "lastModified": 1635238949,
"narHash": "sha256-51PlMOILa85ESUJANu1Gd3yKeq9WEPgleAM8eqdpPlc=", "narHash": "sha256-9Xo0ThJ2UpgNhG52aPGZYy4WS1DM05/FZMiGyIvUvNw=",
"owner": "nheko-reborn", "owner": "nheko-reborn",
"repo": "nheko", "repo": "nheko",
"rev": "2981f71d2268087b04f6dfef2fd0d42a4f786b4d", "rev": "923b8157134389598b3071824d8b7ce015806968",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -386,11 +386,11 @@
"nixpkgs": "nixpkgs_6" "nixpkgs": "nixpkgs_6"
}, },
"locked": { "locked": {
"lastModified": 1634663590, "lastModified": 1635424607,
"narHash": "sha256-TW3z00SiskhsZdo7ci8MpNPv+rrgsZcHloZGhDYI+UI=", "narHash": "sha256-Yumem7c3rcngTaPtUc/yms3Imi5P6dVMPmy0GnHyCWw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nix", "repo": "nix",
"rev": "4a2b7cc68c7d11ec126bc412ffea838e629345af", "rev": "bc4b7521f4a72de1d7a9db0b5be76885e0729e7c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -529,11 +529,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1634909784, "lastModified": 1635451965,
"narHash": "sha256-dVb8knllmLJqbOo3zT1jTe/7gMCUd+GCT2W5M36cxMY=", "narHash": "sha256-a5J4ySrVTFER3cyCQ7LOvXl0RxqKHL6Dmi3JfbfDY+M=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2b6b25e6063ba921e4ff24385eebc03c76d222ff", "rev": "678d0bfff1384068f8226ecce6b162718f52262a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -589,11 +589,11 @@
}, },
"nixpkgs_8": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1634782485, "lastModified": 1635403963,
"narHash": "sha256-psfh4OQSokGXG0lpq3zKFbhOo3QfoeudRcaUnwMRkQo=", "narHash": "sha256-0actzfzBAXvvDJ/EvPSGbtCPXUwSObQrcq0RpsPWZgA=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "34ad3ffe08adfca17fcb4e4a47bb5f3b113687be", "rev": "2deb07f3ac4eeb5de1c12c4ba2911a2eb1f6ed61",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -56,7 +56,6 @@ in {
counsel-tramp counsel-tramp
ix ix
magit magit
xah-fly-keys
arduino-mode arduino-mode
elixir-mode elixir-mode
company-box company-box
@ -80,6 +79,7 @@ in {
crdt crdt
base16-theme base16-theme
org-caldav org-caldav
evil
]; ];
}; };

View File

@ -39,12 +39,16 @@
(setq auto-save-default nil) (setq auto-save-default nil)
(setq make-backup-files nil) (setq make-backup-files nil)
(use-package xah-fly-keys ;; (use-package xah-fly-keys
;; :config
;; (xah-fly-keys-set-layout "qwerty")
;; (xah-fly-keys 1)
;; (define-key xah-fly-insert-map (kbd "M-SPC") 'xah-fly-command-mode-activate)
;; )
(use-package evil
:config :config
(xah-fly-keys-set-layout "qwerty") (evil-mode 1))
(xah-fly-keys 1)
(define-key xah-fly-insert-map (kbd "M-SPC") 'xah-fly-command-mode-activate)
)
(global-set-key (kbd "C-b") 'switch-to-buffer) (global-set-key (kbd "C-b") 'switch-to-buffer)
@ -207,8 +211,6 @@
(setq initial-major-mode 'text-mode) (setq initial-major-mode 'text-mode)
(setq initial-buffer-choice 'xah-new-empty-buffer)
(defun compile-on-save-start () (defun compile-on-save-start ()
(let ((buffer (compilation-find-buffer))) (let ((buffer (compilation-find-buffer)))
(unless (get-buffer-process buffer) (unless (get-buffer-process buffer)

View File

@ -151,6 +151,7 @@ in {
src = inputs.mtxclient; src = inputs.mtxclient;
cmakeFlags = oa.cmakeFlags ++ [ "-DCMAKE_CXX_FLAGS=-DSPDLOG_FMT_EXTERNAL" ]; cmakeFlags = oa.cmakeFlags ++ [ "-DCMAKE_CXX_FLAGS=-DSPDLOG_FMT_EXTERNAL" ];
buildInputs = oa.buildInputs ++ [ self.libevent self.curl.all self.coeurl self.spdlog.dev ]; buildInputs = oa.buildInputs ++ [ self.libevent self.curl.all self.coeurl self.spdlog.dev ];
patches = [];
}); });
nheko = (super.nheko.overrideAttrs (oa: { nheko = (super.nheko.overrideAttrs (oa: {