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: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
..
compare: 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

No commits in common. "d45458eb0d9c31c664297eb2e51908075f6ce57d" and "0d0ca74c8a45899b5576859581ebf30be0ffccb1" have entirely different histories.
d45458eb0d ... 0d0ca74c8a

3 changed files with 28 additions and 35 deletions
Show Stats Expand all files Collapse all files

36
flake.lock generated
View File

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

4
machines/nucturne/default.nix
View File

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

21
modules/emacs/default.el
View File

@ -386,9 +386,6 @@
;;(add-hook 'rustic-mode-hook 'company-mode)
;;(add-hook 'rustic-mode-hook 'flymake-mode)
(use-package rust-mode
:after lsp-mode rust-mode)
(use-package rustic
:after lsp-mode
:config
@ -396,24 +393,18 @@
(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-format-trigger 'on-save)
(rustic-rustfmt-bin "rustfmt")
(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-enable skip_trivial)
(lsp-rust-analyzer-display-lifetime-elision-hints-use-parameter-names t)
(lsp-rust-analyzer-dispaly-chaining-hints t)
(lsp-rust-analyzer-proc-macro-enable t)
(lsp-rust-analyzer-experimental-proc-attr-macros t)
:hook
;;(rustic-mode . company-mode)
(rustic-mode . company-mode)
(rustic . lsp-rust-analyzer-inlay-hints-mode)
(rustic . apheleia-mode)
;;(rustic-mode . flymake-mode)
)
@ -545,7 +536,7 @@
python-mode
;; ess-mode
;; ruby-mode
rustic-mode
rust-mode
sql-mode
rustic
typescript-mode
@ -567,6 +558,8 @@
(lsp-ui-doc-border "#586e75")
(lsp-ui-doc-header 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-keymap-prefix "C-l"))
;:custom-face