diff --git a/flake.lock b/flake.lock index 4e9d1e0..53b6b4f 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1727507295, - "narHash": "sha256-I/FrX1peu4URoj5T5odfuKR2rm4GjYJJpCGF9c0/lDA=", + "lastModified": 1737504076, + "narHash": "sha256-/B4XJnzYU/6K1ZZOBIgsa3K4pqDJrnC2579c44c+4rI=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "f2e1c4aa29fc211947c3a7113cba1dd707433b70", + "rev": "65cc1fa8e36ceff067daf6cfb142331f02f524d3", "type": "github" }, "original": { @@ -23,11 +23,11 @@ "emacs-config": { "flake": false, "locked": { - "lastModified": 1725551480, - "narHash": "sha256-NP2qZrT799JCny+8MKWSL6gdJGr1BxAoo9QOaNWo9UM=", + "lastModified": 1737496996, + "narHash": "sha256-fKIiUGiVrNVQbIf+TH3w/kp801wyRacRtc1lSWtbz9g=", "owner": "larstvei", "repo": "dot-emacs", - "rev": "32cbab47f8020cde616f16f0f0590612b637f2a3", + "rev": "5a78a0fce4139bfe6bfab54411f3ac9f105af442", "type": "github" }, "original": { @@ -41,15 +41,15 @@ "emacs-config": "emacs-config", "emacs-overlay": "emacs-overlay", "emacs-plus": "emacs-plus", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1726969086, - "narHash": "sha256-CHKX91NOuVOiVQPzxNNZJLxi+bD/ACbTbbTGOplieGE=", + "lastModified": 1737498904, + "narHash": "sha256-66rhOVdExGoovYVpoV4LoNtiT4nqpRZt5PLiRmfkGJs=", "owner": "larstvei", "repo": "emacs-flake", - "rev": "678b51e6607341da055ad471de66c319536aada7", + "rev": "f56cd70a0c9d2776ac1ce9b361c64ac0eeff58e8", "type": "github" }, "original": { @@ -60,16 +60,15 @@ }, "emacs-overlay": { "inputs": { - "flake-utils": "flake-utils", "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1726967971, - "narHash": "sha256-UO0TQbj8UFI4tioDTjmui0UqTL8CZkwizolvxqJLGu0=", + "lastModified": 1737249389, + "narHash": "sha256-VZmUzQi1XEFMOaLoSTZz++eU81Dwoh6jZNzrfKqrC5U=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "2c5171a36fcd616753b204c34ef38bf7729825e2", + "rev": "9071d5f50ce03d1f872973516d0e5dd13179cb93", "type": "github" }, "original": { @@ -81,11 +80,11 @@ "emacs-plus": { "flake": false, "locked": { - "lastModified": 1726592256, - "narHash": "sha256-Twamd/Doh2btEix3TK/NfilT5eZ6jEJ9rBXbJeVb6Yw=", + "lastModified": 1734881694, + "narHash": "sha256-0awwiJjYGvwzqghzjgQiE6rRyv//I68l2ivwdstbBfU=", "owner": "d12frosted", "repo": "homebrew-emacs-plus", - "rev": "cc3280dfdf7562dd69c97d0dfa872b1c3313a18a", + "rev": "5f1f625f43d498dcb9a931e0f351bfdaeb41cd1b", "type": "github" }, "original": { @@ -99,29 +98,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -137,11 +118,11 @@ ] }, "locked": { - "lastModified": 1727383923, - "narHash": "sha256-4/vacp3CwdGoPf8U4e/N8OsGYtO09WTcQK5FqYfJbKs=", + "lastModified": 1737480538, + "narHash": "sha256-rk/cmrvq3In0TegW9qaAxw+5YpJhRWt2p74/6JStrw0=", "owner": "nix-community", "repo": "home-manager", - "rev": "ffe2d07e771580a005e675108212597e5b367d2d", + "rev": "4481a16d1ac5bff4a77c608cefe08c9b9efe840d", "type": "github" }, "original": { @@ -152,11 +133,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1726755586, - "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=", + "lastModified": 1737062831, + "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e", + "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", "type": "github" }, "original": { @@ -168,27 +149,27 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1726838390, - "narHash": "sha256-NmcVhGElxDbmEWzgXsyAjlRhUus/nEqPC5So7BOJLUM=", + "lastModified": 1737165118, + "narHash": "sha256-s40Kk/OulP3J/1JvC3VT16U4r/Xw6Qdi7SRw3LYkPWs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "944b2aea7f0a2d7c79f72468106bc5510cbf5101", + "rev": "6a3ae7a5a12fb8cac2d59d7df7cbd95f9b2f0566", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1726871744, - "narHash": "sha256-V5LpfdHyQkUF7RfOaDPrZDP+oqz88lTJrMT1+stXNwo=", + "lastModified": 1737003892, + "narHash": "sha256-RCzJE9wKByLCXmRBp+z8LK9EgdW+K+W/DXnJS4S/NVo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a1d92660c6b3b7c26fb883500a80ea9d33321be2", + "rev": "ae06b9c2d83cb5c8b12d7d0e32692e93d1379713", "type": "github" }, "original": { @@ -200,17 +181,17 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1727492312, - "narHash": "sha256-oRkgc+DosM3HIl9el98TxF2rtliKHCNVw00nlQC7xYM=", + "lastModified": 1737110817, + "narHash": "sha256-DSenga8XjPaUV5KUFW/i3rNkN7jm9XmguW+qQ1ZJTR4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4471f9f67fe0f95f5fec4cc2ebac59fe32af2b62", + "rev": "041c867bad68dfe34b78b2813028a2e2ea70a23c", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", "repo": "nixpkgs", + "rev": "041c867bad68dfe34b78b2813028a2e2ea70a23c", "type": "github" } }, @@ -236,21 +217,6 @@ "repo": "default", "type": "github" } - }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index e4cdc66..6b10349 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { nixpkgs = { - url = "github:NixOS/nixpkgs/nixpkgs-unstable"; + url = "github:NixOS/nixpkgs/041c867bad68dfe34b78b2813028a2e2ea70a23c"; }; darwin = { url = "github:LnL7/nix-darwin"; diff --git a/modules/languages.nix b/modules/languages.nix index 41b5fd0..042ef57 100644 --- a/modules/languages.nix +++ b/modules/languages.nix @@ -74,6 +74,6 @@ with pkgs; ]; tex = [ - texlive.combined.scheme-full + texliveFull ]; } diff --git a/modules/tools.nix b/modules/tools.nix index 197e6a1..fa22896 100644 --- a/modules/tools.nix +++ b/modules/tools.nix @@ -10,6 +10,10 @@ with pkgs; (hunspellWithDicts [ hunspellDicts.nb_NO ]) ]; + # terminal = [ + # ghostty + # ]; + modernReplacements = [ bat fd @@ -17,11 +21,11 @@ with pkgs; ]; utils = [ - cloc jet jq pandoc parallel + tokei wget ];