erwin/nixos-config
1
0
Fork 0
Code Issues 1 Pull requests Projects 1 Releases Wiki Activity Actions

Compare commits

base: erwin:567e965f03a80e1d55e2cc7e77d776c06133c3f8
Branches Tags
erwin:main
...
compare: erwin:31ad79b1b906d0630fdde131d6ad2b519543c4ea
Branches Tags
erwin:main

4 commits
567e965f03 ... 31ad79b1b9

Author SHA1 Message Date
Erwin Boskma
31ad79b1b9
hardware.opengl was renamed to hardware.graphics 2024-06-24 14:26:50 +02:00
Erwin Boskma
b886319f51
Add svelte-mode 2024-06-24 14:26:34 +02:00
Erwin Boskma
7dee9b302e
nix-top was removed from nixpkgs 2024-06-24 14:26:23 +02:00
Erwin Boskma
e025625099
flake.lock: Update 
Flake lock file updates:

• Updated input 'atuin':
    'github:atuinsh/atuin/b06b7b509a454656d92196c8a58071e4f0d76e09?narHash=sha256-w465ZQEqZQ/mJKxBs4y/L%2BWh5EiuTFYGEfnIgxvmFcs%3D' (2024-06-20)
  → 'github:atuinsh/atuin/8956142cc5b4f5636ae1943f81bf2c22864b8dba?narHash=sha256-s7dGKRFHjizKv%2BmqaAd/7BmwPphNM6XMGqtC40sqzWM%3D' (2024-06-24)
• Updated input 'disko':
    'github:nix-community/disko/e1174d991944a01eaaa04bc59c6281edca4c0e6e?narHash=sha256-9dtXYtEkmXoUJV%2BPGLqscqF7qTn4AIhAKpFWRFU2NYs%3D' (2024-06-20)
  → 'github:nix-community/disko/50d4d13fbac5db81f8c1e79d95ad87a2970b9201?narHash=sha256-ByDySG4oQN6KzLCuJjTax6%2BcMVtOixuYuu2GnnoPpoI%3D' (2024-06-24)
• Updated input 'emacs-overlay':
    'github:nix-community/emacs-overlay/728439cd9e68339c306d6152b8950dcb87e604cf?narHash=sha256-5DzqO4O3ZKPGx1dO5QhwCGBaI4bPTg2BSWSzasTYdmM%3D' (2024-06-21)
  → 'github:nix-community/emacs-overlay/e3e9ef4c9904fddbd8c00f3288e6a3be26a6bf0b?narHash=sha256-4jggHHDsLt%2Bi4/6lMNlZkHd3bzgV50feNpZGe4X3eMQ%3D' (2024-06-24)
• Updated input 'home-manager':
    'github:nix-community/home-manager/d7830d05421d0ced83a0f007900898bdcaf2a2ca?narHash=sha256-SqiOz0sljM0GjyQEVinPXQxaGcbOXw5OgpCWGPgh/vo%3D' (2024-06-19)
  → 'github:nix-community/home-manager/6b1f90a8ff92e81638ae6eb48cd62349c3e387bb?narHash=sha256-vZAzm5KQpR6RGple1dzmSJw5kPivES2heCFM%2BZWkt0I%3D' (2024-06-23)
• Updated input 'microvm':
    'github:astro/microvm.nix/b11f00056e11a802809935b0675176a2429593d9?narHash=sha256-VvD7zmbEn9Ua8w2wAMcIBXD09QqG1Ra5bNjhd1eqhOo%3D' (2024-06-15)
  → 'github:astro/microvm.nix/146fec824fe8e06454e211a14ce29b5f692ad078?narHash=sha256-xsdESZDwOs0o96VlZNxThfLG8HW%2BqT2c7dYypGGUYXg%3D' (2024-06-23)
