From 8fec2465d37cefc98ec42f83569adcfc32118665 Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Wed, 17 Sep 2025 00:25:17 +0800 Subject: [PATCH 1/4] feat: Add spacemacs module and update system --- _sources/generated.json | 14 +- _sources/generated.nix | 14 +- flake.lock | 253 +++++++++++------- flake.nix | 11 + .../configurations/Tytonidae/default.nix | 1 + .../modules/programs/spacemacs/default.nix | 51 ++++ 6 files changed, 238 insertions(+), 106 deletions(-) create mode 100644 home/david/modules/programs/spacemacs/default.nix diff --git a/_sources/generated.json b/_sources/generated.json index 778923d..c225c4b 100644 --- a/_sources/generated.json +++ b/_sources/generated.json @@ -22,7 +22,7 @@ }, "TrackersListCollection": { "cargoLocks": null, - "date": "2025-10-02", + "date": "2025-10-03", "extract": null, "name": "TrackersListCollection", "passthru": null, @@ -34,14 +34,14 @@ "name": null, "owner": "XIU2", "repo": "TrackersListCollection", - "rev": "2866c26d653086a2047f9fa62bfd749c5c53e789", - "sha256": "sha256-prvOu3J7q7D3cjdaLOKU66mzXarfE+VZuyb6aZKrV9E=", + "rev": "8830319bf7b42f4b69e26f6f50189b025064e4c1", + "sha256": "sha256-2HHxgnPIdbrMl3NhfZRsDl6KYgldHp4K7Wm5qIYEgQk=", "sparseCheckout": [ "all.txt" ], "type": "github" }, - "version": "2866c26d653086a2047f9fa62bfd749c5c53e789" + "version": "8830319bf7b42f4b69e26f6f50189b025064e4c1" }, "cliphist": { "cargoLocks": null, @@ -262,7 +262,7 @@ "type": "url", "url": "http://wallpaper.youthlic.social/hieda-no-akyuu-touhou.1920x1080.mp4" }, - "version": "346942a88f763c59cc17f7b2a02756cc9d2a0c891585f916e3a4a9c15fe26ac9" + "version": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" }, "wallpaper_hollow-knight-quest.3840x2160.mp4": { "cargoLocks": null, @@ -277,7 +277,7 @@ "type": "url", "url": "http://wallpaper.youthlic.social/hollow-knight-quest.3840x2160.mp4" }, - "version": "ecbb31075e7e387cb03a9035298a2b0fbce529d2f4dc91b7bddaa08af570a41b" + "version": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" }, "wallpaper_outer-wilds.3840x2160.mp4": { "cargoLocks": null, @@ -292,7 +292,7 @@ "type": "url", "url": "http://wallpaper.youthlic.social/outer-wilds.3840x2160.mp4" }, - "version": "19e0ccb48483f55f3413201718e8b2ba4a6acd112e1a3e7bb5ad913b87c5f210" + "version": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" }, "wshowkeys-mao": { "cargoLocks": null, diff --git a/_sources/generated.nix b/_sources/generated.nix index 5f1700a..41c5191 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -15,18 +15,18 @@ }; TrackersListCollection = { pname = "TrackersListCollection"; - version = "2866c26d653086a2047f9fa62bfd749c5c53e789"; + version = "8830319bf7b42f4b69e26f6f50189b025064e4c1"; src = fetchFromGitHub { owner = "XIU2"; repo = "TrackersListCollection"; - rev = "2866c26d653086a2047f9fa62bfd749c5c53e789"; + rev = "8830319bf7b42f4b69e26f6f50189b025064e4c1"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; sparseCheckout = [ "all.txt" ]; - sha256 = "sha256-prvOu3J7q7D3cjdaLOKU66mzXarfE+VZuyb6aZKrV9E="; + sha256 = "sha256-2HHxgnPIdbrMl3NhfZRsDl6KYgldHp4K7Wm5qIYEgQk="; }; - date = "2025-10-02"; + date = "2025-10-03"; }; cliphist = { pname = "cliphist"; @@ -160,7 +160,7 @@ }; "wallpaper_hieda-no-akyuu-touhou.1920x1080.mp4" = { pname = "wallpaper_hieda-no-akyuu-touhou.1920x1080.mp4"; - version = "346942a88f763c59cc17f7b2a02756cc9d2a0c891585f916e3a4a9c15fe26ac9"; + version = "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"; src = fetchurl { url = "http://wallpaper.youthlic.social/hieda-no-akyuu-touhou.1920x1080.mp4"; sha256 = "sha256-NGlCqI92PFnMF/eyoCdWzJ0qDIkVhfkW46SpwV/iask="; @@ -168,7 +168,7 @@ }; "wallpaper_hollow-knight-quest.3840x2160.mp4" = { pname = "wallpaper_hollow-knight-quest.3840x2160.mp4"; - version = "ecbb31075e7e387cb03a9035298a2b0fbce529d2f4dc91b7bddaa08af570a41b"; + version = "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"; src = fetchurl { url = "http://wallpaper.youthlic.social/hollow-knight-quest.3840x2160.mp4"; sha256 = "sha256-7LsxB15+OHywOpA1KYorD7zlKdL03JG3vdqgivVwpBs="; @@ -176,7 +176,7 @@ }; "wallpaper_outer-wilds.3840x2160.mp4" = { pname = "wallpaper_outer-wilds.3840x2160.mp4"; - version = "19e0ccb48483f55f3413201718e8b2ba4a6acd112e1a3e7bb5ad913b87c5f210"; + version = "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"; src = fetchurl { url = "http://wallpaper.youthlic.social/outer-wilds.3840x2160.mp4"; sha256 = "sha256-GeDMtISD9V80EyAXGOiyukpqzREuGj57ta2RO4fF8hA="; diff --git a/flake.lock b/flake.lock index 5145b39..3f1a318 100644 --- a/flake.lock +++ b/flake.lock @@ -99,11 +99,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1759237724, - "narHash": "sha256-u53z8+cz+r8gA4fTHNRO42gT7jdfYUGJam+aUSbPOqc=", + "lastModified": 1759348172, + "narHash": "sha256-ZPUJX2ZA0ndcHndIA/S/nRESIJV0rifPr91SUpzJtEM=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "91c1dec13820596014f973d69e8af7f1890edbd2", + "rev": "dd1af56ad79c965ee20c236ba6adbb2135ac02af", "type": "github" }, "original": { @@ -211,6 +211,25 @@ } }, "emacs-overlay": { + "inputs": { + "nixpkgs": "nixpkgs_2", + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1759456943, + "narHash": "sha256-WjK2qcb1+jYYtIBEROW8/IE+q781r6hEP+97Kf2ITvE=", + "owner": "nix-community", + "repo": "emacs-overlay", + "rev": "68529e783b91782936f01883d7fbf071c3e58da4", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "emacs-overlay", + "type": "github" + } + }, + "emacs-overlay_2": { "inputs": { "nixpkgs": [ "nix-doom" @@ -220,11 +239,11 @@ ] }, "locked": { - "lastModified": 1759284850, - "narHash": "sha256-MP06v4gTOch6UMyoxPSNWkDarPbgj8HlZtenHIQzhXE=", + "lastModified": 1759370635, + "narHash": "sha256-qX5Ot+d1Hh7wvpDnt41dwJC3VqzpG+Yue4d3fM/Xlmk=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "e0929cc9ff9bfd638f60b38b1f55605b5e75363a", + "rev": "e8a15f25bcbd4e29cd7a36e1fbc3df525cca9acb", "type": "github" }, "original": { @@ -339,11 +358,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1756770412, - "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", + "lastModified": 1759362264, + "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4524271976b625a4a605beefd893f270620fd751", + "rev": "758cf7296bee11f1706a574c77d072b8a7baa881", "type": "github" }, "original": { @@ -381,11 +400,11 @@ ] }, "locked": { - "lastModified": 1756770412, - "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", + "lastModified": 1759362264, + "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4524271976b625a4a605beefd893f270620fd751", + "rev": "758cf7296bee11f1706a574c77d072b8a7baa881", "type": "github" }, "original": { @@ -402,11 +421,11 @@ ] }, "locked": { - "lastModified": 1756770412, - "narHash": "sha256-+uWLQZccFHwqpGqr2Yt5VsW/PbeJVTn9Dk6SHWhNRPw=", + "lastModified": 1759362264, + "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "4524271976b625a4a605beefd893f270620fd751", + "rev": "758cf7296bee11f1706a574c77d072b8a7baa881", "type": "github" }, "original": { @@ -656,11 +675,11 @@ ] }, "locked": { - "lastModified": 1759172751, - "narHash": "sha256-E8W8sRXfrvkFW26GuuiWq6QfReU7m5+cngwHuRo/3jc=", + "lastModified": 1759261733, + "narHash": "sha256-G104PUPKBgJmcu4NWs0LUaPpSOTD4jiq4mamLWu3Oc0=", "owner": "nix-community", "repo": "home-manager", - "rev": "12fa8548feefa9a10266ba65152fd1a787cdde8f", + "rev": "5a21f4819ee1be645f46d6b255d49f4271ef6723", "type": "github" }, "original": { @@ -741,11 +760,11 @@ ] }, "locked": { - "lastModified": 1757230583, - "narHash": "sha256-4uqu7sFPOaVTCogsxaGMgbzZ2vK40GVGMfUmrvK3/LY=", + "lastModified": 1759217228, + "narHash": "sha256-P13ExJlhMVkrc5LxZLNkIJZhjNYo3LLXnxDsUNrdnMQ=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "fc3960e6c32c9d4f95fff2ef84444284d24d3bea", + "rev": "e52c15ab25f7dc68dde527c8df5bfa9d80d8e64f", "type": "github" }, "original": { @@ -759,7 +778,7 @@ "crane": "crane", "flake-compat": "flake-compat_2", "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "rust-overlay": "rust-overlay_3" }, @@ -824,15 +843,15 @@ "git-hooks": "git-hooks", "hercules-ci-effects": "hercules-ci-effects", "neovim-src": "neovim-src", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_4", "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1759277111, - "narHash": "sha256-SDLZMha2miaChOBGBkQJlTtk2kvcB7WIVVZ2l0/9byc=", + "lastModified": 1759449996, + "narHash": "sha256-uVU5w4rjS7OLvfYyQO2z6Ek3VjRQcwEnMM9PMNsPupI=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "b7b3632fab34541543373254c265da03c1d0f240", + "rev": "7412bed2f1eb9770c6d4a23953bfbc0df8fcf258", "type": "github" }, "original": { @@ -844,11 +863,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1759210115, - "narHash": "sha256-oc1pPeoe8458X0r/Wum8CucVcJLlIp4mg+1HiOSVRgA=", + "lastModified": 1759446555, + "narHash": "sha256-f2tc3fri2itU727dGn11HmE72WeZGTeR7+zJI/7SB3o=", "owner": "neovim", "repo": "neovim", - "rev": "198c9e9bca7549cf7110be8c6f1df1c38d4e747f", + "rev": "2abea5dc37734aeb349b52b29eadccc9209fa3bf", "type": "github" }, "original": { @@ -864,16 +883,16 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_2", + "nixpkgs-stable": "nixpkgs-stable_3", "xwayland-satellite-stable": "xwayland-satellite-stable", "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1759207481, - "narHash": "sha256-xhUr1oMQwL/8h8xnPi5QxUHRFDHoCofhw8Jy7qTD4BY=", + "lastModified": 1759451820, + "narHash": "sha256-3wpxw9FLg1Cv1p8B/aJnQBHvm1NROLI1TCUovHoXB34=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "d425163158a96a26924597574316a627d2e982aa", + "rev": "773aa140dd70ae4eaafc2bcb7f4384ab32115404", "type": "github" }, "original": { @@ -902,11 +921,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1758691861, - "narHash": "sha256-CYgoGrY/Fx+hjzp8graTxJw1M7mn1f2jBkK26M04T0s=", + "lastModified": 1759395653, + "narHash": "sha256-sv9J1z6CrTPf9lRJLyCN90fZVdQz7LFeX7pIlInH8BQ=", "owner": "YaLTeR", "repo": "niri", - "rev": "e837e39623457dc5ad29c34a5ce4d4616e5fbf1e", + "rev": "ba6e5e082a79901dc89b0d49c5da1b769d652aec", "type": "github" }, "original": { @@ -918,18 +937,18 @@ "nix-doom": { "inputs": { "doomemacs": "doomemacs", - "emacs-overlay": "emacs-overlay", + "emacs-overlay": "emacs-overlay_2", "nixpkgs": [ "nixpkgs" ], "systems": "systems_3" }, "locked": { - "lastModified": 1759308114, - "narHash": "sha256-H/V+NR6EbP68M4SFMU4YUkGz7nMhDTqgSqVAs+1OMPU=", + "lastModified": 1759405741, + "narHash": "sha256-aNjjON77C1rV5UDFGXraj8zuI6XITjWHsC3gYXd9X+U=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "e7ac2cfa21a9489f1ec5f08b979a1ce96bd96e48", + "rev": "dbc282ec717fbb421aceb033f0e9b2f34265381b", "type": "github" }, "original": { @@ -1009,6 +1028,22 @@ } }, "nixpkgs-stable": { + "locked": { + "lastModified": 1759281824, + "narHash": "sha256-FIBE1qXv9TKvSNwst6FumyHwCRH3BlWDpfsnqRDCll0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "5b5be50345d4113d04ba58c444348849f5585b4a", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_2": { "locked": { "lastModified": 1730741070, "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", @@ -1024,13 +1059,13 @@ "type": "github" } }, - "nixpkgs-stable_2": { + "nixpkgs-stable_3": { "locked": { - "lastModified": 1759143472, - "narHash": "sha256-TvODmeR2W7yX/JmOCmP+lAFNkTT7hAxYcF3Kz8SZV3w=", + "lastModified": 1759281824, + "narHash": "sha256-FIBE1qXv9TKvSNwst6FumyHwCRH3BlWDpfsnqRDCll0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5ed4e25ab58fd4c028b59d5611e14ea64de51d23", + "rev": "5b5be50345d4113d04ba58c444348849f5585b4a", "type": "github" }, "original": { @@ -1041,6 +1076,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1759381078, + "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1731919951, "narHash": "sha256-vOM6ETpl1yu9KLi/icTmLJIPbbdJCdAVYUXZceO/Ce4=", @@ -1056,13 +1107,13 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { - "lastModified": 1759070547, - "narHash": "sha256-JVZl8NaVRYb0+381nl7LvPE+A774/dRpif01FKLrYFQ=", + "lastModified": 1759417375, + "narHash": "sha256-O7eHcgkQXJNygY6AypkF9tFhsoDQjpNEojw3eFs73Ow=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "647e5c14cbd5067f44ac86b74f014962df460840", + "rev": "dc704e6102e76aad573f63b74c742cd96f8f1e6c", "type": "github" }, "original": { @@ -1072,29 +1123,29 @@ "type": "github" } }, - "nixpkgs_4": { - "locked": { - "lastModified": 1759036355, - "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_5": { "locked": { - "lastModified": 1758763312, - "narHash": "sha256-puBMviZhYlqOdUUgEmMVJpXqC/ToEqSvkyZ30qQ09xM=", + "lastModified": 1759381078, + "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e57b3b16ad8758fd681511a078f35c416a8cc939", + "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { + "locked": { + "lastModified": 1759386674, + "narHash": "sha256-wg1Lz/1FC5Q13R+mM5a2oTV9TA9L/CHHTm3/PiLayfA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "625ad6366178f03acd79f9e3822606dd7985b657", "type": "github" }, "original": { @@ -1104,13 +1155,13 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { - "lastModified": 1759036355, - "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", + "lastModified": 1759381078, + "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", + "rev": "7df7ff7d8e00218376575f0acdcc5d66741351ee", "type": "github" }, "original": { @@ -1120,7 +1171,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1754340878, "narHash": "sha256-lgmUyVQL9tSnvvIvBp7x1euhkkCho7n3TMzgjdvgPoU=", @@ -1139,16 +1190,16 @@ "nixvim": { "inputs": { "flake-parts": "flake-parts_5", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_6", "nuschtosSearch": "nuschtosSearch", "systems": "systems_5" }, "locked": { - "lastModified": 1759279360, - "narHash": "sha256-0WavBzKMQ4Pn68fDHR1rigB+w5SlW36+Jxq/EuHmOhw=", + "lastModified": 1759445396, + "narHash": "sha256-ofMqAEC6NcFSDGC6qMMG+XFtmlnOghuxh89SzN40+sc=", "owner": "nix-community", "repo": "nixvim", - "rev": "fe059cd395575c00d475ab1c8200dcc3495724d9", + "rev": "eb54f65d9b24310a55de000e62ff6053aa8874ed", "type": "github" }, "original": { @@ -1160,14 +1211,14 @@ "nur": { "inputs": { "flake-parts": "flake-parts_6", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1759337115, - "narHash": "sha256-/iwu/b+72qvEzhEsh71phNa6jQFr9uxBiYE2aUFOGY4=", + "lastModified": 1759475326, + "narHash": "sha256-bXXGDZQm05KmaSf/TDqAOkPK4i6Ba5y12aL6/hcJiro=", "owner": "nix-community", "repo": "NUR", - "rev": "40d58317e97e60351bc08f3c95b94194c52e4219", + "rev": "1d38cb6e7f916b7a31f4d8ef1995ba9fbaf93380", "type": "github" }, "original": { @@ -1235,7 +1286,7 @@ "lanzaboote", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { "lastModified": 1731363552, @@ -1258,6 +1309,7 @@ "dae": "dae", "deploy-rs": "deploy-rs", "disko": "disko", + "emacs-overlay": "emacs-overlay", "flake-parts": "flake-parts_2", "flake-utils": "flake-utils", "helix": "helix", @@ -1268,10 +1320,11 @@ "niri-flake": "niri-flake", "nix-doom": "nix-doom", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_5", "nixvim": "nixvim", "nur": "nur", "sops-nix": "sops-nix", + "spacemacs": "spacemacs", "stylix": "stylix", "treefmt-nix": "treefmt-nix_2" } @@ -1284,11 +1337,11 @@ ] }, "locked": { - "lastModified": 1759113356, - "narHash": "sha256-xm4kEUcV2jk6u15aHazFP4YsMwhq+PczA+Ul/4FDKWI=", + "lastModified": 1759286284, + "narHash": "sha256-JLdGGc4XDutzSD1L65Ni6Ye+oTm8kWfm0KTPMcyl7Y4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "be3b8843a2be2411500f6c052876119485e957a2", + "rev": "f6f2da475176bb7cff51faae8b3fe879cd393545", "type": "github" }, "original": { @@ -1359,6 +1412,22 @@ "type": "github" } }, + "spacemacs": { + "flake": false, + "locked": { + "lastModified": 1759268257, + "narHash": "sha256-AobwqrSSzIKQdKlbyWXLS3TRW0nF2pIVQBBD7++l/mA=", + "owner": "syl20bnr", + "repo": "spacemacs", + "rev": "899032e4f5b3b90fa160c9f0bf8ed179161f696e", + "type": "github" + }, + "original": { + "owner": "syl20bnr", + "repo": "spacemacs", + "type": "github" + } + }, "stylix": { "inputs": { "base16": "base16", @@ -1382,11 +1451,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1759305203, - "narHash": "sha256-Mj3VQcpE5CVqfhi0Yp2B5qn5EcUwiPD4nCngxUiBHMg=", + "lastModified": 1759404594, + "narHash": "sha256-k9hd15rLqG7x3OCUPrcQtpleDlOyQjy16ZEseruypNQ=", "owner": "nix-community", "repo": "stylix", - "rev": "126e6c7625620e949d86578046fe97f418478c42", + "rev": "3f70c5855572004f9c630ed4a92aa186755361be", "type": "github" }, "original": { @@ -1589,7 +1658,7 @@ }, "treefmt-nix_2": { "inputs": { - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1758728421, @@ -1625,11 +1694,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1758577423, - "narHash": "sha256-sB2GAOjhjoWnjU6A/uHNJiY6O3UeztV5pJAN2g1FkXU=", + "lastModified": 1759449168, + "narHash": "sha256-Ka18wfIaNvTN9sr+PBie6P83959Om4j5P62M4RwNeoY=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "03368548ba745e17a85bd631613a59cb2d8469a4", + "rev": "da6693c88ab5edac2ec3c81730f112be67abe278", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c398acb..886c14e 100644 --- a/flake.nix +++ b/flake.nix @@ -208,5 +208,16 @@ repo = "nix-doom-emacs-unstraightened"; inputs.nixpkgs.follows = "nixpkgs"; }; + spacemacs = { + type = "github"; + owner = "syl20bnr"; + repo = "spacemacs"; + flake = false; + }; + emacs-overlay = { + type = "github"; + owner = "nix-community"; + repo = "emacs-overlay"; + }; }; } diff --git a/home/david/configurations/Tytonidae/default.nix b/home/david/configurations/Tytonidae/default.nix index de7cf2b..e454ebd 100644 --- a/home/david/configurations/Tytonidae/default.nix +++ b/home/david/configurations/Tytonidae/default.nix @@ -58,6 +58,7 @@ openssh.enable = true; helix.enable = true; doom.enable = true; + # spacemacs.enable = true; }; }; diff --git a/home/david/modules/programs/spacemacs/default.nix b/home/david/modules/programs/spacemacs/default.nix new file mode 100644 index 0000000..ddd3635 --- /dev/null +++ b/home/david/modules/programs/spacemacs/default.nix @@ -0,0 +1,51 @@ +{ + config, + pkgs, + lib, + inputs, + ... +}: +let + inherit (inputs) nixpkgs emacs-overlay spacemacs; + inherit (pkgs) system; + cfg = config.david.programs.spacemacs; + pkgs' = import nixpkgs { + inherit system; + overlays = [ emacs-overlay.overlays.default ]; + }; +in +{ + options = { + david.programs.spacemacs = { + enable = lib.mkEnableOption "spacemacs"; + }; + }; + config = lib.mkIf cfg.enable { + stylix.targets.emacs.enable = false; + xdg.configFile = { + emacs = { + source = "${spacemacs}"; + recursive = true; + }; + }; + programs.emacs = { + enable = true; + package = + with pkgs'; + (emacsPackagesFor emacs-pgtk).emacsWithPackages (epkgs: [ + git + gnutar + ripgrep + ]); + }; + services.emacs = { + client = { + enable = true; + }; + defaultEditor = false; + enable = true; + socketActivation.enable = true; + startWithUserSession = true; + }; + }; +} From 1c240dcf0821862195eb26bc2fc4c6572928f6ae Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Wed, 17 Sep 2025 00:25:17 +0800 Subject: [PATCH 2/4] chore: Delete waydoird-script overlay --- overlays/additions/waydroid-script.nix | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 overlays/additions/waydroid-script.nix diff --git a/overlays/additions/waydroid-script.nix b/overlays/additions/waydroid-script.nix deleted file mode 100644 index 13dd6cd..0000000 --- a/overlays/additions/waydroid-script.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ outputs, ... }: -_final: prev: -let - inherit (prev.stdenv.hostPlatform) system; -in -{ - inherit (outputs.packages.${system}) waydroid-script; -} From e8a9d45a76ea9a7204f7d9306cfee8bfad75e4c6 Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Wed, 17 Sep 2025 00:25:17 +0800 Subject: [PATCH 3/4] feat: Add some libraries into nix-ld --- nixos/modules/programs/nix-ld.nix | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/nixos/modules/programs/nix-ld.nix b/nixos/modules/programs/nix-ld.nix index 5a2e70f..733d5b6 100644 --- a/nixos/modules/programs/nix-ld.nix +++ b/nixos/modules/programs/nix-ld.nix @@ -1,6 +1,7 @@ { config, lib, + pkgs, ... }: let @@ -15,16 +16,17 @@ in config = lib.mkIf cfg.enable { programs.nix-ld = { enable = true; - # libraries = with pkgs; [ - # stdenv.cc.cc - # zlib - # fuse3 - # icu - # nss - # openssl - # curl - # expat - # ]; + libraries = with pkgs; [ + stdenv.cc.cc + zlib + fuse3 + icu + nss + openssl + curl + expat + rustls-libssl + ]; }; }; } From 9fbcd61b14761e6d957a02d5252e487258b026bc Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Wed, 17 Sep 2025 00:25:17 +0800 Subject: [PATCH 4/4] Improve emacs configuration --- home/david/modules/programs/doom/config/config.el | 4 ++++ home/david/modules/programs/doom/config/init.el | 4 ++-- home/david/modules/programs/doom/default.nix | 11 ++++++++++- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/home/david/modules/programs/doom/config/config.el b/home/david/modules/programs/doom/config/config.el index 94ea667..b4fff06 100644 --- a/home/david/modules/programs/doom/config/config.el +++ b/home/david/modules/programs/doom/config/config.el @@ -79,3 +79,7 @@ NOTE: wayland only." (let* ((fpath (telega--tl-get dfile :local :path))) (shell-command (format "wl-copy < \"%s\"" fpath)) (message (format "File saved to clipboard: %s" fpath)))))))) + +(map! :map global-map + "C-c n" + #'helm-nixos-options) diff --git a/home/david/modules/programs/doom/config/init.el b/home/david/modules/programs/doom/config/init.el index 706c70f..10af537 100644 --- a/home/david/modules/programs/doom/config/init.el +++ b/home/david/modules/programs/doom/config/init.el @@ -23,8 +23,8 @@ ;;layout ; auie,ctsrnm is the superior home row :completion - ;;company ; the ultimate code completion backend - (corfu +orderless) ; complete with cap(f), cape and a flying feather! + (company +childframe) ; the ultimate code completion backend + ;;(corfu +orderless) ; complete with cap(f), cape and a flying feather! ;;helm ; the *other* search engine for love and life ;;ido ; the other *other* search engine... ;;ivy ; a search engine for love and life diff --git a/home/david/modules/programs/doom/default.nix b/home/david/modules/programs/doom/default.nix index 8f326a8..2524c21 100644 --- a/home/david/modules/programs/doom/default.nix +++ b/home/david/modules/programs/doom/default.nix @@ -2,10 +2,18 @@ config, lib, pkgs, + inputs, ... }: let cfg = config.david.programs.doom; + + inherit (inputs) emacs-overlay nixpkgs; + inherit (pkgs) system; + pkgs' = import nixpkgs { + inherit system; + overlays = [ emacs-overlay.overlays.default ]; + }; in { options = { @@ -18,10 +26,11 @@ in services.emacs.enable = true; programs.doom-emacs = { enable = true; - emacs = pkgs.emacs-pgtk; + emacs = pkgs'.emacs-igc-pgtk; extraPackages = ep: with ep; [ melpaPackages.telega + melpaPackages.nixos-options ]; extraBinPackages = with pkgs; [ editor-runtime