diff --git a/flake.lock b/flake.lock index 985ac22..2d56341 100644 --- a/flake.lock +++ b/flake.lock @@ -165,6 +165,26 @@ "type": "github" } }, + "emacs-overlay": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_4", + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1729013905, + "narHash": "sha256-0D95N5nsfvQAg4RjMgTgTdubMZMUQgodSqgc3KiLRo4=", + "owner": "nix-community", + "repo": "emacs-overlay", + "rev": "e4a692efda41fb5afdfd961bf36cd9c73cbd5307", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "emacs-overlay", + "type": "github" + } + }, "flake-compat": { "flake": false, "locked": { @@ -181,6 +201,22 @@ "type": "github" } }, + "flake-compat_10": { + "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-compat_2": { "flake": false, "locked": { @@ -277,6 +313,22 @@ } }, "flake-compat_8": { + "flake": false, + "locked": { + "lastModified": 1650374568, + "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_9": { "flake": false, "locked": { "lastModified": 1696426674, @@ -436,7 +488,26 @@ }, "flake-utils-plus": { "inputs": { - "flake-utils": "flake-utils_5" + "flake-utils": "flake-utils_6" + }, + "locked": { + "lastModified": 1715533576, + "narHash": "sha256-fT4ppWeCJ0uR300EH3i7kmgRZnAVxrH+XtK09jQWihk=", + "owner": "gytis-ivaskevicius", + "repo": "flake-utils-plus", + "rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f", + "type": "github" + }, + "original": { + "owner": "gytis-ivaskevicius", + "repo": "flake-utils-plus", + "rev": "3542fe9126dc492e53ddd252bb0260fe035f2c0f", + "type": "github" + } + }, + "flake-utils-plus_2": { + "inputs": { + "flake-utils": "flake-utils_7" }, "locked": { "lastModified": 1715533576, @@ -455,43 +526,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_8" - }, - "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_9" - }, - "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_4": { - "inputs": { - "systems": "systems_10" + "systems": "systems_6" }, "locked": { "lastModified": 1726560853, @@ -507,9 +542,81 @@ "type": "github" } }, + "flake-utils_3": { + "inputs": { + "systems": "systems_9" + }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { + "inputs": { + "systems": "systems_10" + }, + "locked": { + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "flake-utils_5": { "inputs": { - "systems": "systems_13" + "systems": "systems_11" + }, + "locked": { + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_6": { + "inputs": { + "systems": "systems_14" + }, + "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_7": { + "inputs": { + "systems": "systems_15" }, "locked": { "lastModified": 1694529238, @@ -668,16 +775,16 @@ ] }, "locked": { - "lastModified": 1726989464, - "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", + "lastModified": 1728903686, + "narHash": "sha256-ZHFrGNWDDriZ4m8CA/5kDa250SG1LiiLPApv1p/JF0o=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", + "rev": "e1aec543f5caf643ca0d94b6a633101942fd065f", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.05", + "ref": "master", "repo": "home-manager", "type": "github" } @@ -718,7 +825,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_6" + "systems": "systems_7" }, "locked": { "lastModified": 1727257269, @@ -742,9 +849,9 @@ "hyprlang": "hyprlang_2", "hyprutils": "hyprutils_2", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems_7", + "systems": "systems_8", "xdph": "xdph" }, "locked": { @@ -952,7 +1059,7 @@ "crane": "crane", "flake-compat": "flake-compat_2", "flake-parts": "flake-parts_2", - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "nixpkgs": [ "nixpkgs" ], @@ -976,7 +1083,7 @@ }, "lib-aggregate": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_5", "nixpkgs-lib": "nixpkgs-lib" }, "locked": { @@ -1000,14 +1107,14 @@ "git-hooks": "git-hooks", "hercules-ci-effects": "hercules-ci-effects", "neovim-src": "neovim-src", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1728886882, - "narHash": "sha256-cdvOC7opKjAJyX9n1WZJei/j0RTuhVOJoJBfeWrHKWQ=", + "lastModified": 1728972634, + "narHash": "sha256-FrJPsAhfn3xRzzAgVrwriY0ROUIQ6pDsSy2U7nVkYFQ=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "19773b896a25b0bf9cc113bd9709c1783b94485b", + "rev": "3454a11f09673a73649b5e8d9be5547f03320780", "type": "github" }, "original": { @@ -1019,11 +1126,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1728817913, - "narHash": "sha256-yPj2pPBLtKY/YqjY/iWC8fmU2LRdUBrIO5dcLpNPy6s=", + "lastModified": 1728948853, + "narHash": "sha256-IfCfZ4k8foOFOqSHxC0QW7NZx8bXDH2ruySZN4Gqqng=", "owner": "neovim", "repo": "neovim", - "rev": "36890824c7edb7bc5458062c14efbfa0b1d280b5", + "rev": "4846bf05dc639592c73135fb6f1a69f410c1c40f", "type": "github" }, "original": { @@ -1036,7 +1143,7 @@ "inputs": { "flake-parts": "flake-parts_5", "nix-github-actions": "nix-github-actions", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_9", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -1155,6 +1262,22 @@ } }, "nixpkgs-stable": { + "locked": { + "lastModified": 1728740863, + "narHash": "sha256-u+rxA79a0lyhG+u+oPBRtTDtzz8kvkc9a6SWSt9ekVc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a3f9ad65a0bf298ed5847629a57808b97e6e8077", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_2": { "locked": { "lastModified": 1720386169, "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", @@ -1170,7 +1293,7 @@ "type": "github" } }, - "nixpkgs-stable_2": { + "nixpkgs-stable_3": { "locked": { "lastModified": 1678872516, "narHash": "sha256-/E1YwtMtFAu2KUQKV/1+KFuReYPANM2Rzehk84VxVoc=", @@ -1207,14 +1330,14 @@ "flake-compat": "flake-compat_5", "lib-aggregate": "lib-aggregate", "nix-eval-jobs": "nix-eval-jobs", - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_10" }, "locked": { - "lastModified": 1728937293, - "narHash": "sha256-a3Q/x62NKMRb5gzyLV+ed1LUHNrI7KwGdt48NzpHvoM=", + "lastModified": 1729019070, + "narHash": "sha256-vObr6ejeV0zBFkhU3QhNPDLZ+f7PvQIw9Ebwwe5EzoA=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "85bd1a4969ddee56ba1ddff7ebbd654754bd7e9d", + "rev": "de826e69cd303aff6f8238624a5bf608784fa764", "type": "github" }, "original": { @@ -1224,6 +1347,22 @@ } }, "nixpkgs_10": { + "locked": { + "lastModified": 1728888510, + "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { "locked": { "lastModified": 1712883908, "narHash": "sha256-icE1IJE9fHcbDfJ0+qWoDdcBXUoZCcIJxME4lMHwvSM=", @@ -1239,7 +1378,7 @@ "type": "github" } }, - "nixpkgs_11": { + "nixpkgs_12": { "locked": { "lastModified": 1718428119, "narHash": "sha256-WdWDpNaq6u1IPtxtYHHWpl5BmabtpmLnMAx0RdJ/vo8=", @@ -1255,7 +1394,7 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_13": { "locked": { "lastModified": 1727348695, "narHash": "sha256-J+PeFKSDV+pHL7ukkfpVzCOO7mBSrrpJ3svwBFABbhI=", @@ -1304,6 +1443,22 @@ } }, "nixpkgs_4": { + "locked": { + "lastModified": 1728888510, + "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { "locked": { "lastModified": 1728018373, "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", @@ -1319,7 +1474,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1706487304, "narHash": "sha256-LE8lVX28MV2jWJsidW13D2qrHU/RUUONendL2Q/WlJg=", @@ -1335,7 +1490,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1728538411, "narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=", @@ -1351,23 +1506,23 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { - "lastModified": 1728740863, - "narHash": "sha256-u+rxA79a0lyhG+u+oPBRtTDtzz8kvkc9a6SWSt9ekVc=", + "lastModified": 1728888510, + "narHash": "sha256-nsNdSldaAyu6PE3YUA+YQLqUDJh+gRbBooMMekZJwvI=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a3f9ad65a0bf298ed5847629a57808b97e6e8077", + "rev": "a3c0b3b21515f74fd2665903d4ce6bc4dc81c77c", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.05", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1723221148, "narHash": "sha256-7pjpeQlZUNQ4eeVntytU3jkw9dFK3k1Htgk2iuXjaD8=", @@ -1383,22 +1538,6 @@ "type": "github" } }, - "nixpkgs_9": { - "locked": { - "lastModified": 1728492678, - "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "pnpm2nix": { "inputs": { "flake-utils": "flake-utils", @@ -1426,7 +1565,7 @@ "hyprland", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { "lastModified": 1728092656, @@ -1457,7 +1596,7 @@ "lanzaboote", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { "lastModified": 1681413034, @@ -1475,8 +1614,8 @@ }, "resume": { "inputs": { - "nixpkgs": "nixpkgs_10", - "systems": "systems_11" + "nixpkgs": "nixpkgs_11", + "systems": "systems_12" }, "locked": { "lastModified": 1728529264, @@ -1499,14 +1638,14 @@ "nixpkgs" ], "rust-overlay": "rust-overlay_3", - "systems": "systems_12" + "systems": "systems_13" }, "locked": { - "lastModified": 1728812803, - "narHash": "sha256-KExQB86nQSnKRlXjSOjWm6LEsz80pruFDXjLkuiDBcY=", + "lastModified": 1728990091, + "narHash": "sha256-VXrLOh5VUDlOm6Eiyv+b4SD7vEYiwjYmpjXoyowyWVI=", "owner": "raphamorim", "repo": "rio", - "rev": "634d9598adb4aa4142c667336ba525a8e872126e", + "rev": "2231e255d82bbff8155594ba00f383070f292e7a", "type": "github" }, "original": { @@ -1522,6 +1661,7 @@ "anyrun": "anyrun", "blog": "blog", "catppuccin": "catppuccin", + "emacs-overlay": "emacs-overlay", "home-manager": "home-manager_2", "hypridle": "hypridle", "hyprland": "hyprland", @@ -1529,22 +1669,23 @@ "lanzaboote": "lanzaboote", "neovim-nightly-overlay": "neovim-nightly-overlay", "nixos-generators": "nixos-generators", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-wayland": "nixpkgs-wayland", "resume": "resume", "rio-term": "rio-term", "snowfall-lib": "snowfall-lib", + "solaar": "solaar", "spicetify-nix": "spicetify-nix", - "systems": "systems_14", + "systems": "systems_16", "waybar": "waybar", "zen-browser": "zen-browser" } }, "rust-overlay": { "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_5" + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1709259239, @@ -1587,7 +1728,7 @@ }, "rust-overlay_3": { "inputs": { - "nixpkgs": "nixpkgs_11" + "nixpkgs": "nixpkgs_12" }, "locked": { "lastModified": 1728700003, @@ -1625,19 +1766,66 @@ "type": "github" } }, - "spicetify-nix": { + "snowfall-lib_2": { + "inputs": { + "flake-compat": "flake-compat_8", + "flake-utils-plus": "flake-utils-plus_2", + "nixpkgs": [ + "solaar", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1718097323, + "narHash": "sha256-zCgs8Wp7rdt0tjNUHMUIvi6sIvDoprWIHwvTGq+LMK0=", + "owner": "snowfallorg", + "repo": "lib", + "rev": "aa19b02b63025263cec041fcb7a0857c3cb98859", + "type": "github" + }, + "original": { + "owner": "snowfallorg", + "ref": "v3.0.3", + "repo": "lib", + "type": "github" + } + }, + "solaar": { "inputs": { "flake-compat": "flake-compat_7", + "nixpkgs": [ + "nixpkgs" + ], + "snowfall-lib": "snowfall-lib_2" + }, + "locked": { + "lastModified": 1727251262, + "narHash": "sha256-JRfiTyNEVaf1lpH23zLP6zy8UmNMkJP5+Bi05hmUdT0=", + "owner": "Svenum", + "repo": "Solaar-Flake", + "rev": "4fd4db68701d7c96f7b81f3606fe8f5ada572c41", + "type": "github" + }, + "original": { + "owner": "Svenum", + "ref": "main", + "repo": "Solaar-Flake", + "type": "github" + } + }, + "spicetify-nix": { + "inputs": { + "flake-compat": "flake-compat_9", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1728879439, - "narHash": "sha256-spvD0mgjj0xMv4qinSl5lxGLe8V8JAeIWNs0HF0i3kE=", + "lastModified": 1728965841, + "narHash": "sha256-IwFh7KUJ9saIONcklEkXR3ANtGxkZsNdtpeT6eyF01Q=", "owner": "Gerg-L", "repo": "spicetify-nix", - "rev": "c3463a8497fef3150aa8635d32b61b16e17a1e6b", + "rev": "3dfd050f21568902449939f085e8d1aa28fb9913", "type": "github" }, "original": { @@ -1692,7 +1880,6 @@ } }, "systems_12": { - "flake": false, "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1708,6 +1895,7 @@ } }, "systems_13": { + "flake": false, "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1737,6 +1925,36 @@ "type": "github" } }, + "systems_15": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_16": { + "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, @@ -1799,16 +2017,16 @@ }, "systems_6": { "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default-linux", + "repo": "default", "type": "github" } }, @@ -1829,16 +2047,16 @@ }, "systems_8": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, @@ -1881,7 +2099,7 @@ }, "waybar": { "inputs": { - "flake-compat": "flake-compat_8", + "flake-compat": "flake-compat_10", "nixpkgs": [ "nixpkgs" ] @@ -1943,7 +2161,7 @@ }, "zen-browser": { "inputs": { - "nixpkgs": "nixpkgs_12" + "nixpkgs": "nixpkgs_13" }, "locked": { "lastModified": 1727721329, diff --git a/flake.nix b/flake.nix index 1f00920..182948b 100644 --- a/flake.nix +++ b/flake.nix @@ -11,14 +11,16 @@ }; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; home-manager = { - url = "github:nix-community/home-manager/release-24.05"; + url = "github:nix-community/home-manager/master"; inputs.nixpkgs.follows = "nixpkgs"; }; + emacs-overlay.url = "github:nix-community/emacs-overlay"; + nixpkgs-wayland.url = "github:nix-community/nixpkgs-wayland"; resume.url = "git+https://git.zoeys.computer/zoey/resume"; @@ -140,6 +142,7 @@ catppuccin.nixosModules.catppuccin blog.nixosModule agenix.nixosModules.default + solaar.nixosModules.default ]; }; } diff --git a/homes/x86_64-linux/zoey@earth/default.nix b/homes/x86_64-linux/zoey@earth/default.nix index 31ffbb7..bada23b 100644 --- a/homes/x86_64-linux/zoey@earth/default.nix +++ b/homes/x86_64-linux/zoey@earth/default.nix @@ -17,12 +17,13 @@ tools.direnv.enable = true; tools.tealdeer.enable = true; tools.bat.enable = true; + tools.emacs.enable = true; tools.gh.enable = true; term.kitty.enable = true; term.foot.enable = true; - term.rio.enable = true; + # term.rio.enable = true; term.alacritty.enable = true; music.spotify.enable = true; diff --git a/modules/home/apps/tools/emacs/default.nix b/modules/home/apps/tools/emacs/default.nix new file mode 100644 index 0000000..80bd721 --- /dev/null +++ b/modules/home/apps/tools/emacs/default.nix @@ -0,0 +1,71 @@ +{ + lib, + inputs, + config, + pkgs, + ... +}: +with lib; +with lib.custom; let + cfg = config.apps.tools.emacs; + emacs = with pkgs; + (emacsPackagesFor + emacs30-pgtk) + .emacsWithPackages (epkgs: + with epkgs; [ + treesit-grammars.with-all-grammars + vterm + mu4e + ]); +in { + options.apps.tools.emacs = { + enable = mkBoolOpt false "Enable Emacs"; + # doom = rec { + # enable = mkBoolOpt false; + # forgeUrl = mkOpt types.str "https://github.com"; + # repoUrl = mkOpt types.str "${forgeUrl}/doomemacs/doomemacs"; + # configRepoUrl = mkOpt types.str "${forgeUrl}/hlissner/.doom.d"; + # }; + }; + + config = mkIf cfg.enable { + nixpkgs.overlays = [ + inputs.emacs-overlay.overlays.default + ]; + + home.packages = with pkgs; [ + ## Emacs itself + binutils # native-comp needs 'as', provided by this + emacs # HEAD + native-comp + + ## Doom dependencies + git + ripgrep + gnutls # for TLS connectivity + + ## Optional dependencies + fd # faster projectile indexing + imagemagick # for image-dired + pinentry-emacs + zstd # for undo-fu-session/undo-tree compression + + ## Module dependencies + # :email mu4e + mu + isync + # :checkers spell + (aspellWithDicts (ds: with ds; [en en-computers en-science])) + # :tools editorconfig + editorconfig-core-c # per-project style config + # :tools lookup & :lang org +roam + sqlite + # :lang latex & :lang org (latex previews) + texlive.combined.scheme-medium + # :lang beancount + beancount + fava + # :lang nix + age + ]; + }; +} diff --git a/modules/home/apps/tools/neovim/config/lua/plugins/core.lua b/modules/home/apps/tools/neovim/config/lua/plugins/core.lua index 1cf80d5..6099eb4 100644 --- a/modules/home/apps/tools/neovim/config/lua/plugins/core.lua +++ b/modules/home/apps/tools/neovim/config/lua/plugins/core.lua @@ -25,43 +25,44 @@ return { }, }, }, - -- { - -- "saghen/blink.cmp", - -- lazy = false, -- lazy loading handled internally - -- -- optional: provides snippets for the snippet source - -- dependencies = "rafamadriz/friendly-snippets", - -- - -- -- use a release tag to download pre-built binaries - -- version = "v0.*", - -- -- OR build from source, requires nightly: https://rust-lang.github.io/rustup/concepts/channels.html#working-with-nightly-rust - -- -- build = 'cargo build --release', - -- - -- opts = { - -- keymap = { - -- show = "", - -- accept = "", - -- select_prev = { "", "" }, - -- select_next = { "", "" }, - -- - -- snippet_forward = "", - -- snippet_backward = "", - -- }, - -- - -- highlight = { - -- -- sets the fallback highlight groups to nvim-cmp's highlight groups - -- -- useful for when your theme doesn't support blink.cmp - -- -- will be removed in a future release, assuming themes add support - -- use_nvim_cmp_as_default = true, - -- }, - -- -- set to 'mono' for 'Nerd Font Mono' or 'normal' for 'Nerd Font' - -- -- adjusts spacing to ensure icons are aligned - -- nerd_font_variant = "normal", - -- - -- -- experimental auto-brackets support - -- -- accept = { auto_brackets = { enabled = true } } - -- - -- -- experimental signature help support - -- -- trigger = { signature_help = { enabled = true } } - -- }, - -- }, + { "hrsh7th/nvim-cmp", enabled = false }, + { + "saghen/blink.cmp", + lazy = false, -- lazy loading handled internally + -- optional: provides snippets for the snippet source + dependencies = "rafamadriz/friendly-snippets", + + -- use a release tag to download pre-built binaries + version = "v0.*", + -- OR build from source, requires nightly: https://rust-lang.github.io/rustup/concepts/channels.html#working-with-nightly-rust + -- build = 'cargo build --release', + + opts = { + keymap = { + show = "", + accept = "", + select_prev = { "", "" }, + select_next = { "", "" }, + + snippet_forward = "", + snippet_backward = "", + }, + + highlight = { + -- sets the fallback highlight groups to nvim-cmp's highlight groups + -- useful for when your theme doesn't support blink.cmp + -- will be removed in a future release, assuming themes add support + use_nvim_cmp_as_default = true, + }, + -- set to 'mono' for 'Nerd Font Mono' or 'normal' for 'Nerd Font' + -- adjusts spacing to ensure icons are aligned + nerd_font_variant = "normal", + + -- experimental auto-brackets support + -- accept = { auto_brackets = { enabled = true } } + + -- experimental signature help support + -- trigger = { signature_help = { enabled = true } } + }, + }, } diff --git a/modules/home/wms/hyprland/default.nix b/modules/home/wms/hyprland/default.nix index 5918c7d..c555005 100644 --- a/modules/home/wms/hyprland/default.nix +++ b/modules/home/wms/hyprland/default.nix @@ -40,13 +40,12 @@ in { config = mkIf cfg.enable { home.packages = [ - pkgs-unstable.xwayland + pkgs.xwayland ]; wayland.windowManager.hyprland = { enable = true; xwayland.enable = true; - package = inputs.hyprland.packages.${pkgs.system}.hyprland; systemd = { enable = true; @@ -171,6 +170,10 @@ in { force_zero_scaling = true; }; + cursor = { + no_hardware_cursors = true; + }; + monitor = ["DP-1,2560x1440@240,0x0,1,bitdepth,10" "HDMI-A-1,disable" "DP-2,disable"]; layerrule = [ diff --git a/modules/nixos/hardware/nvidia/default.nix b/modules/nixos/hardware/nvidia/default.nix index f9a900f..af0b798 100644 --- a/modules/nixos/hardware/nvidia/default.nix +++ b/modules/nixos/hardware/nvidia/default.nix @@ -44,7 +44,7 @@ in { nvidiaSettings = true; # Optionally, you may need to select the appropriate driver version for your specific GPU. - package = pkgs-unstable.linuxPackages_zen.nvidiaPackages.latest; + package = config.boot.kernelPackages.nvidiaPackages.beta; }; environment.variables = { diff --git a/modules/nixos/protocols/wayland/default.nix b/modules/nixos/protocols/wayland/default.nix index 0f7516c..2abbff6 100644 --- a/modules/nixos/protocols/wayland/default.nix +++ b/modules/nixos/protocols/wayland/default.nix @@ -72,7 +72,8 @@ in { extraPortals = [ pkgs.xdg-desktop-portal-gtk pkgs.xdg-desktop-portal-wlr - inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland + # inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland + pkgs.xdg-desktop-portal-hyprland pkgs.xwaylandvideobridge ]; }; diff --git a/packages/zen-browser-unwrapped/default.nix b/packages/zen-browser-unwrapped/default.nix index df5c84f..456d889 100644 --- a/packages/zen-browser-unwrapped/default.nix +++ b/packages/zen-browser-unwrapped/default.nix @@ -151,7 +151,7 @@ in buildStdenv.mkDerivation rec { pname = "zen-browser-unwrapped"; - version = "1.0.1-a.8"; + version = "1.0.1-a.10"; src = fetchFromGitHub { owner = "zen-browser"; @@ -159,13 +159,13 @@ in rev = "${version}"; leaveDotGit = true; fetchSubmodules = true; - hash = "sha256-88/9IX3YCrbVdcp9uiz713T5b4WigJf1NkZeINWGkzM="; + hash = "sha256-C08mouHUTSwiF/nNZ4T0A+33121ERWUOyCw6LMNTWQc="; }; firefoxVersion = (lib.importJSON "${src}/surfer.json").version.version; firefoxSrc = fetchurl { url = "mirror://mozilla/firefox/releases/${firefoxVersion}/source/firefox-${firefoxVersion}.source.tar.xz"; - hash = "sha256-BA6DSslN1SRvnXemb3tDxDxi9TjQC1+UWXU03B23dhY="; + hash = "sha256-en3z+Xc3RT76okPKnbr5XQ8PgzxdyK+stXBO4W7wYNA="; }; SURFER_COMPAT = generic; diff --git a/systems/x86_64-linux/earth/default.nix b/systems/x86_64-linux/earth/default.nix index d2487be..c4ec9ef 100644 --- a/systems/x86_64-linux/earth/default.nix +++ b/systems/x86_64-linux/earth/default.nix @@ -43,6 +43,7 @@ services.vpn.enable = true; services.xserver.enable = true; services.vpn.mullvad = true; + services.lorri.enable = true; services.udisks2.enable = true; services.transmission = { enable = true; @@ -81,7 +82,7 @@ boot.kernelPackages = lib.custom.pkgs-unstable.linuxPackages_zen; boot.supportedFilesystems = ["ntfs"]; - services.dlna.enable = true; + services.dlna.enable = false; # services.openssh = { # enable = true; # PasswordAuthentication = true; diff --git a/systems/x86_64-linux/pluto/default.nix b/systems/x86_64-linux/pluto/default.nix index 680b55d..11cd754 100644 --- a/systems/x86_64-linux/pluto/default.nix +++ b/systems/x86_64-linux/pluto/default.nix @@ -36,6 +36,7 @@ services.web.nginx.enable = true; services.gh.enable = true; + services.fail2ban.enable = true; sites = { cv.enable = true; gitlab.enable = true;