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

Compare commits

base: ellmau:0d0ca74c8a45899b5576859581ebf30be0ffccb1
Branches Tags
ellmau:main
ellmau:fix/zsh
ellmau:flake/packages
ellmau:release-23.05
ellmau:xmonad
ellmau:dap-mode
ellmau:service/gitea
ellmau:swayfy
ellmau:redesign/flake
..
compare: ellmau:d45458eb0d9c31c664297eb2e51908075f6ce57d
Branches Tags
ellmau:main
ellmau:fix/zsh
ellmau:flake/packages
ellmau:release-23.05
ellmau:xmonad
ellmau:dap-mode
ellmau:service/gitea
ellmau:swayfy
ellmau:redesign/flake

6 Commits
0d0ca74c8a ... d45458eb0d

Author SHA1 Message Date
Stefan Ellmauthaler
d45458eb0d
Fix inlay hint mode 2023-05-08 17:46:44 +02:00
Stefan Ellmauthaler
4bce5ef127
Fix typo in default.el (emacs) and set default dm for nucturne 2023-05-08 17:23:03 +02:00
Stefan Ellmauthaler
ee0f19b323
config for rust-mode 2023-05-08 15:45:59 +02:00
Stefan Ellmauthaler
4ed287f7aa
further updates to the emacs config 2023-05-08 15:38:09 +02:00
Stefan Ellmauthaler
a76e72214f
Fix inlay mode 
note: still not working completely
 2023-05-08 15:23:14 +02:00
Stefan Ellmauthaler
b3002bd5b4
flake.lock: Update 
Flake lock file updates:

• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/5f9bc90bd2fd0bf53cc4e2643b083fa75b358461' (2023-05-04)
  → 'github:nix-community/emacs-overlay/a160e897d1f9f3b0fedf191a79d8ab99a09bcfd6' (2023-05-08)
• Updated input 'nixos-hardware':
    'github:NixOS/nixos-hardware/7dc46304675f4ff2d6be921ef60883efd31363c4' (2023-05-02)
  → 'github:NixOS/nixos-hardware/51559e691f1493a26f94f1df1aaf516bb507e78b' (2023-05-05)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/54495a4eafe99c537695a87fe04cb50bf17e651d' (2023-05-03)
  → 'github:NixOS/nixpkgs/c568239bcc990050b7aedadb7387832440ad8fb1' (2023-05-07)
• Updated input 'nixpkgs-unstable':
    'github:NixOS/nixpkgs/1a411f23ba299db155a5b45d5e145b85a7aafc42' (2023-05-02)
  → 'github:NixOS/nixpkgs/897876e4c484f1e8f92009fd11b7d988a121a4e7' (2023-05-06)
• Updated input 'sops-nix':
    'github:Mic92/sops-nix/4f308f76633f81253a12b80e7b05b80d325005b2' (2023-04-30)
  → 'github:Mic92/sops-nix/2e77ca66d8362ebf4b3112489068ce9f38d5cb3f' (2023-05-08)
• Updated input 'sops-nix/nixpkgs-stable':
    'github:NixOS/nixpkgs/db1e4eeb0f9a9028bcb920e00abbc1409dd3ef36' (2023-04-30)
  → 'github:NixOS/nixpkgs/d724b57823f2ab2c879a840a426a607bbab2b730' (2023-05-06)
 2023-05-08 12:16:08 +02:00
3 changed files with 35 additions and 28 deletions
Show Stats Expand all files Collapse all files

36
flake.lock generated
View File