• Updated input 'nix-ld-rs':
    'github:nix-community/nix-ld-rs/753a1539846e6f75c88583777a3f6e40f4064302?narHash=sha256-P2PsdY2kLin3S0AW7dYWWI%2B1/a/%2Bonp3KaAz8O32EnY%3D' (2024-06-13)
  → 'github:nix-community/nix-ld-rs/311caa66689611bde0c90fe92ddfc9b0d85253fa?narHash=sha256-%2BG3xCI3eiZiT7Uj5Rwl8vBTOGUi3TjaclUbfW%2B3nt7E%3D' (2024-06-23)
• Updated input 'nixos-hardware':
    'github:NixOS/nixos-hardware/083823b7904e43a4fc1c7229781417e875359a42?narHash=sha256-hxQBUtDbFOCCW1CsFZTS9Q5Ov1ZKdJgbBZHSez1M6iA%3D' (2024-06-20)
  → 'github:NixOS/nixos-hardware/c3e48cbd88414f583ff08804eb57b0da4c194f9e?narHash=sha256-%2B0bBlerLxsHUJcKPDWZM1wL3V9bzCFjz%2BVyRTG8fnUA%3D' (2024-06-23)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/c00d587b1a1afbf200b1d8f0b0e4ba9deb1c7f0e?narHash=sha256-FUZpz9rg3gL8NVPKbqU8ei1VkPLsTIfAJ2fdAf5qjak%3D' (2024-06-18)
  → 'github:nixos/nixpkgs/a71e967ef3694799d0c418c98332f7ff4cc5f6af?narHash=sha256-CyyxvOwFf12I91PBWz43iGT1kjsf5oi6ax7CrvaMyAo%3D' (2024-06-22)
• Updated input 'rust-overlay':
    'github:oxalica/rust-overlay/c9a793a5278f711a59fe77b9bf54b215667022c6?narHash=sha256-jslEDCVFoRcNilJT0xYGSxqMjOe%2BUSnLknpHIAZJ02A%3D' (2024-06-21)
  → 'github:oxalica/rust-overlay/577ee84c69ba89894ac622d71a678a14d746b2f7?narHash=sha256-bFXHMjpYlEERexzXa1gLGJO/1l8dxaAtSNE56YALuTg%3D' (2024-06-24)
• Updated input 'sops':
    'github:Mic92/sops-nix/797ce4c1f45a85df6dd3d9abdc53f2691bea9251?narHash=sha256-Pm9I/BMQHbsucdWf6y9G3xBZh3TMlThGo4KBbeoeczg%3D' (2024-06-16)
  → 'github:Mic92/sops-nix/5e2e9421e9ed2b918be0a441c4535cfa45e04811?narHash=sha256-kr2QzRrplzlCP87ddayCZQS%2BdhGW98kw2zy7%2BjUXtF4%3D' (2024-06-23)
• Updated input 'sops/nixpkgs-stable':
    'github:NixOS/nixpkgs/c884223af91820615a6146af1ae1fea25c107005?narHash=sha256-v43N1gZLcGkhg3PdcrKUNIZ1L0FBzB2JqhIYEyKAHEs%3D' (2024-06-15)
  → 'github:NixOS/nixpkgs/5e8e3b89adbd0be63192f6e645e0a54080004924?narHash=sha256-YzJECAxFt%2BU5LPYf/pCwW/e1iUd2PF21WITHY9B/BAs%3D' (2024-06-22)
 2024-06-24 10:11:26 +02:00
5 changed files with 53 additions and 38 deletions
Show stats Expand all files Collapse all files

66
flake.lock
View file

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

1
flake.nix
View file

@ -306,7 +306,6 @@
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

18
home-manager/modules/emacs/config.org
View file

@ -1107,6 +1107,7 @@ 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
@ -1119,7 +1120,8 @@ 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
@ -1617,6 +1619,20 @@ 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

4
machines/mimir/configuration.nix
View file

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

2
modules/base/default.nix
View file

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