ellmau/nixos
1
0
Fork 0
mirror of https://github.com/ellmau/nixos.git synced 2025-12-20 09:39:39 +01:00
Code Issues Projects Releases Wiki Activity

[emacs,lix] fix emacs package and update lix

Browse Source
This commit is contained in:
Stefan Ellmauthaler 2025-06-20 19:10:48 +02:00
parent 1a762f1b04
commit f584fa356a
5 changed files with 59 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
flake.lock generated
View File

@ -211,15 +211,15 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1737234286, "lastModified": 1750345799,
"narHash": "sha256-pgDJZjj4jpzkFxsqBTI/9Yb0n3gW+DvDtuv9SwQZZcs=", "narHash": "sha256-L1p9RbZMXS2Ac0d61dgi1QlzN1CrfQIMtrB3/t5M2ag=",
"rev": "079528098f5998ba13c88821a2eca1005c1695de", "rev": "fbd6a014ec8e540b817cc18020ff47f4a14f143d",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/079528098f5998ba13c88821a2eca1005c1695de.tar.gz?rev=079528098f5998ba13c88821a2eca1005c1695de" "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/fbd6a014ec8e540b817cc18020ff47f4a14f143d.tar.gz?rev=fbd6a014ec8e540b817cc18020ff47f4a14f143d"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/lix-project/lix/archive/release-2.92.tar.gz" "url": "https://git.lix.systems/lix-project/lix/archive/release-2.93.tar.gz"
} }
}, },
"lix-module": { "lix-module": {
@ -232,15 +232,15 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1742943028, "lastModified": 1748803223,
"narHash": "sha256-fprwZKE1uMzO9tiWWOrmLWBW3GPkMayQfb0xOvVFIno=", "narHash": "sha256-FXndw1CihZcqQu49DziuMQuc0fG8L0nvGkm0JHZKimo=",
"rev": "868d97695bab9d21f6070b03957bcace249fbe3c", "rev": "2226eb3b97f0f89fdcd5bf2d0a2c7723cf771a62",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/868d97695bab9d21f6070b03957bcace249fbe3c.tar.gz" "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/2226eb3b97f0f89fdcd5bf2d0a2c7723cf771a62.tar.gz?rev=2226eb3b97f0f89fdcd5bf2d0a2c7723cf771a62"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0-3.tar.gz" "url": "https://git.lix.systems/lix-project/nixos-module/archive/release-2.93.tar.gz"
} }
}, },
"naersk": { "naersk": {

3
flake.nix
View File

@ -12,7 +12,7 @@
#}; #};
lix-module = { lix-module = {
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0-3.tar.gz"; url = "https://git.lix.systems/lix-project/nixos-module/archive/release-2.93.tar.gz";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
@ -94,7 +94,6 @@
"steam-run" "steam-run"
"steam-runtime" "steam-runtime"
"steam-unwrapped" "steam-unwrapped"
"skypeforlinux"
"teams" "teams"
"vscode-extension-ms-vscode-cpptools" "vscode-extension-ms-vscode-cpptools"
"zoom" "zoom"

3
modules/communication.nix
View File

@ -16,7 +16,8 @@ with lib; {
element-desktop element-desktop
jitsi-meet-electron jitsi-meet-electron
signal-desktop signal-desktop
skypeforlinux # skype is no longer existing
#skypeforlinux
#remove teams as MS has removed the linux packages from their servers #remove teams as MS has removed the linux packages from their servers
#teams #teams
unstable.zoom-us unstable.zoom-us

84
packages/emacs/default.el
View File

@ -389,32 +389,32 @@
(use-package rust-mode (use-package rust-mode
:after lsp-mode rust-mode) :after lsp-mode rust-mode)
(use-package rustic ;; (use-package rustic
:after lsp-mode ;; :after lsp-mode
:config ;; :config
;; (add-to-list 'flycheck-checkers 'rustic-clippy) ;; ;; (add-to-list 'flycheck-checkers 'rustic-clippy)
(lsp-diagnostics-flycheck-enable) ;; (lsp-diagnostics-flycheck-enable)
(push 'rustic-clippy flycheck-checkers) ;; (push 'rustic-clippy flycheck-checkers)
;; (flycheck-add-next-checker 'lsp 'rustic-clippy) ;; ;; (flycheck-add-next-checker 'lsp 'rustic-clippy)
:mode ("\\.rs\\'" . rustic-mode) ;; :mode ("\\.rs\\'" . rustic-mode)
:custom ;; :custom
; (rustic-format-trigger 'on-save) ;; ; (rustic-format-trigger 'on-save)
(rustic-flycheck-clippy-params "--message-format=json") ;; (rustic-flycheck-clippy-params "--message-format=json")
(lsp-rust-analyzer-server-display-inlay-hints t) ;; (lsp-rust-analyzer-server-display-inlay-hints t)
(lsp-inlay-hint-enable t) ;; (lsp-inlay-hint-enable t)
(lsp-rust-analyzer-cargo-watch-command "clippy") ;; (lsp-rust-analyzer-cargo-watch-command "clippy")
(lsp-rust-analyzer-display-parameter-hints t) ;; (lsp-rust-analyzer-display-parameter-hints t)
(lsp-rust-analyzer-display-chaining-hints t) ;; (lsp-rust-analyzer-display-chaining-hints t)
(lsp-rust-analyzer-display-closure-return-type-hints t) ;; (lsp-rust-analyzer-display-closure-return-type-hints t)
(lsp-rust-analyzer-display-lifetime-elision-hints-use-parameter-names t) ;; (lsp-rust-analyzer-display-lifetime-elision-hints-use-parameter-names t)
(lsp-rust-analyzer-proc-macro-enable t) ;; (lsp-rust-analyzer-proc-macro-enable t)
(lsp-rust-analyzer-experimental-proc-attr-macros t) ;; (lsp-rust-analyzer-experimental-proc-attr-macros t)
:hook ;; :hook
;;(rustic-mode . company-mode) ;; ;;(rustic-mode . company-mode)
;;(rustic . lsp-rust-analyzer-inlay-hints-mode) ;; ;;(rustic . lsp-rust-analyzer-inlay-hints-mode)
(rustic . apheleia-mode) ;; (rustic . apheleia-mode)
;;(rustic-mode . flymake-mode) ;; ;;(rustic-mode . flymake-mode)
) ;; )
;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; ;;;;;;;;;;;;;;;; beacon ;;;;;;;;;;;;;;;;; ;; ;;;;;;;;;;;;;;;; beacon ;;;;;;;;;;;;;;;;;
@ -463,19 +463,19 @@
:config :config
(yas-global-mode t)) (yas-global-mode t))
;; dap ;; ;; dap
(use-package dap-mode ;; (use-package dap-mode
:ensure ;; :ensure
:after (lsp-mode dap-cpptools) ;; :after (lsp-mode dap-cpptools)
:custom ;; :custom
(dap-mode t) ;; (dap-mode t)
(dap-ui-mode t) ;; (dap-ui-mode t)
(dap-ui-controls-mode t) ;; (dap-ui-controls-mode t)
(dap-tooltip-mode t)) ;; (dap-tooltip-mode t))
(use-package dap-cpptools ;; (use-package dap-cpptools
:custom ;; :custom
(dap-cpptools-debug-path elss/paths/cpptools) ;; (dap-cpptools-debug-path elss/paths/cpptools)
(dap-cpptools-debug-program `(,elss/paths/cpptools-program))) ;; (dap-cpptools-debug-program `(,elss/paths/cpptools-program)))
;; flycheck ;; flycheck
@ -500,7 +500,7 @@
("\\.rls\\'" . pasp-mode)) ("\\.rls\\'" . pasp-mode))
;; sparql ;; sparql
(use-package sparql-mode) ;(use-package sparql-mode)
;; json ;; json
(use-package json-mode (use-package json-mode
@ -544,9 +544,9 @@
python-mode python-mode
;; ess-mode ;; ess-mode
;; ruby-mode ;; ruby-mode
rustic-mode ;; rustic-mode
sql-mode sql-mode
rustic ;; rustic
typescript-mode typescript-mode
vue-mode vue-mode
;; xml-mode ;; xml-mode

7
packages/emacs/default.nix
View File

@ -83,7 +83,7 @@ with lib; let
company-quickhelp company-quickhelp
company-reftex company-reftex
cov cov
dap-mode #dap-mode
diminish diminish
direnv direnv
dockerfile-mode dockerfile-mode
@ -118,10 +118,10 @@ with lib; let
pdf-tools pdf-tools
projectile projectile
projectile-ripgrep projectile-ripgrep
rustic #rustic
spacemacs-theme spacemacs-theme
solarized-theme solarized-theme
sparql-mode #sparql-mode
sudo-edit sudo-edit
#use-package #use-package
#vscode-dark-plus-theme #vscode-dark-plus-theme
@ -140,3 +140,4 @@ in
# url = https://github.com/nix-community/emacs-overlay/archive/master.tar.gz; # url = https://github.com/nix-community/emacs-overlay/archive/master.tar.gz;
# })) # }))
#]; #];