diff --git a/flake.lock b/flake.lock index f871d17..b6a44a9 100644 --- a/flake.lock +++ b/flake.lock @@ -211,15 +211,15 @@ "lix": { "flake": false, "locked": { - "lastModified": 1737234286, - "narHash": "sha256-pgDJZjj4jpzkFxsqBTI/9Yb0n3gW+DvDtuv9SwQZZcs=", - "rev": "079528098f5998ba13c88821a2eca1005c1695de", + "lastModified": 1750345799, + "narHash": "sha256-L1p9RbZMXS2Ac0d61dgi1QlzN1CrfQIMtrB3/t5M2ag=", + "rev": "fbd6a014ec8e540b817cc18020ff47f4a14f143d", "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": { "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": { @@ -232,15 +232,15 @@ ] }, "locked": { - "lastModified": 1742943028, - "narHash": "sha256-fprwZKE1uMzO9tiWWOrmLWBW3GPkMayQfb0xOvVFIno=", - "rev": "868d97695bab9d21f6070b03957bcace249fbe3c", + "lastModified": 1748803223, + "narHash": "sha256-FXndw1CihZcqQu49DziuMQuc0fG8L0nvGkm0JHZKimo=", + "rev": "2226eb3b97f0f89fdcd5bf2d0a2c7723cf771a62", "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": { "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": { diff --git a/flake.nix b/flake.nix index 9001a51..b61c19a 100644 --- a/flake.nix +++ b/flake.nix @@ -12,7 +12,7 @@ #}; 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"; }; @@ -94,7 +94,6 @@ "steam-run" "steam-runtime" "steam-unwrapped" - "skypeforlinux" "teams" "vscode-extension-ms-vscode-cpptools" "zoom" diff --git a/modules/communication.nix b/modules/communication.nix index eadca7f..3517488 100644 --- a/modules/communication.nix +++ b/modules/communication.nix @@ -16,7 +16,8 @@ with lib; { element-desktop jitsi-meet-electron signal-desktop - skypeforlinux + # skype is no longer existing + #skypeforlinux #remove teams as MS has removed the linux packages from their servers #teams unstable.zoom-us diff --git a/packages/emacs/default.el b/packages/emacs/default.el index 64e356c..0f97197 100644 --- a/packages/emacs/default.el +++ b/packages/emacs/default.el @@ -389,32 +389,32 @@ (use-package rust-mode :after lsp-mode rust-mode) -(use-package rustic - :after lsp-mode - :config -;; (add-to-list 'flycheck-checkers 'rustic-clippy) - (lsp-diagnostics-flycheck-enable) - (push 'rustic-clippy flycheck-checkers) - ;; (flycheck-add-next-checker 'lsp 'rustic-clippy) - :mode ("\\.rs\\'" . rustic-mode) - :custom -; (rustic-format-trigger 'on-save) - (rustic-flycheck-clippy-params "--message-format=json") - (lsp-rust-analyzer-server-display-inlay-hints t) - (lsp-inlay-hint-enable t) - (lsp-rust-analyzer-cargo-watch-command "clippy") - (lsp-rust-analyzer-display-parameter-hints t) - (lsp-rust-analyzer-display-chaining-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-proc-macro-enable t) - (lsp-rust-analyzer-experimental-proc-attr-macros t) - :hook - ;;(rustic-mode . company-mode) - ;;(rustic . lsp-rust-analyzer-inlay-hints-mode) - (rustic . apheleia-mode) - ;;(rustic-mode . flymake-mode) - ) +;; (use-package rustic +;; :after lsp-mode +;; :config +;; ;; (add-to-list 'flycheck-checkers 'rustic-clippy) +;; (lsp-diagnostics-flycheck-enable) +;; (push 'rustic-clippy flycheck-checkers) +;; ;; (flycheck-add-next-checker 'lsp 'rustic-clippy) +;; :mode ("\\.rs\\'" . rustic-mode) +;; :custom +;; ; (rustic-format-trigger 'on-save) +;; (rustic-flycheck-clippy-params "--message-format=json") +;; (lsp-rust-analyzer-server-display-inlay-hints t) +;; (lsp-inlay-hint-enable t) +;; (lsp-rust-analyzer-cargo-watch-command "clippy") +;; (lsp-rust-analyzer-display-parameter-hints t) +;; (lsp-rust-analyzer-display-chaining-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-proc-macro-enable t) +;; (lsp-rust-analyzer-experimental-proc-attr-macros t) +;; :hook +;; ;;(rustic-mode . company-mode) +;; ;;(rustic . lsp-rust-analyzer-inlay-hints-mode) +;; (rustic . apheleia-mode) +;; ;;(rustic-mode . flymake-mode) +;; ) ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; ;;;;;;;;;;;;;;;; beacon ;;;;;;;;;;;;;;;;; @@ -463,19 +463,19 @@ :config (yas-global-mode t)) -;; dap -(use-package dap-mode - :ensure - :after (lsp-mode dap-cpptools) - :custom - (dap-mode t) - (dap-ui-mode t) - (dap-ui-controls-mode t) - (dap-tooltip-mode t)) -(use-package dap-cpptools - :custom - (dap-cpptools-debug-path elss/paths/cpptools) - (dap-cpptools-debug-program `(,elss/paths/cpptools-program))) +;; ;; dap +;; (use-package dap-mode +;; :ensure +;; :after (lsp-mode dap-cpptools) +;; :custom +;; (dap-mode t) +;; (dap-ui-mode t) +;; (dap-ui-controls-mode t) +;; (dap-tooltip-mode t)) +;; (use-package dap-cpptools +;; :custom +;; (dap-cpptools-debug-path elss/paths/cpptools) +;; (dap-cpptools-debug-program `(,elss/paths/cpptools-program))) ;; flycheck @@ -500,7 +500,7 @@ ("\\.rls\\'" . pasp-mode)) ;; sparql -(use-package sparql-mode) +;(use-package sparql-mode) ;; json (use-package json-mode @@ -544,9 +544,9 @@ python-mode ;; ess-mode ;; ruby-mode - rustic-mode + ;; rustic-mode sql-mode - rustic + ;; rustic typescript-mode vue-mode ;; xml-mode diff --git a/packages/emacs/default.nix b/packages/emacs/default.nix index 7d9da37..9ad1c80 100644 --- a/packages/emacs/default.nix +++ b/packages/emacs/default.nix @@ -83,7 +83,7 @@ with lib; let company-quickhelp company-reftex cov - dap-mode + #dap-mode diminish direnv dockerfile-mode @@ -118,10 +118,10 @@ with lib; let pdf-tools projectile projectile-ripgrep - rustic + #rustic spacemacs-theme solarized-theme - sparql-mode + #sparql-mode sudo-edit #use-package #vscode-dark-plus-theme @@ -140,3 +140,4 @@ in # url = https://github.com/nix-community/emacs-overlay/archive/master.tar.gz; # })) #]; +