From de4875268a44966086947cc57db7c62c7f6b6825 Mon Sep 17 00:00:00 2001 From: Emmet Date: Sat, 7 Sep 2024 14:02:36 -0500 Subject: [PATCH] Updated system --- flake.lock | 105 ++++++++++++++------------- flake.nix | 4 +- patches/emacs-no-version-check.patch | 60 ++++++--------- system/wm/fonts.nix | 2 +- 4 files changed, 79 insertions(+), 92 deletions(-) diff --git a/flake.lock b/flake.lock index 6d564b2..fb8abc2 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1723405438, - "narHash": "sha256-bpmC2m7OhlDvqgQZdZ2jBLyeIkq/Jld3X4bqRAxBSp8=", + "lastModified": 1725199881, + "narHash": "sha256-jsmipf/u1GFZE5tBUkr56CHMN6VpUWCAjfLIhvQijU0=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "9312aa28271c91e5d67ecb9def527b2bbcff0e66", + "rev": "f8a687dd29ff019657498f1bd14da2fbbf0e604b", "type": "github" }, "original": { @@ -150,11 +150,11 @@ "blocklist-hosts": { "flake": false, "locked": { - "lastModified": 1725060487, - "narHash": "sha256-rzE0YCORL0Vh4FwL4BK18iiG44T7NdaF1CS6Nollgjc=", + "lastModified": 1725674607, + "narHash": "sha256-vTaoz2yRd9g3NZNKYufZeB8UJ381aBPmRV91lEmV37o=", "owner": "StevenBlack", "repo": "hosts", - "rev": "1295ae360bb5e60c8fce2b10eedaa4d8c7b0802d", + "rev": "10b187280ec15374e4d2b28e7705046e7d535d91", "type": "github" }, "original": { @@ -538,11 +538,11 @@ ] }, "locked": { - "lastModified": 1720042825, - "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=", + "lastModified": 1725703823, + "narHash": "sha256-tDgM4d8mLK0Hd6YMB2w1BqMto1XBXADOzPEaLl10VI4=", "owner": "nix-community", "repo": "home-manager", - "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073", + "rev": "208df2e558b73b6a1f0faec98493cb59a25f62ba", "type": "github" }, "original": { @@ -559,11 +559,11 @@ ] }, "locked": { - "lastModified": 1724435763, - "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", + "lastModified": 1725694918, + "narHash": "sha256-+HsjshXpqNiJHLaJaK0JnIicJ/a1NquKcfn4YZ3ILgg=", "owner": "nix-community", "repo": "home-manager", - "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", + "rev": "aaebdea769a5c10f1c6e50ebdf5924c1a13f0cda", "type": "github" }, "original": { @@ -637,16 +637,16 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1723738134, - "narHash": "sha256-fKZY7oieA3mgwPD6b1gQqpp9nVgRhv8xlRh6T+Drylc=", - "rev": "520e91238f0e6e6990e6a0845d73d85012485525", - "revCount": 5093, + "lastModified": 1725208645, + "narHash": "sha256-Rv6Uskm5ToMzHX/+194pYYVexfEvz8WiIjfjGoPySu8=", + "rev": "7a24e564f43d4c24abf2ec4e5351007df2f8926c", + "revCount": 5176, "submodules": true, "type": "git", "url": "https://code.hyprland.org/hyprwm/Hyprland.git" }, "original": { - "rev": "520e91238f0e6e6990e6a0845d73d85012485525", + "rev": "7a24e564f43d4c24abf2ec4e5351007df2f8926c", "submodules": true, "type": "git", "url": "https://code.hyprland.org/hyprwm/Hyprland.git" @@ -725,11 +725,11 @@ ] }, "locked": { - "lastModified": 1721324361, - "narHash": "sha256-BiJKO0IIdnSwHQBSrEJlKlFr753urkLE48wtt0UhNG4=", + "lastModified": 1725188252, + "narHash": "sha256-yBH8c4GDaEAtBrh+BqIlrx5vp6gG/Gu8fQQK63KAQgs=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "adbefbf49664a6c2c8bf36b6487fd31e3eb68086", + "rev": "c12ab785ce1982f82594aff03b3104c598186ddd", "type": "github" }, "original": { @@ -777,15 +777,16 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1721822339, - "narHash": "sha256-dkhgyxPxmOI/ZHk/LZRQZAVjtk9kPx2RFQRnuEoXQ4s=", - "rev": "58e1a4a4997728be886a46d031514b3f09763c5d", - "revCount": 234, + "lastModified": 1725203994, + "narHash": "sha256-N7Kfq8tpOWjtRKBnH5RqcDtQFGZPZ5vXgmxbnZVPCuU=", + "ref": "refs/heads/main", + "rev": "73b0fc26c0e2f6f82f9d9f5b02e660a958902763", + "revCount": 248, "type": "git", "url": "https://code.hyprland.org/hyprwm/hyprlock.git" }, "original": { - "rev": "58e1a4a4997728be886a46d031514b3f09763c5d", + "rev": "73b0fc26c0e2f6f82f9d9f5b02e660a958902763", "type": "git", "url": "https://code.hyprland.org/hyprwm/hyprlock.git" } @@ -802,11 +803,11 @@ ] }, "locked": { - "lastModified": 1722869141, - "narHash": "sha256-0KU4qhyMp441qfwbirNg3+wbm489KnEjXOz2I/RbeFs=", + "lastModified": 1724966483, + "narHash": "sha256-WXDgKIbzjYKczxSZOsJplCS1i1yrTUpsDPuJV/xpYLo=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "0252fd13e78e60fb0da512a212e56007515a49f7", + "rev": "8976e3f6a5357da953a09511d0c7f6a890fb6ec2", "type": "github" }, "original": { @@ -1055,11 +1056,11 @@ "nmd": "nmd" }, "locked": { - "lastModified": 1721670745, - "narHash": "sha256-rjTQ14dqQ90EaHQy4g/mGylrJ1aZJYc3wCXc4A3GHJg=", + "lastModified": 1725658585, + "narHash": "sha256-P29z4Gt89n5ps1U7+qmIrj0BuRXGZQSIaOe2+tsPgfw=", "owner": "nix-community", "repo": "nix-on-droid", - "rev": "248cc0806120fac9214f503dee0eaf0f47740dd0", + "rev": "5d88ff2519e4952f8d22472b52c531bb5f1635fc", "type": "github" }, "original": { @@ -1088,11 +1089,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1724819573, - "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", + "lastModified": 1725634671, + "narHash": "sha256-v3rIhsJBOMLR8e/RNWxr828tB+WywYIoajrZKFM+0Gg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", + "rev": "574d1eac1c200690e27b8eb4e24887f8df7ac27c", "type": "github" }, "original": { @@ -1135,11 +1136,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1725001927, - "narHash": "sha256-eV+63gK0Mp7ygCR0Oy4yIYSNcum2VQwnZamHxYTNi+M=", + "lastModified": 1725407940, + "narHash": "sha256-tiN5Rlg/jiY0tyky+soJZoRzLKbPyIdlQ77xVgREDNM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6e99f2a27d600612004fbd2c3282d614bfee6421", + "rev": "6f6c45b5134a8ee2e465164811e451dcb5ad86e3", "type": "github" }, "original": { @@ -1166,11 +1167,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1723415338, - "narHash": "sha256-K/BVeDLkpswRSBh3APxc2gBNVFEMXGpnkuQz666FiTM=", + "lastModified": 1725194671, + "narHash": "sha256-tLGCFEFTB5TaOKkpfw3iYT9dnk4awTP/q4w+ROpMfuw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6e8760f7f7121128e2037db44915a4a5450b6e67", + "rev": "b833ff01a0d694b910daca6e2ff4a3f26dee478c", "type": "github" }, "original": { @@ -1467,11 +1468,11 @@ ] }, "locked": { - "lastModified": 1724556439, - "narHash": "sha256-gPR3sxkKxISUvydnqoj54znpUkK8av/HVFuFJuYUw3w=", + "lastModified": 1725727445, + "narHash": "sha256-f5TrY73wfL4kvRmEtZXpzgCuxVFlNqMUNY6QSX16IPA=", "owner": "pjones", "repo": "plasma-manager", - "rev": "5c97fe8af2a2e561f14195ed357d8c451fdbff4c", + "rev": "1b9c8200d6438c98c427536abbc5b6fd6a5250c8", "type": "github" }, "original": { @@ -1553,11 +1554,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1724984647, - "narHash": "sha256-BC6MUq0CTdmAu/cueVcdWTI+S95s0mJcn19SoEgd7gU=", + "lastModified": 1725675754, + "narHash": "sha256-hXW3csqePOcF2e/PYnpXj72KEYyNj2HzTrVNmS/F7Ug=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "87b6cffc276795b46ef544d7ed8d7fed6ad9c8e4", + "rev": "8cc45e678e914a16c8e224c3237fb07cf21e5e54", "type": "github" }, "original": { @@ -1615,11 +1616,11 @@ "systems": "systems_6" }, "locked": { - "lastModified": 1724702977, - "narHash": "sha256-bP1/BHbEigLjTTmqyy1t8w5EVWHuLuABtOd/BBXVLtA=", + "lastModified": 1725290973, + "narHash": "sha256-+jwXF9KI0HfvDgpsoJGvOdfOGGSKOrID1wQB79zjUbo=", "owner": "danth", "repo": "stylix", - "rev": "6c895c6b42ca205017abe72a7263baf36a197972", + "rev": "ef81ad9e85e60420cc83d4642619c14b57139d33", "type": "github" }, "original": { @@ -1785,11 +1786,11 @@ ] }, "locked": { - "lastModified": 1722365976, - "narHash": "sha256-Khdm+mDzYA//XaU0M+hftod+rKr5q9SSHSEuiQ0/9ow=", + "lastModified": 1725203932, + "narHash": "sha256-VLULC/OnI+6R9KEP2OIGk+uLJJsfRlaLouZ5gyFd2+Y=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "7f2a77ddf60390248e2a3de2261d7102a13e5341", + "rev": "2425e8f541525fa7409d9f26a8ffaf92a3767251", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 50615da..65c9a40 100644 --- a/flake.nix +++ b/flake.nix @@ -228,7 +228,7 @@ type = "git"; url = "https://code.hyprland.org/hyprwm/Hyprland.git"; submodules = true; - rev = "520e91238f0e6e6990e6a0845d73d85012485525"; #v0.42.0+ + rev = "7a24e564f43d4c24abf2ec4e5351007df2f8926c"; #v0.42.0+ inputs.nixpkgs.follows = "nixpkgs"; }; hyprland-plugins = { @@ -240,7 +240,7 @@ hyprlock = { type = "git"; url = "https://code.hyprland.org/hyprwm/hyprlock.git"; - rev = "58e1a4a4997728be886a46d031514b3f09763c5d"; + rev = "73b0fc26c0e2f6f82f9d9f5b02e660a958902763"; inputs.nixpkgs.follows = "nixpkgs"; }; hyprgrass.url = "github:horriblename/hyprgrass/0bb3b822053c813ab6f695c9194089ccb5186cc3"; diff --git a/patches/emacs-no-version-check.patch b/patches/emacs-no-version-check.patch index d668c95..5e66bd0 100644 --- a/patches/emacs-no-version-check.patch +++ b/patches/emacs-no-version-check.patch @@ -1,37 +1,23 @@ -diff -crB nixpkgs/pkgs/applications/editors/emacs/build-support/generic.nix nixpkgs-patched/pkgs/applications/editors/emacs/build-support/generic.nix -*** nixpkgs/pkgs/applications/editors/emacs/build-support/generic.nix 2023-09-08 20:42:24.476059868 -0500 ---- nixpkgs-patched/pkgs/applications/editors/emacs/build-support/generic.nix 2023-09-08 21:12:46.637645595 -0500 -*************** -*** 3,9 **** - { lib, stdenv, emacs, texinfo, writeText, gcc, ... }: - - { pname -! , version - , buildInputs ? [] - , packageRequires ? [] - , meta ? {} ---- 3,9 ---- - { lib, stdenv, emacs, texinfo, writeText, gcc, ... }: - - { pname -! , version ? null - , buildInputs ? [] - , packageRequires ? [] - , meta ? {} -*************** -*** 20,26 **** - in - - stdenv.mkDerivation (finalAttrs: ({ -! name = "emacs-${pname}-${finalAttrs.version}"; - - unpackCmd = '' - case "$curSrc" in ---- 20,26 ---- - in - - stdenv.mkDerivation (finalAttrs: ({ -! name = "emacs-${pname}${lib.optionalString (version != null) "-${version}"}"; - - unpackCmd = '' - case "$curSrc" in +diff --git a/pkgs/applications/editors/emacs/build-support/generic.nix b/pkgs/applications/editors/emacs/build-support/generic.nix +index 3ff10ee86..56d03b6e6 100644 +--- a/pkgs/applications/editors/emacs/build-support/generic.nix ++++ b/pkgs/applications/editors/emacs/build-support/generic.nix +@@ -25,7 +25,8 @@ in + + libBuildHelper.extendMkDerivation' stdenv.mkDerivation (finalAttrs: + +-{ buildInputs ? [] ++{ version ? null ++, buildInputs ? [] + , nativeBuildInputs ? [] + , packageRequires ? [] + , propagatedBuildInputs ? [] +@@ -38,7 +39,7 @@ libBuildHelper.extendMkDerivation' stdenv.mkDerivation (finalAttrs: + }@args: + + { +- name = args.name or "emacs-${finalAttrs.pname}-${finalAttrs.version}"; ++ name = args.name or "emacs-${finalAttrs.pname}${lib.optionalString (version != null) "-${version}"}"; + + unpackCmd = args.unpackCmd or '' + case "$curSrc" in diff --git a/system/wm/fonts.nix b/system/wm/fonts.nix index ca862c8..0199e4c 100644 --- a/system/wm/fonts.nix +++ b/system/wm/fonts.nix @@ -4,7 +4,7 @@ # Fonts are nice to have fonts.packages = with pkgs; [ # Fonts - nerdfonts + # nerdfonts # FIXME broken # powerline # FIXME broken by python 311 -> 312 nixpkgs update ];