@ -71,11 +71,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1683192256, "lastModified": 1683537168,
"narHash": "sha256-645O+c4RrEJeTFqDj+iWcEx8YnDPkTgqH9U51TVhvfc=", "narHash": "sha256-lVon2uTdnH9vgQA0NfhF+FIZ/YaRrZqIHZwUAfxx2Oo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "5f9bc90bd2fd0bf53cc4e2643b083fa75b358461", "rev": "a160e897d1f9f3b0fedf191a79d8ab99a09bcfd6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -229,11 +229,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1683009613, "lastModified": 1683269598,
"narHash": "sha256-jJh8JaoHOLlk7iFLgZk1PlxCCNA2KTKfOLMLCa9mduA=", "narHash": "sha256-KNsb+nBbB1Fmxd07dt4E0KXMT4YeKJB7gQaA6Xfk+mo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "7dc46304675f4ff2d6be921ef60883efd31363c4", "rev": "51559e691f1493a26f94f1df1aaf516bb507e78b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -292,11 +292,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1682817260, "lastModified": 1683401577,
"narHash": "sha256-kFMXzKNj4d/0Iqbm5l57rHSLyUeyCLMuvlROZIuuhvk=", "narHash": "sha256-sOtJKZZ9HWqcGg2hRj6O4HX9pOFfTzgYgSi+MN1HEWo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "db1e4eeb0f9a9028bcb920e00abbc1409dd3ef36", "rev": "d724b57823f2ab2c879a840a426a607bbab2b730",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -308,11 +308,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1683014792, "lastModified": 1683408522,
"narHash": "sha256-6Va9iVtmmsw4raBc3QKvQT2KT/NGRWlvUlJj46zN8B8=", "narHash": "sha256-9kcPh6Uxo17a3kK3XCHhcWiV1Yu1kYj22RHiymUhMkU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1a411f23ba299db155a5b45d5e145b85a7aafc42", "rev": "897876e4c484f1e8f92009fd11b7d988a121a4e7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -324,11 +324,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1683103914, "lastModified": 1683478192,
"narHash": "sha256-Mbrst3sLaiL55eOlZOEL8kB+XTWffaQVfcI03YWiryg=", "narHash": "sha256-7f7RR71w0jRABDgBwjq3vE1yY3nrVJyXk8hDzu5kl1E=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "54495a4eafe99c537695a87fe04cb50bf17e651d", "rev": "c568239bcc990050b7aedadb7387832440ad8fb1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -384,11 +384,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1682823324, "lastModified": 1683521893,
"narHash": "sha256-KNu3OAqVyoKwnDP+gqptjQYCnZXxEwXccR89c0r1/8k=", "narHash": "sha256-9447+MD2BD64w+12tXOIjacBhRk9NH36HAWrDo5QiUQ=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "4f308f76633f81253a12b80e7b05b80d325005b2", "rev": "2e77ca66d8362ebf4b3112489068ce9f38d5cb3f",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
machines/nucturne/default.nix
View File

@ -19,9 +19,9 @@
# enable X11 with lightdm and i3 # enable X11 with lightdm and i3
graphical = { graphical = {
enable = true; enable = true;
sway.enable = false; sway.enable = true;
i3.enable = false; i3.enable = false;
plasma.enable = true; plasma.enable = false;
# set dpi if used in mobile applications # set dpi if used in mobile applications
# dpi = 180; # dpi = 180;
}; };

23
modules/emacs/default.el
View File

@ -386,25 +386,34 @@
;;(add-hook 'rustic-mode-hook 'company-mode) ;;(add-hook 'rustic-mode-hook 'company-mode)
;;(add-hook 'rustic-mode-hook 'flymake-mode) ;;(add-hook 'rustic-mode-hook 'flymake-mode)
(use-package 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)
:custom :custom
(rustic-format-trigger 'on-save) ; (rustic-format-trigger 'on-save)
(rustic-rustfmt-bin "rustfmt")
(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-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-dispaly-chaining-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-enable skip_trivial)
(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)
: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-mode . flymake-mode) ;;(rustic-mode . flymake-mode)
) )
@ -536,7 +545,7 @@
python-mode python-mode
;; ess-mode ;; ess-mode
;; ruby-mode ;; ruby-mode
rust-mode rustic-mode
sql-mode sql-mode
rustic rustic
typescript-mode typescript-mode
@ -558,8 +567,6 @@
(lsp-ui-doc-border "#586e75") (lsp-ui-doc-border "#586e75")
(lsp-ui-doc-header t) (lsp-ui-doc-header t)
(lsp-ui-doc-include-signature t) (lsp-ui-doc-include-signature t)
(lsp-rust-analyzer-server-display-inlay-hints t)
(lsp-rust-analyzer-inlay-hints-mode t)
(lsp-rust-analyzer-cargo-watch-command "clippy") (lsp-rust-analyzer-cargo-watch-command "clippy")
(lsp-keymap-prefix "C-l")) (lsp-keymap-prefix "C-l"))
;:custom-face ;:custom-face