diff --git a/README.md b/README.md index fc4437d..6a3d10a 100644 --- a/README.md +++ b/README.md @@ -51,12 +51,6 @@ Enter the dev shell (if not using [nix-direnv](https://github.com/nix-community/ # Tasks -## TODO Break out emacs config - -Emacs configuration should be in it's own repository. -Lisp code should be extracted into separate files or an org-babel setup. - - ## TODO Services as modules Services should be converted to modules. diff --git a/README.org b/README.org deleted file mode 100644 index e30a365..0000000 --- a/README.org +++ /dev/null @@ -1,80 +0,0 @@ -#+title: dotfiles.nix -#+options: author:nil date:nil toc:nil - -My dotfiles using Nix. System configuration done using [[https://github.com/LnL7/nix-darwin][nix-darwin]] and -[[https://nixos.org/][NixOS]]. User configuration using [[https://github.com/nix-community/home-manager][home-manager]]. This repo is put -together as a flake using [[https://github.com/hercules-ci/flake-parts][flake-parts]]. On NixOS home-manager is used -as a NixOS module, on Darwin it is used separately from nix-darwin. - -dotfiles.nix is inspired by [[https://github.com/terlar/nix-config/tree/main][terlar/nix-config]], [[https://sr.ht/~rycee/configurations/][~rycee/configurations]] -and [[https://github.com/hlissner/dotfiles][hlissner/dotfiles]]. - -All Nix code in this repo is formatted using [[https://github.com/kamadorueda/alejandra][alejandra]]. - -* Usage - -Show what this flake provides: - -#+begin_src shell -nix flake show -#+end_src - -Switch both system (NixOS) and home: - -#+begin_src shell -nixos-rebuild switch --flake . -#+end_src - -Switch system (nix-darwin): - -#+begin_src shell -darwin-rebuild switch --flake . -#+end_src - -Switch home only (on Darwin): - -#+begin_src shell -nix run .#home -#+end_src - -Build home without switching: - -#+begin_src shell -nix build .#home -#+end_src - -Update all inputs: - -#+begin_src shell -nix flake update --commit-lock-file -#+end_src - -Update a single input: - -#+begin_src shell -nix flake lock --update-input nixpkgs --commit-lock-file -#+end_src - -Format all nix files: - -#+begin_src shell -nix fmt -#+end_src - -Enter the dev shell (if not using [[https://github.com/nix-community/nix-direnv][nix-direnv]]): - -#+begin_src -nix develop -#+end_src - -* Tasks - -** TODO Break out emacs config - -Emacs configuration should be in it's own repository. -Lisp code should be extracted into separate files or an org-babel setup. - -** TODO Services as modules - -Services should be converted to modules. -These should ideally support both linux and darwin hosts (launchd and systemd). diff --git a/flake.lock b/flake.lock index f08558f..77a2aed 100644 --- a/flake.lock +++ b/flake.lock @@ -19,6 +19,22 @@ } }, "base16-alacritty": { + "flake": false, + "locked": { + "lastModified": 1703982197, + "narHash": "sha256-TNxKbwdiUXGi4Z4chT72l3mt3GSvOcz6NZsUH8bQU/k=", + "owner": "aarowill", + "repo": "base16-alacritty", + "rev": "c95c200b3af739708455a03b5d185d3d2d263c6e", + "type": "github" + }, + "original": { + "owner": "aarowill", + "repo": "base16-alacritty", + "type": "github" + } + }, + "base16-alacritty-yaml": { "flake": false, "locked": { "lastModified": 1674275109, @@ -31,6 +47,7 @@ "original": { "owner": "aarowill", "repo": "base16-alacritty", + "rev": "63d8ae5dfefe5db825dd4c699d0cdc2fc2c3eaf7", "type": "github" } }, @@ -130,29 +147,6 @@ "type": "github" } }, - "beautysh": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ], - "poetry2nix": "poetry2nix", - "utils": "utils" - }, - "locked": { - "lastModified": 1680308980, - "narHash": "sha256-aUEHV0jk2qIFP3jlsWYWhBbm+w/N9gzH3e4I5DcdB5s=", - "owner": "lovesegfault", - "repo": "beautysh", - "rev": "9845efc3ea3e86cc0d41465d720a47f521b2799c", - "type": "github" - }, - "original": { - "owner": "lovesegfault", - "repo": "beautysh", - "type": "github" - } - }, "darwin": { "inputs": { "nixpkgs": [ @@ -174,39 +168,17 @@ "type": "github" } }, - "emacs-overlay": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": [ - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1700706117, - "narHash": "sha256-Regg5CidXqJ5Qg1GbSFeDUsVLJON1tVWIyKOMcpc0fU=", - "owner": "nix-community", - "repo": "emacs-overlay", - "rev": "7d58a5b06d126ef3bfac51a17f359201374a7490", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "emacs-overlay", - "type": "github" - } - }, "fenix": { "inputs": { "nixpkgs": "nixpkgs", "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1700720546, - "narHash": "sha256-p31fe4lp2KBCyUf58mgai1xYjMLl5S0PQiSvv9+1j/Y=", + "lastModified": 1706595721, + "narHash": "sha256-nf5/lPawM20WO1gHAlsUwDEJ4v+InC3BYYV1EBsBJZk=", "owner": "nix-community", "repo": "fenix", - "rev": "5ade7808d45671b545f3516adf61bc9a604a6246", + "rev": "46a368edf5f1cc16573157797e5acead834d5b2c", "type": "github" }, "original": { @@ -233,11 +205,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -267,11 +239,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1698882062, - "narHash": "sha256-HkhafUayIqxXyHH1X8d9RDl1M2CkFgZLjKD3MzabiEo=", + "lastModified": 1706569497, + "narHash": "sha256-oixb0IDb5eZYw6BaVr/R/1pSoMh4rfJHkVnlgeRIeZs=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "8c9fa2545007b49a5db5f650ae91f227672c3877", + "rev": "60c614008eed1d0383d21daac177a3e036192ed8", "type": "github" }, "original": { @@ -282,50 +254,14 @@ }, "flake-utils": { "inputs": { - "systems": "systems" + "systems": "systems_2" }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_4" - }, - "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "type": "github" }, "original": { @@ -358,11 +294,11 @@ ] }, "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", + "lastModified": 1703887061, + "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=", "owner": "hercules-ci", "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", + "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5", "type": "github" }, "original": { @@ -378,16 +314,15 @@ ] }, "locked": { - "lastModified": 1699770800, - "narHash": "sha256-nywbJ5pEqMx5CZkhlkQ9iWJJ4qbAGNqTI/qNuLQlQMw=", - "owner": "willemml", + "lastModified": 1706473109, + "narHash": "sha256-iyuAvpKTsq2u23Cr07RcV5XlfKExrG8gRpF75hf1uVc=", + "owner": "nix-community", "repo": "home-manager", - "rev": "d08f04acae4b7ed2414e5f4d0bc6f1101d20a6ee", + "rev": "d634c3abafa454551f2083b054cd95c3f287be61", "type": "github" }, "original": { - "owner": "willemml", - "ref": "feat/programs.hishtory", + "owner": "nix-community", "repo": "home-manager", "type": "github" } @@ -400,11 +335,11 @@ ] }, "locked": { - "lastModified": 1691882297, - "narHash": "sha256-e1/LAQSGLnBywfA1TfMl0Vj3tvYka73XOZ/D2/CJowE=", + "lastModified": 1706001011, + "narHash": "sha256-J7Bs9LHdZubgNHZ6+eE/7C18lZ1P6S5/zdJSdXFItI4=", "owner": "nix-community", "repo": "home-manager", - "rev": "c3ab5ea047e6dc73df530948f7367455749d8906", + "rev": "3df2a80f3f85f91ea06e5e91071fa74ba92e5084", "type": "github" }, "original": { @@ -417,16 +352,16 @@ "inputs": { "hyprland-protocols": "hyprland-protocols", "nixpkgs": "nixpkgs_2", - "systems": "systems_2", + "systems": "systems", "wlroots": "wlroots", "xdph": "xdph" }, "locked": { - "lastModified": 1700696626, - "narHash": "sha256-Rr6s2HE9v0AlI630WAE+12usUJpwd3fAP6Gvk7rF5v4=", + "lastModified": 1706646126, + "narHash": "sha256-VnJBPei9N1wV6GOgZxTtm5X+s5Ek6tLtYkLCKWHKJ/U=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "e55c5a916ab942e641339471bc80b6d2efbc2044", + "rev": "e65f52bf2d6abb001c402c8302ac7003da8cd06d", "type": "github" }, "original": { @@ -460,6 +395,28 @@ "type": "github" } }, + "hyprlang": { + "inputs": { + "nixpkgs": [ + "hyprland", + "xdph", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1704287638, + "narHash": "sha256-TuRXJGwtK440AXQNl5eiqmQqY4LZ/9+z/R7xC0ie3iA=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "6624f2bb66d4d27975766e81f77174adbe58ec97", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, "nix-github-actions": { "inputs": { "nixpkgs": [ @@ -467,11 +424,11 @@ ] }, "locked": { - "lastModified": 1698974481, - "narHash": "sha256-yPncV9Ohdz1zPZxYHQf47S8S0VrnhV7nNhCawY46hDA=", + "lastModified": 1703863825, + "narHash": "sha256-rXwqjtwiGKJheXB43ybM8NwWB8rO2dSRrEqes0S7F5Y=", "owner": "nix-community", "repo": "nix-github-actions", - "rev": "4bb5e752616262457bc7ca5882192a564c0472d2", + "rev": "5163432afc817cf8bd1f031418d1869e4c9d5547", "type": "github" }, "original": { @@ -487,11 +444,11 @@ ] }, "locked": { - "lastModified": 1700363379, - "narHash": "sha256-fBEVPFwSZ6AmBE1s1oT7E9WVuqRghruxTnSQ8UUlMkw=", + "lastModified": 1706411424, + "narHash": "sha256-BzziJYucEZvdCE985vjPoo3ztWcmUiSQ1wJ2CoT6jCc=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "27920146e671a0d565aaa7452907383be14d8d82", + "rev": "c782f2a4f6fc94311ab5ef31df2f1149a1856181", "type": "github" }, "original": { @@ -509,11 +466,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1700436815, - "narHash": "sha256-+txRDmFuI/dW/ZmacfDrqSsKiWTNLmRygej25u2ojNM=", + "lastModified": 1705557527, + "narHash": "sha256-DuxxHTQ/W5KToFLWG4FUF8hLldNo9eXlbt7JgvhrMnY=", "owner": "tpwrules", "repo": "nixos-apple-silicon", - "rev": "14b327ca47703c376ebb82ba16dc42ca2baa57d8", + "rev": "6e324ab06cb27a19409ebc1dc2664bf1e585490a", "type": "github" }, "original": { @@ -524,11 +481,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1700390070, - "narHash": "sha256-de9KYi8rSJpqvBfNwscWdalIJXPo8NjdIZcEJum1mH0=", + "lastModified": 1706371002, + "narHash": "sha256-dwuorKimqSYgyu8Cw6ncKhyQjUDOyuXoxDTVmAXq88s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e4ad989506ec7d71f7302cc3067abd82730a4beb", + "rev": "c002c6aa977ad22c60398daaa9be52f2203d0006", "type": "github" }, "original": { @@ -541,11 +498,11 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1698611440, - "narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=", + "lastModified": 1703961334, + "narHash": "sha256-M1mV/Cq+pgjk0rt6VxoyyD+O8cOUiai8t9Q6Yyq4noY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735", + "rev": "b0d36bd0a420ecee3bc916c91886caca87c894e9", "type": "github" }, "original": { @@ -558,43 +515,27 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1700501263, - "narHash": "sha256-M0U063Ba2DKL4lMYI7XW13Rsk5tfUXnIYiAVa39AV/0=", + "lastModified": 1704874635, + "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f741f8a839912e272d7e87ccf4b9dbc6012cdaf9", + "rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_2": { - "locked": { - "lastModified": 1685801374, - "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "c37ca420157f4abc31e26f436c1145f8951ff373", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.05", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_2": { "locked": { - "lastModified": 1698134075, - "narHash": "sha256-foCD+nuKzfh49bIoiCBur4+Fx1nozo+4C/6k8BYk4sg=", + "lastModified": 1706191920, + "narHash": "sha256-eLihrZAPZX0R6RyM5fYAWeKVNuQPYjAkCUBr+JNvtdE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8efd5d1e283604f75a808a20e6cde0ef313d07d4", + "rev": "ae5c332cbb5827f6b1f02572496b141021de335f", "type": "github" }, "original": { @@ -606,11 +547,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1700390070, - "narHash": "sha256-de9KYi8rSJpqvBfNwscWdalIJXPo8NjdIZcEJum1mH0=", + "lastModified": 1706371002, + "narHash": "sha256-dwuorKimqSYgyu8Cw6ncKhyQjUDOyuXoxDTVmAXq88s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e4ad989506ec7d71f7302cc3067abd82730a4beb", + "rev": "c002c6aa977ad22c60398daaa9be52f2203d0006", "type": "github" }, "original": { @@ -620,74 +561,22 @@ "type": "github" } }, - "nixvim": { - "inputs": { - "beautysh": "beautysh", - "flake-utils": "flake-utils_2", - "nixpkgs": [ - "nixpkgs" - ], - "pre-commit-hooks": [ - "pre-commit-hooks" - ] - }, - "locked": { - "lastModified": 1700725249, - "narHash": "sha256-zhBmJ/WU6vDDWOn6I1oZ9+cbkK2Kh/wEjLtnNKumxa4=", - "owner": "nix-community", - "repo": "nixvim", - "rev": "a88b9550206ee3758314e7231c8b56784bd2d078", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixvim", - "type": "github" - } - }, - "poetry2nix": { - "inputs": { - "flake-utils": [ - "nixvim", - "beautysh", - "utils" - ], - "nixpkgs": [ - "nixvim", - "beautysh", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1658665240, - "narHash": "sha256-/wkx7D7enyBPRjIkK0w7QxLQhzEkb3UxNQnjyc3FTUI=", - "owner": "nix-community", - "repo": "poetry2nix", - "rev": "8b8edc85d24661d5a6d0d71d6a7011f3e699780f", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "poetry2nix", - "type": "github" - } - }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils", "gitignore": "gitignore", "nixpkgs": [ "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1700064067, - "narHash": "sha256-1ZWNDzhu8UlVCK7+DUN9dVQfiHX1bv6OQP9VxstY/gs=", + "lastModified": 1706424699, + "narHash": "sha256-Q3RBuOpZNH2eFA1e+IHgZLAOqDD9SKhJ/sszrL8bQD4=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "e558068cba67b23b4fbc5537173dbb43748a17e8", + "rev": "7c54e08a689b53c8a1e5d70169f2ec9e2a68ffaf", "type": "github" }, "original": { @@ -699,7 +588,6 @@ "root": { "inputs": { "darwin": "darwin", - "emacs-overlay": "emacs-overlay", "fenix": "fenix", "flake-parts": "flake-parts", "home-manager": "home-manager", @@ -708,7 +596,6 @@ "nix-index-database": "nix-index-database", "nixos-apple-silicon": "nixos-apple-silicon", "nixpkgs": "nixpkgs_3", - "nixvim": "nixvim", "pre-commit-hooks": "pre-commit-hooks", "stylix": "stylix" } @@ -716,11 +603,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1700642897, - "narHash": "sha256-LoyZRcl0bBuSnV9SVqrf+vUxN1u9FeYk4vgQS/kyCOI=", + "lastModified": 1706540258, + "narHash": "sha256-6RTztJE21l0hfWHp0qMWBurWnoFmUxYEDCvaGTnQYcA=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "7ceefc7ee981f7dd9de4cfdd070696e48b4ab43e", + "rev": "d13951f25c4cb880bff09a3c02a796ecc51f69ac", "type": "github" }, "original": { @@ -750,6 +637,7 @@ "inputs": { "base16": "base16", "base16-alacritty": "base16-alacritty", + "base16-alacritty-yaml": "base16-alacritty-yaml", "base16-fish": "base16-fish", "base16-foot": "base16-foot", "base16-helix": "base16-helix", @@ -763,36 +651,20 @@ ] }, "locked": { - "lastModified": 1701798883, - "narHash": "sha256-wv15ahlMEfLXPq8CW08GC7VP54INaCF8pcESXt26kNc=", - "owner": "willemml", + "lastModified": 1706466685, + "narHash": "sha256-R6D+3wBQvn7sCZLbM3WrHbKtVNSflkruGQ/5bHfslhg=", + "owner": "danth", "repo": "stylix", - "rev": "2ed2b0086b41d582aca26e083c19c0e47c8991e3", + "rev": "7a7c90015de7454060e103e94bb4e6010b5aa062", "type": "github" }, "original": { - "owner": "willemml", - "ref": "feat/modules/nixvim-transparency", + "owner": "danth", "repo": "stylix", "type": "github" } }, "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_2": { "locked": { "lastModified": 1689347949, "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", @@ -807,7 +679,7 @@ "type": "github" } }, - "systems_3": { + "systems_2": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -822,52 +694,22 @@ "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" - } - }, - "utils": { - "locked": { - "lastModified": 1678901627, - "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "wlroots": { "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1699292815, - "narHash": "sha256-HXu98PyBMKEWLqiTb8viuLDznud/SdkdJsx5A5CWx7I=", + "lastModified": 1706359063, + "narHash": "sha256-5HUTG0p+nCJv3cn73AmFHRZdfRV5AD5N43g8xAePSKM=", "owner": "wlroots", "repo": "wlroots", - "rev": "5de9e1a99d6642c2d09d589aa37ff0a8945dcee1", + "rev": "00b869c1a96f300a8f25da95d624524895e0ddf2", "type": "gitlab" }, "original": { "host": "gitlab.freedesktop.org", "owner": "wlroots", "repo": "wlroots", - "rev": "5de9e1a99d6642c2d09d589aa37ff0a8945dcee1", + "rev": "00b869c1a96f300a8f25da95d624524895e0ddf2", "type": "gitlab" } }, @@ -877,6 +719,7 @@ "hyprland", "hyprland-protocols" ], + "hyprlang": "hyprlang", "nixpkgs": [ "hyprland", "nixpkgs" @@ -887,11 +730,11 @@ ] }, "locked": { - "lastModified": 1697981233, - "narHash": "sha256-y8q4XUwx+gVK7i2eLjfR32lVo7TYvEslyzrmzYEaPZU=", + "lastModified": 1706145785, + "narHash": "sha256-j9MP4fv2U/vdRKAXXc2gyMTmYwVnHP6kHx1/y6jprrU=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "22e7a65ff9633e1dedfa5317fdffc49f68de2ff2", + "rev": "5a592647587cd20b9692a347df6939b6d371b3bb", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b62ea21..61aabd2 100644 --- a/flake.nix +++ b/flake.nix @@ -7,14 +7,11 @@ darwin.url = "github:willemml/nix-darwin?ref=feat/networking.hosts"; darwin.inputs.nixpkgs.follows = "nixpkgs"; - emacs-overlay.url = "github:nix-community/emacs-overlay"; - emacs-overlay.inputs.nixpkgs.follows = "nixpkgs"; - fenix.url = "github:nix-community/fenix"; flake-parts.url = "github:hercules-ci/flake-parts"; - home-manager.url = "github:willemml/home-manager?ref=feat/programs.hishtory"; + home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; hyprland.url = "github:hyprwm/Hyprland"; @@ -28,20 +25,10 @@ nixos-apple-silicon.inputs.nixpkgs.follows = "nixpkgs"; nixos-apple-silicon.url = "github:tpwrules/nixos-apple-silicon"; - nixvim.url = "github:nix-community/nixvim"; - nixvim.inputs.nixpkgs.follows = "nixpkgs"; - nixvim.inputs.pre-commit-hooks.follows = "pre-commit-hooks"; - pre-commit-hooks.inputs.nixpkgs.follows = "nixpkgs"; pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix"; - # stylix.url = "github:danth/stylix"; - stylix = { - type = "github"; - owner = "willemml"; - repo = "stylix"; - ref = "feat/modules/nixvim-transparency"; - }; + stylix.url = "github:danth/stylix"; stylix.inputs.nixpkgs.follows = "nixpkgs"; }; @@ -79,7 +66,6 @@ overlays = { default = import ./packages; fenix = inputs.fenix.overlays.default; - emacs = inputs.emacs-overlay.overlays.default; }; nixosConfigurations = { diff --git a/home/programs/default.nix b/home/programs/default.nix index 60ca7b5..c45a28d 100644 --- a/home/programs/default.nix +++ b/home/programs/default.nix @@ -6,7 +6,6 @@ }: { imports = [ ./ssh.nix - ./vim.nix ./zsh.nix ]; @@ -115,11 +114,6 @@ }; }; - hishtory = { - enable = false; - enableZshIntegration = false; - }; - password-store = { enable = true; package = pkgs.pass.withExtensions (exts: [exts.pass-genphrase exts.pass-otp exts.pass-import]); diff --git a/home/programs/vim.nix b/home/programs/vim.nix deleted file mode 100644 index e43c98f..0000000 --- a/home/programs/vim.nix +++ /dev/null @@ -1,19 +0,0 @@ -{inputs, ...}: { - imports = [ - inputs.nixvim.homeManagerModules.nixvim - ]; - - stylix.targets.nixvim = { - enable = true; - transparent_bg = { - main = true; - sign_column = true; - }; - }; - - programs.nixvim = { - enable = true; - - plugins.lightline.enable = true; - }; -} diff --git a/packages/default.nix b/packages/default.nix index eb4e515..bca0f82 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -1,3 +1,2 @@ _final: prev: { - org-auctex = prev.callPackage ./org-auctex.nix {}; } diff --git a/packages/org-auctex.nix b/packages/org-auctex.nix deleted file mode 100644 index b09c25c..0000000 --- a/packages/org-auctex.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ - emacsPackages, - fetchFromGitHub, -}: -emacsPackages.trivialBuild { - pname = "org-auctex"; - version = "e1271557b9f36ca94cabcbac816748e7d0dc989c"; - - src = fetchFromGitHub { - owner = "karthink"; - repo = "org-auctex"; - rev = "e1271557b9f36ca94cabcbac816748e7d0dc989c"; - sha256 = "sha256-cMAhwybnq5HA1wOaUqDPML3nnh5m1iwEETTPWqPbAvw="; - }; -}