diff --git a/configuration.nix b/configuration.nix index 25bc800..9a69eaa 100644 --- a/configuration.nix +++ b/configuration.nix @@ -108,10 +108,9 @@ in services.fstrim.enable = true; hardware = { - opengl = { + graphics = { enable = true; - driSupport = true; - driSupport32Bit = true; + enable32Bit = true; }; nvidia = { diff --git a/flake.lock b/flake.lock index 06acd92..88a2d0e 100644 --- a/flake.lock +++ b/flake.lock @@ -28,12 +28,12 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1717421885, - "narHash": "sha256-sSmJt2r4Dx01QCpafOo0r8PNPkZVj46LYJx2REqCwg0=", - "rev": "a676a9d2b3fad3891e550ea43d9b4f56063063a8", - "revCount": 448, + "lastModified": 1718572120, + "narHash": "sha256-zmnW3n1Adg47MaoBTIXDDcgFy4HCxcgNuc8LrmPK4F0=", + "rev": "5b7e079a747f22ee1d2450c0c972d466308a928a", + "revCount": 455, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/fh/0.1.11/018fdea3-513b-72eb-ac8e-c9d5184ec551/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/fh/0.1.12/019022e3-a731-7729-af25-f7717f950ec4/source.tar.gz" }, "original": { "type": "tarball", @@ -69,6 +69,22 @@ "type": "github" } }, + "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-schemas": { "locked": { "narHash": "sha256-j8SR19V1SRysyJwpOBF4TLuAvAjF5t+gMiboN4gYQDU=", @@ -118,6 +134,24 @@ "type": "github" } }, + "flake-utils_3": { + "inputs": { + "systems": "systems_4" + }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -125,11 +159,11 @@ ] }, "locked": { - "lastModified": 1717525419, - "narHash": "sha256-5z2422pzWnPXHgq2ms8lcCfttM0dz+hg+x1pCcNkAws=", + "lastModified": 1719037157, + "narHash": "sha256-aOKd8+mhBsLQChCu1mn/W5ww79ta5cXVE59aJFrifM8=", "owner": "nix-community", "repo": "home-manager", - "rev": "a7117efb3725e6197dd95424136f79147aa35e5b", + "rev": "cd886711998fe5d9ff7979fdd4b4cbd17b1f1511", "type": "github" }, "original": { @@ -154,11 +188,11 @@ ] }, "locked": { - "lastModified": 1716576411, - "narHash": "sha256-FIN1wMoyePBTtibCbaeJaoKNLuAYIGwLCWAYC1DJanw=", + "lastModified": 1718450675, + "narHash": "sha256-jpsns6buS4bK+1sF8sL8AaixAiCRjA+nldTKvcwmvUs=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "57298fc4f13c807e50ada2c986a3114b7fc2e621", + "rev": "66d5b46ff94efbfa6fa3d1d1b66735f1779c34a6", "type": "github" }, "original": { @@ -171,17 +205,18 @@ "inputs": { "hyprcursor": "hyprcursor", "hyprlang": "hyprlang", + "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": "nixpkgs_2", "systems": "systems_2", "xdph": "xdph" }, "locked": { - "lastModified": 1717605046, - "narHash": "sha256-zzdMmUNJCPY1KqVjzpukHOecae1AiAzwmBN5hq7jM2U=", + "lastModified": 1719093162, + "narHash": "sha256-WA48JNc8e3Irz0gpSE/vby67RlC+m+MJlQ6sZQId1EI=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "c95845b1488b4bd63e901cbdc4cb68c27a45971b", + "rev": "7f09646ab8b5b6d9f835681d0af5d7a0dc29d8f1", "type": "github" }, "original": { @@ -204,11 +239,11 @@ ] }, "locked": { - "lastModified": 1691753796, - "narHash": "sha256-zOEwiWoXk3j3+EoF3ySUJmberFewWlagvewDRuWYAso=", + "lastModified": 1714869498, + "narHash": "sha256-vbLVOWvQqo4n1yvkg/Q70VTlPbMmTiCQfNTgcWDCfJM=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "0c2ce70625cb30aef199cb388f99e19a61a6ce03", + "rev": "e06482e0e611130cd1929f75e8c1cf679e57d161", "type": "github" }, "original": { @@ -218,6 +253,35 @@ } }, "hyprlang": { + "inputs": { + "hyprutils": [ + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "hyprland", + "nixpkgs" + ], + "systems": [ + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1717881852, + "narHash": "sha256-XeeVoKHQgfKuXoP6q90sUqKyl7EYy3ol2dVZGM+Jj94=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "ec6938c66253429192274d612912649a0cfe4d28", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, + "hyprutils": { "inputs": { "nixpkgs": [ "hyprland", @@ -229,16 +293,16 @@ ] }, "locked": { - "lastModified": 1716473782, - "narHash": "sha256-+qLn4lsHU6iL3+HTo1gTQ1tWzet8K9h+IfVemzEQZj8=", + "lastModified": 1718804078, + "narHash": "sha256-CqRZne63BpYlPd/i8lXV0UInUt59oKogiwdVtBRHt60=", "owner": "hyprwm", - "repo": "hyprlang", - "rev": "87d5d984109c839482b88b4795db073eb9ed446f", + "repo": "hyprutils", + "rev": "4f1351295c55a8f51219b25aa4a6497a067989d0", "type": "github" }, "original": { "owner": "hyprwm", - "repo": "hyprlang", + "repo": "hyprutils", "type": "github" } }, @@ -254,11 +318,11 @@ ] }, "locked": { - "lastModified": 1716058375, - "narHash": "sha256-CwjWoVnBZE5SBpRx9dgSQGCr4Goxyfcyv3zZbOhVqzk=", + "lastModified": 1718119275, + "narHash": "sha256-nqDYXATNkyGXVmNMkT19fT4sjtSPBDS1LLOxa3Fueo4=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "3afed4364790aebe0426077631af1e164a9650cc", + "rev": "1419520d5f7f38d35e05504da5c1b38212a38525", "type": "github" }, "original": { @@ -294,11 +358,11 @@ "nixpkgs-old": "nixpkgs-old" }, "locked": { - "lastModified": 1717679178, - "narHash": "sha256-KLHGILjSIXG9qIB7iPeeD2RraO1rAyZLsTgS4IJktWw=", + "lastModified": 1719054319, + "narHash": "sha256-BSMOUiv5DeGNePtXlJPJGrn0lg+e5w8b01fiPRHtXGs=", "owner": "leanprover", "repo": "lean4", - "rev": "0a0f1d7cc717592d1014bf6ec929372654e97965", + "rev": "d7da45cbe6b743a633ae2168e0394c7cd1759cfe", "type": "github" }, "original": { @@ -387,11 +451,11 @@ ] }, "locked": { - "lastModified": 1716210724, - "narHash": "sha256-iqQa3omRcHGpWb1ds75jS9ruA5R39FTmAkeR3J+ve1w=", + "lastModified": 1718025593, + "narHash": "sha256-WZ1gdKq/9u1Ns/oXuNsDm+W0salonVA0VY1amw8urJ4=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "d14b286322c7f4f897ca4b1726ce38cb68596c94", + "rev": "35c20ba421dfa5059e20e0ef2343c875372bdcf3", "type": "github" }, "original": { @@ -448,11 +512,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1716330097, - "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", + "lastModified": 1718530797, + "narHash": "sha256-pup6cYwtgvzDpvpSCFh1TEUjw2zkNpk8iolbKnyFmmU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5710852ba686cc1fd0d3b8e22b3117d43ba374c2", + "rev": "b60ebf54c15553b393d144357375ea956f89e9a9", "type": "github" }, "original": { @@ -480,11 +544,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1717459389, - "narHash": "sha256-I8/plBsua4/NZ5bKgj+z7/ThiWuud1YFwLsn1QQ5PgE=", + "lastModified": 1718983919, + "narHash": "sha256-+1xgeIow4gJeiwo4ETvMRvWoircnvb0JOt7NS9kUhoM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "3b01abcc24846ae49957b30f4345bab4b3f1d14b", + "rev": "90338afd6177fc683a04d934199d693708c85a3b", "type": "github" }, "original": { @@ -524,7 +588,8 @@ "leanpkgs": "leanpkgs", "nixos-generators": "nixos-generators", "nixpkgs": "nixpkgs_4", - "pesterchum": "pesterchum" + "pesterchum": "pesterchum", + "zig": "zig" } }, "rust-analyzer-src": { @@ -589,6 +654,21 @@ "type": "github" } }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "xdph": { "inputs": { "hyprland-protocols": "hyprland-protocols", @@ -606,11 +686,11 @@ ] }, "locked": { - "lastModified": 1716290197, - "narHash": "sha256-1u9Exrc7yx9qtES2brDh7/DDZ8w8ap1nboIOAtCgeuM=", + "lastModified": 1718619174, + "narHash": "sha256-FWW68AVYmB91ZDQnhLMBNCUUTCjb1ZpO2k2KIytHtkA=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "91e48d6acd8a5a611d26f925e51559ab743bc438", + "rev": "c7894aa54f9a7dbd16df5cd24d420c8af22d5623", "type": "github" }, "original": { @@ -618,6 +698,28 @@ "repo": "xdg-desktop-portal-hyprland", "type": "github" } + }, + "zig": { + "inputs": { + "flake-compat": "flake-compat_3", + "flake-utils": "flake-utils_3", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1719188778, + "narHash": "sha256-eDOJ5IDiMvgVHsoo7fDO6FzYvFkFRxprtNoOij/xzsQ=", + "owner": "mitchellh", + "repo": "zig-overlay", + "rev": "9adfab2de763981ca5267fe09a5e9f14e731f13e", + "type": "github" + }, + "original": { + "owner": "mitchellh", + "repo": "zig-overlay", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index d8547b4..0f45690 100644 --- a/flake.nix +++ b/flake.nix @@ -22,6 +22,9 @@ leanpkgs.url = "github:leanprover/lean4"; leanpkgs.inputs.nixpkgs.follows = "nixpkgs"; + zig.url = "github:mitchellh/zig-overlay"; + zig.inputs.nixpkgs.follows = "nixpkgs"; + # for l8r :::;) #homeage.url = "github:jordanisaacs/homeage"; #homeage.inputs.nixpkgs.follows = "nixpkgs"; @@ -37,6 +40,7 @@ fh, pesterchum, leanpkgs, + zig, ... }: let @@ -54,6 +58,7 @@ leanpkgs = leanpkgs.packages.x86_64-linux; more-packages = [ pesterchum.packages.x86_64-linux.default + zig.packages.x86_64-linux."0.13.0" ]; }; } diff --git a/home.nix b/home.nix index 8700ef3..1221c7a 100644 --- a/home.nix +++ b/home.nix @@ -45,6 +45,7 @@ in jq file fd + zip semgrep pandoc @@ -64,6 +65,7 @@ in julia lua gcc + zls cargo clippy @@ -333,13 +335,21 @@ in enable = true; package = pkgs.emacs29-pgtk; extraPackages = epkgs: with epkgs; [ + lsp-mode + leanpkgs.lean4-mode + markdown-mode + yaml-mode + json-mode + elixir-mode + clojure-mode + haskell-mode + zig-mode + which-key all-the-icons-ivy bind-key counsel gruvbox-theme - leanpkgs.lean4-mode - lsp-mode avy consult embark @@ -354,9 +364,6 @@ in #eshell orderless magit - markdown-mode - yaml-mode - json-mode eglot org org-roam @@ -373,18 +380,14 @@ in evil-commentary evil-org erc-hl-nicks - elixir-mode gcmh sly general lispyville - clojure-mode cider - haskell-mode - direnv esup