From cd665064c74897bcb9ba4fdac496a135f39d59be Mon Sep 17 00:00:00 2001 From: Aleksandr Lebedev Date: Sun, 9 Mar 2025 20:44:51 +0100 Subject: [PATCH] Emacs update, clangd --- flake.lock | 12 ++++++------ flake.nix | 16 +++++++++++++--- nixos/configuration.nix | 12 +++--------- nixos/hosts/kylekrein-homepc/default.nix | 2 +- 4 files changed, 23 insertions(+), 19 deletions(-) diff --git a/flake.lock b/flake.lock index ccdf334..0472709 100644 --- a/flake.lock +++ b/flake.lock @@ -115,11 +115,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1741365793, - "narHash": "sha256-vBjwaBax4Qy/AFm+gg0N0d9dHLZyp+65cvPFRMptbCQ=", + "lastModified": 1741549257, + "narHash": "sha256-vNUT0mQj3NXMyhmrYQ4X2P9p4pi9/5mOn8yKnX4SR0k=", "owner": "kylekrein", "repo": "emacs-config", - "rev": "101286133034af6583da09982e4ecac73383789d", + "rev": "48029097a53789972bfec33f29e9fc2b827281ed", "type": "github" }, "original": { @@ -726,11 +726,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1741513604, - "narHash": "sha256-/56omwPffiS6L7uE4eX2Gfmfq5ZYQNrSi8so/2lXcmw=", + "lastModified": 1741548396, + "narHash": "sha256-vuGv9LvRbFWIUrF+0GAoT3MufTVLmQx5Jn3JFNFx4K4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6c8ad0b05d8cc7825c6bc68bc924ab0dd0649c70", + "rev": "36532ffc1f7bbe58d1ac22cc68d32156ae612960", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 38438ad..7e84d2d 100644 --- a/flake.nix +++ b/flake.nix @@ -80,10 +80,23 @@ #}; arm = "aarch64-linux"; x86 = "x86_64-linux"; + ladybirdMaster = self: super: { ladybird = super.ladybird.overrideAttrs(old: { + src = super.fetchFromGitHub { + owner = "LadybirdWebBrowser"; + repo = "ladybird"; + rev = "bf15b7ac12e2e796c35c5714c3a3a47be7308d20"; + hash = "sha256-hJkK7nag3Z9E8etPFCo0atUEJJnPjjkl7sle/UwkzbE="; + }; + version = "0-unstable-2025-03-09"; + });}; + nativePackagesOverlay = self: super: { + stdenv = super.impureUseNativeOptimizations super.stdenv; + }; kylekrein-homepc-pkgs = nixpkgs: import nixpkgs { system = x86; overlays = [ #nativePackagesOverlay + #ladybirdMaster ]; config = { allowBroken = true; @@ -123,9 +136,6 @@ #cudaSupport = true; }; }; - nativePackagesOverlay = self: super: { - stdenv = super.impureUseNativeOptimizations super.stdenv; - }; first-nixos-install = "1729112485"; #stat -c %W / in { diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 027d283..f4b7039 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -11,15 +11,7 @@ unstable-pkgs, ... }: -let ladybird = pkgs.ladybird.overrideAttrs(old: { - src = pkgs.fetchFromGitHub { - owner = "LadybirdWebBrowser"; - repo = "ladybird"; - rev = "f148af0a9399139b85308ae1eacc8f0f738ed26c"; - hash = "sha256-pmUpVa1l47m6mLilaMuxuIGNRkcOGscr5h6T0sNBXOM="; - }; - version = "0-unstable-2025-03-04"; - }); +let in { imports = [ @@ -177,6 +169,8 @@ in # user packages obs-studio neovim + + llvmPackages_19.clang-tools ]; programs.kdeconnect.enable = true; diff --git a/nixos/hosts/kylekrein-homepc/default.nix b/nixos/hosts/kylekrein-homepc/default.nix index a448537..d65f735 100644 --- a/nixos/hosts/kylekrein-homepc/default.nix +++ b/nixos/hosts/kylekrein-homepc/default.nix @@ -21,7 +21,7 @@ sops.secrets."ssh_keys/${hwconfig.hostname}" = {}; environment.systemPackages = with pkgs; [ blender - + ladybird #inputs.nix-gaming.packages.${pkgs.system}.star-citizen ]; #LLMs