Compare commits

..

No commits in common. "31ad79b1b906d0630fdde131d6ad2b519543c4ea" and "567e965f03a80e1d55e2cc7e77d776c06133c3f8" have entirely different histories.

5 changed files with 38 additions and 53 deletions

View file

@ -56,11 +56,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719213809, "lastModified": 1718898629,
"narHash": "sha256-s7dGKRFHjizKv+mqaAd/7BmwPphNM6XMGqtC40sqzWM=", "narHash": "sha256-w465ZQEqZQ/mJKxBs4y/L+Wh5EiuTFYGEfnIgxvmFcs=",
"owner": "atuinsh", "owner": "atuinsh",
"repo": "atuin", "repo": "atuin",
"rev": "8956142cc5b4f5636ae1943f81bf2c22864b8dba", "rev": "b06b7b509a454656d92196c8a58071e4f0d76e09",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -197,11 +197,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719193457, "lastModified": 1718846788,
"narHash": "sha256-ByDySG4oQN6KzLCuJjTax6+cMVtOixuYuu2GnnoPpoI=", "narHash": "sha256-9dtXYtEkmXoUJV+PGLqscqF7qTn4AIhAKpFWRFU2NYs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "50d4d13fbac5db81f8c1e79d95ad87a2970b9201", "rev": "e1174d991944a01eaaa04bc59c6281edca4c0e6e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -221,11 +221,11 @@
"nixpkgs-stable": "nixpkgs-stable_2" "nixpkgs-stable": "nixpkgs-stable_2"
}, },
"locked": { "locked": {
"lastModified": 1719193216, "lastModified": 1718960968,
"narHash": "sha256-4jggHHDsLt+i4/6lMNlZkHd3bzgV50feNpZGe4X3eMQ=", "narHash": "sha256-5DzqO4O3ZKPGx1dO5QhwCGBaI4bPTg2BSWSzasTYdmM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "e3e9ef4c9904fddbd8c00f3288e6a3be26a6bf0b", "rev": "728439cd9e68339c306d6152b8950dcb87e604cf",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -587,11 +587,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719180626, "lastModified": 1718788307,
"narHash": "sha256-vZAzm5KQpR6RGple1dzmSJw5kPivES2heCFM+ZWkt0I=", "narHash": "sha256-SqiOz0sljM0GjyQEVinPXQxaGcbOXw5OgpCWGPgh/vo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "6b1f90a8ff92e81638ae6eb48cd62349c3e387bb", "rev": "d7830d05421d0ced83a0f007900898bdcaf2a2ca",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -611,11 +611,11 @@
"spectrum": "spectrum" "spectrum": "spectrum"
}, },
"locked": { "locked": {
"lastModified": 1719185120, "lastModified": 1718483375,
"narHash": "sha256-xsdESZDwOs0o96VlZNxThfLG8HW+qT2c7dYypGGUYXg=", "narHash": "sha256-VvD7zmbEn9Ua8w2wAMcIBXD09QqG1Ra5bNjhd1eqhOo=",
"owner": "astro", "owner": "astro",
"repo": "microvm.nix", "repo": "microvm.nix",
"rev": "146fec824fe8e06454e211a14ce29b5f692ad078", "rev": "b11f00056e11a802809935b0675176a2429593d9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -679,11 +679,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719163360, "lastModified": 1718260327,
"narHash": "sha256-+G3xCI3eiZiT7Uj5Rwl8vBTOGUi3TjaclUbfW+3nt7E=", "narHash": "sha256-P2PsdY2kLin3S0AW7dYWWI+1/a/+onp3KaAz8O32EnY=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-ld-rs", "repo": "nix-ld-rs",
"rev": "311caa66689611bde0c90fe92ddfc9b0d85253fa", "rev": "753a1539846e6f75c88583777a3f6e40f4064302",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -694,11 +694,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1719145664, "lastModified": 1718894893,
"narHash": "sha256-+0bBlerLxsHUJcKPDWZM1wL3V9bzCFjz+VyRTG8fnUA=", "narHash": "sha256-hxQBUtDbFOCCW1CsFZTS9Q5Ov1ZKdJgbBZHSez1M6iA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "c3e48cbd88414f583ff08804eb57b0da4c194f9e", "rev": "083823b7904e43a4fc1c7229781417e875359a42",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -785,11 +785,11 @@
}, },
"nixpkgs-stable_4": { "nixpkgs-stable_4": {
"locked": { "locked": {
"lastModified": 1719099622, "lastModified": 1718478900,
"narHash": "sha256-YzJECAxFt+U5LPYf/pCwW/e1iUd2PF21WITHY9B/BAs=", "narHash": "sha256-v43N1gZLcGkhg3PdcrKUNIZ1L0FBzB2JqhIYEyKAHEs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5e8e3b89adbd0be63192f6e645e0a54080004924", "rev": "c884223af91820615a6146af1ae1fea25c107005",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -801,11 +801,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1719075281, "lastModified": 1718714799,
"narHash": "sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo=", "narHash": "sha256-FUZpz9rg3gL8NVPKbqU8ei1VkPLsTIfAJ2fdAf5qjak=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a71e967ef3694799d0c418c98332f7ff4cc5f6af", "rev": "c00d587b1a1afbf200b1d8f0b0e4ba9deb1c7f0e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -943,11 +943,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719195554, "lastModified": 1718936281,
"narHash": "sha256-bFXHMjpYlEERexzXa1gLGJO/1l8dxaAtSNE56YALuTg=", "narHash": "sha256-jslEDCVFoRcNilJT0xYGSxqMjOe+USnLknpHIAZJ02A=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "577ee84c69ba89894ac622d71a678a14d746b2f7", "rev": "c9a793a5278f711a59fe77b9bf54b215667022c6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -964,11 +964,11 @@
"nixpkgs-stable": "nixpkgs-stable_4" "nixpkgs-stable": "nixpkgs-stable_4"
}, },
"locked": { "locked": {
"lastModified": 1719111739, "lastModified": 1718506969,
"narHash": "sha256-kr2QzRrplzlCP87ddayCZQS+dhGW98kw2zy7+jUXtF4=", "narHash": "sha256-Pm9I/BMQHbsucdWf6y9G3xBZh3TMlThGo4KBbeoeczg=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "5e2e9421e9ed2b918be0a441c4535cfa45e04811", "rev": "797ce4c1f45a85df6dd3d9abdc53f2691bea9251",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -306,6 +306,7 @@
nix-prefetch-github nix-prefetch-github
nix-prefetch-scripts nix-prefetch-scripts
nix-tree nix-tree
nix-top
nix-update nix-update
nixfmt-rfc-style nixfmt-rfc-style
nodejs nodejs

View file

@ -1107,7 +1107,6 @@ Prefer local packages from =node_modules= to global ones
#+begin_src emacs-lisp #+begin_src emacs-lisp
(use-package web-mode (use-package web-mode
:mode "\\.svelte\\'"
:after eglot :after eglot
:config :config
(setq web-mode-markup-indent-offset 2 (setq web-mode-markup-indent-offset 2
@ -1120,8 +1119,7 @@ Prefer local packages from =node_modules= to global ones
(add-to-list 'web-mode-engines-alist '(("elixir" . "\\.html.heex\\'") (add-to-list 'web-mode-engines-alist '(("elixir" . "\\.html.heex\\'")
("jinja2" . "\\.jinja2\\'") ("jinja2" . "\\.jinja2\\'")
("python" . "\\.pt\\'") ("python" . "\\.pt\\'")))
("svelte" . "\\.svelte\\'")))
:hook :hook
((html-mode css-mode web-mode) . eglot-ensure)) ((html-mode css-mode web-mode) . eglot-ensure))
#+end_src #+end_src
@ -1619,20 +1617,6 @@ Register =nushell= LSP with eglot
(use-package lua-mode) (use-package lua-mode)
#+end_src #+end_src
*** Svelte
#+begin_src emacs-lisp
(use-package svelte-mode)
#+end_src
Use =svelteserver= as LSP
#+begin_src emacs-lisp
(with-eval-after-load 'eglot
(add-to-list 'eglot-server-programs
'(svelte-mode . ("svelteserver" "--stdio"))))
#+end_src
* Org * Org
** Main org setup ** Main org setup

View file

@ -130,8 +130,8 @@
forceFullCompositionPipeline = true; forceFullCompositionPipeline = true;
}; };
graphics = { opengl = {
enable32Bit = true; driSupport32Bit = true;
extraPackages = with pkgs; [ extraPackages = with pkgs; [
vaapiVdpau vaapiVdpau
vulkan-validation-layers vulkan-validation-layers

View file

@ -58,7 +58,7 @@ in
theme = "nixos-blur"; theme = "nixos-blur";
}; };
hardware.graphics.enable = true; hardware.opengl.enable = true;
environment.systemPackages = environment.systemPackages =
with pkgs; with pkgs;