From a91f7047d57c34f68354c80ab9d381812f00a032 Mon Sep 17 00:00:00 2001
From: Zynh Ludwig <zynh0722@gmail.com>
Date: Wed, 5 Feb 2025 12:01:23 -0800
Subject: [PATCH] flake: update (thanks umu)
just nuked the lockfile, fresh files bb
---
flake.lock | 252 +++++++++++++++++++++++++++++++++++------------------
flake.nix | 2 +-
2 files changed, 166 insertions(+), 88 deletions(-)
diff --git a/flake.lock b/flake.lock
index 1c2f9cc..b9ac8fb 100644
--- a/flake.lock
+++ b/flake.lock
@@ -29,11 +29,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
- "lastModified": 1738552004,
- "narHash": "sha256-eYE+8F0ZrSIYvlVkgTjTBlnM1COqUdSs4GKyWnel6I4=",
+ "lastModified": 1738707394,
+ "narHash": "sha256-XXrOqNs9a4L6p6/KXxIGotHOxzjPxva1queN3JK0E4c=",
"owner": "chaotic-cx",
"repo": "nyx",
- "rev": "894d1db77131a4a449d1993c7ba314ee15dd4e36",
+ "rev": "236da2b18bfbddf782f85ee664fdfb9d50606229",
"type": "github"
},
"original": {
@@ -167,6 +167,21 @@
"type": "github"
}
},
+ "flake-compat_4": {
+ "locked": {
+ "lastModified": 1717312683,
+ "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=",
+ "owner": "nix-community",
+ "repo": "flake-compat",
+ "rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-community",
+ "repo": "flake-compat",
+ "type": "github"
+ }
+ },
"flake-parts": {
"inputs": {
"nixpkgs-lib": [
@@ -232,11 +247,11 @@
"nixpkgs-lib": "nixpkgs-lib_2"
},
"locked": {
- "lastModified": 1733312601,
- "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
+ "lastModified": 1738453229,
+ "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
"owner": "hercules-ci",
"repo": "flake-parts",
- "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
+ "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
"type": "github"
},
"original": {
@@ -277,6 +292,24 @@
"type": "github"
}
},
+ "flake-utils_2": {
+ "inputs": {
+ "systems": "systems_3"
+ },
+ "locked": {
+ "lastModified": 1731533236,
+ "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+ "type": "github"
+ },
+ "original": {
+ "owner": "numtide",
+ "repo": "flake-utils",
+ "type": "github"
+ }
+ },
"flakey-profile": {
"locked": {
"lastModified": 1712898590,
@@ -387,11 +420,11 @@
]
},
"locked": {
- "lastModified": 1738610386,
- "narHash": "sha256-yb6a5efA1e8xze1vcdN2HBxqYr340EsxFMrDUHL3WZM=",
+ "lastModified": 1738753876,
+ "narHash": "sha256-yXT82kERWL4R81hfun9BuT478Q6ut0dJzdQjAxjRS38=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "066ba0c5cfddbc9e0dddaec73b1561ad38aa8abe",
+ "rev": "f20b7a8ab527a2482f13754dc00b2deaddc34599",
"type": "github"
},
"original": {
@@ -422,6 +455,25 @@
"type": "github"
}
},
+ "lib-aggregate": {
+ "inputs": {
+ "flake-utils": "flake-utils_2",
+ "nixpkgs-lib": "nixpkgs-lib_3"
+ },
+ "locked": {
+ "lastModified": 1738498314,
+ "narHash": "sha256-6FIIy5TFqf5CuzfN1u4CT7FWHVOA2+GuoawBsPhjrhk=",
+ "owner": "nix-community",
+ "repo": "lib-aggregate",
+ "rev": "d9e1e62ee65421de564adc3d8d63b6ae7e4e6e79",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-community",
+ "repo": "lib-aggregate",
+ "type": "github"
+ }
+ },
"lix": {
"flake": false,
"locked": {
@@ -470,11 +522,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
- "lastModified": 1738569536,
- "narHash": "sha256-oIhU2SGZnCX7fqFg0ZmnpXhUggRogkVr6cqcH1PXDZ8=",
+ "lastModified": 1738742827,
+ "narHash": "sha256-xC0zR7boeTpq1N5ewMUoyiy8q4Ew7LCYAXkovNLRaDs=",
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
- "rev": "9fb5bc0eff86f8bad827f9f3d17d76789d28643b",
+ "rev": "f6e61ad1d1189307196e0a0a96cdef0690e8b16f",
"type": "github"
},
"original": {
@@ -486,11 +538,11 @@
"neovim-src": {
"flake": false,
"locked": {
- "lastModified": 1738537783,
- "narHash": "sha256-BbtORMMsvCyobInYJdCiIvUuhK9PXH1gBEJhKjEMFTQ=",
+ "lastModified": 1738710393,
+ "narHash": "sha256-b7DnTeOB+iJG/Fsc7uXDYC6tWaWINZbx+XZAl8H82VY=",
"owner": "neovim",
"repo": "neovim",
- "rev": "87e806186c721f12c338af86677b6d1e6e2fa44a",
+ "rev": "1deb580977f4144ff3e4704765d13684e84405c5",
"type": "github"
},
"original": {
@@ -531,11 +583,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
},
"locked": {
- "lastModified": 1738583235,
- "narHash": "sha256-Tk5w3uqp045W/W0mDQT0swwy90ex0l3JWS2crimG8Wo=",
+ "lastModified": 1738770770,
+ "narHash": "sha256-nfapp7C4BbdvHTRA1HSRVYjD5Fk2FCKoyxQLzcL5X50=",
"owner": "sodiboo",
"repo": "niri-flake",
- "rev": "1511396846427b58f1d6ca5442a228ede7673c67",
+ "rev": "83abbde7c8164ee4b42a8647e4e61015c3f45816",
"type": "github"
},
"original": {
@@ -564,11 +616,11 @@
"niri-unstable": {
"flake": false,
"locked": {
- "lastModified": 1738579367,
- "narHash": "sha256-820QsR/C9+Gyn3v65LHNwwW7KxSA6u6MQtky3SUrZ3A=",
+ "lastModified": 1738768006,
+ "narHash": "sha256-56jDYr/vqX4fobMJO2nWLjih03i6UV5bKtxI0nR4ZZA=",
"owner": "YaLTeR",
"repo": "niri",
- "rev": "553b1ba85256e2cb290e8a67f709a14e603606bc",
+ "rev": "690d6355057ebeba03cbd8ce4905145b834c72f8",
"type": "github"
},
"original": {
@@ -584,11 +636,11 @@
]
},
"locked": {
- "lastModified": 1738277753,
- "narHash": "sha256-iyFcCOk0mmDiv4ut9mBEuMxMZIym3++0qN1rQBg8FW0=",
+ "lastModified": 1738743987,
+ "narHash": "sha256-O3bnAfsObto6l2tQOmQlrO6Z2kD6yKwOWfs7pA0CpOc=",
"owner": "LnL7",
"repo": "nix-darwin",
- "rev": "49b807fa7c37568d7fbe2aeaafb9255c185412f9",
+ "rev": "ae406c04577ff9a64087018c79b4fdc02468c87c",
"type": "github"
},
"original": {
@@ -600,15 +652,14 @@
"nix-gaming": {
"inputs": {
"flake-parts": "flake-parts_3",
- "nixpkgs": "nixpkgs_2",
- "umu": "umu"
+ "nixpkgs": "nixpkgs_2"
},
"locked": {
- "lastModified": 1738633089,
- "narHash": "sha256-awMsAhuhPctQ0v4fbNX0aRNqQTL1qDLgVjOJJHQ4y4M=",
+ "lastModified": 1738771623,
+ "narHash": "sha256-DzRMp0zXy32iDHRdCFo0MWD9s8+DoflMK9BY2CAgr7A=",
"owner": "fufexan",
"repo": "nix-gaming",
- "rev": "3c83a677771fea8b55724f2d5cde0ca878c65712",
+ "rev": "3030553160ece3b8ea7df66d2670e8f41f0c0ec7",
"type": "github"
},
"original": {
@@ -642,11 +693,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1738410390,
- "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=",
+ "lastModified": 1738680400,
+ "narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "3a228057f5b619feb3186e986dbe76278d707b6e",
+ "rev": "799ba5bffed04ced7067a91798353d360788b30d",
"type": "github"
},
"original": {
@@ -670,23 +721,38 @@
},
"nixpkgs-lib_2": {
"locked": {
- "lastModified": 1733096140,
- "narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=",
+ "lastModified": 1738452942,
+ "narHash": "sha256-vJzFZGaCpnmo7I6i416HaBLpC+hvcURh/BQwROcGIp8=",
"type": "tarball",
- "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz"
+ "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
},
"original": {
"type": "tarball",
- "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz"
+ "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9eccd0ab75d5b2da11.tar.gz"
+ }
+ },
+ "nixpkgs-lib_3": {
+ "locked": {
+ "lastModified": 1738458136,
+ "narHash": "sha256-Vs3f4uHsdLiF8upi1Uav3G1x16lUtsTt4+3Dh92KYiM=",
+ "owner": "nix-community",
+ "repo": "nixpkgs.lib",
+ "rev": "891a6e313daec084351d328ba0c68ddd1b2a8f1d",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-community",
+ "repo": "nixpkgs.lib",
+ "type": "github"
}
},
"nixpkgs-stable": {
"locked": {
- "lastModified": 1738435198,
- "narHash": "sha256-5+Hmo4nbqw8FrW85FlNm4IIrRnZ7bn0cmXlScNsNRLo=",
+ "lastModified": 1738702386,
+ "narHash": "sha256-nJj8f78AYAxl/zqLiFGXn5Im1qjFKU8yBPKoWEeZN5M=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "f6687779bf4c396250831aa5a32cbfeb85bb07a3",
+ "rev": "030ba1976b7c0e1a67d9716b17308ccdab5b381e",
"type": "github"
},
"original": {
@@ -696,6 +762,29 @@
"type": "github"
}
},
+ "nixpkgs-wayland": {
+ "inputs": {
+ "flake-compat": "flake-compat_4",
+ "lib-aggregate": "lib-aggregate",
+ "nixpkgs": [
+ "zdwl",
+ "nixpkgs"
+ ]
+ },
+ "locked": {
+ "lastModified": 1738760468,
+ "narHash": "sha256-K3Pr2Fl6ODLx33r+sUQ9tDA6ehgfjMG6A6x8mlh4e9k=",
+ "owner": "nix-community",
+ "repo": "nixpkgs-wayland",
+ "rev": "3f6573793c0cfc3b01cf683460e95f3167276830",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-community",
+ "repo": "nixpkgs-wayland",
+ "type": "github"
+ }
+ },
"nixpkgs_2": {
"locked": {
"lastModified": 1738297584,
@@ -714,11 +803,11 @@
},
"nixpkgs_3": {
"locked": {
- "lastModified": 1738410390,
- "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=",
+ "lastModified": 1738680400,
+ "narHash": "sha256-ooLh+XW8jfa+91F1nhf9OF7qhuA/y1ChLx6lXDNeY5U=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "3a228057f5b619feb3186e986dbe76278d707b6e",
+ "rev": "799ba5bffed04ced7067a91798353d360788b30d",
"type": "github"
},
"original": {
@@ -760,7 +849,7 @@
"nixpkgs": "nixpkgs_3",
"repo-clone": "repo-clone",
"sops-nix": "sops-nix",
- "umu": "umu_2",
+ "umu": "umu",
"zdwl": "zdwl",
"zdwm": "zdwm"
}
@@ -832,6 +921,21 @@
"type": "github"
}
},
+ "systems_3": {
+ "locked": {
+ "lastModified": 1681028828,
+ "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+ "owner": "nix-systems",
+ "repo": "default",
+ "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nix-systems",
+ "repo": "default",
+ "type": "github"
+ }
+ },
"treefmt-nix": {
"inputs": {
"nixpkgs": [
@@ -840,11 +944,11 @@
]
},
"locked": {
- "lastModified": 1738070913,
- "narHash": "sha256-j6jC12vCFsTGDmY2u1H12lMr62fnclNjuCtAdF1a4Nk=",
+ "lastModified": 1738680491,
+ "narHash": "sha256-8X7tR3kFGkE7WEF5EXVkt4apgaN85oHZdoTGutCFs6I=",
"owner": "numtide",
"repo": "treefmt-nix",
- "rev": "bebf27d00f7d10ba75332a0541ac43676985dea3",
+ "rev": "64dbb922d51a42c0ced6a7668ca008dded61c483",
"type": "github"
},
"original": {
@@ -856,50 +960,23 @@
"umu": {
"inputs": {
"nixpkgs": [
- "nix-gaming",
"nixpkgs"
]
},
"locked": {
"dir": "packaging/nix",
"lastModified": 1738306689,
- "narHash": "sha256-g1p++aLe6q6OdGy3K91uyCjAeBUkkT4uoItSFQT+PJw=",
- "ref": "refs/heads/main",
+ "narHash": "sha256-T9euT20nh+6c4tF6Q26jksOGyNuLjlTNrpuluh5dbug=",
+ "owner": "Open-Wine-Components",
+ "repo": "umu-launcher",
"rev": "7a71163b79e56222fe3f3097d1e71208a91a1a3b",
- "revCount": 917,
- "submodules": true,
- "type": "git",
- "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix"
+ "type": "github"
},
"original": {
"dir": "packaging/nix",
- "submodules": true,
- "type": "git",
- "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix"
- }
- },
- "umu_2": {
- "inputs": {
- "nixpkgs": [
- "nixpkgs"
- ]
- },
- "locked": {
- "dir": "packaging/nix",
- "lastModified": 1738306689,
- "narHash": "sha256-g1p++aLe6q6OdGy3K91uyCjAeBUkkT4uoItSFQT+PJw=",
- "ref": "refs/heads/main",
- "rev": "7a71163b79e56222fe3f3097d1e71208a91a1a3b",
- "revCount": 917,
- "submodules": true,
- "type": "git",
- "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix"
- },
- "original": {
- "dir": "packaging/nix",
- "submodules": true,
- "type": "git",
- "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix"
+ "owner": "Open-Wine-Components",
+ "repo": "umu-launcher",
+ "type": "github"
}
},
"utils": {
@@ -958,19 +1035,20 @@
"flake-parts": "flake-parts_4",
"nixpkgs": [
"nixpkgs"
- ]
+ ],
+ "nixpkgs-wayland": "nixpkgs-wayland"
},
"locked": {
- "lastModified": 1734097112,
- "narHash": "sha256-orgIP31BsPt/sefmoOA8UDs91WPgYWtgxm0RpO8uVKw=",
- "ref": "0.7",
- "rev": "389d476f5b6c544874e6d01cd23d7c1ad213f1c9",
- "revCount": 1259,
+ "lastModified": 1738784816,
+ "narHash": "sha256-t4voOjrktkjALgRVZV/erkZbFUs274NY8Up4FTQc/gE=",
+ "ref": "dev",
+ "rev": "88713a8422814bc809c2aacba83192c1a3bae1aa",
+ "revCount": 1306,
"type": "git",
"url": "https://git.zynh.me/Zynh0722/dwl"
},
"original": {
- "ref": "0.7",
+ "ref": "dev",
"type": "git",
"url": "https://git.zynh.me/Zynh0722/dwl"
}
diff --git a/flake.nix b/flake.nix
index ea03ec1..626bd44 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,7 +21,7 @@
zdwl = { url = "git+https://git.zynh.me/Zynh0722/dwl?ref=dev"; inputs.nixpkgs.follows = "nixpkgs"; };
fish_theme = { url = "git+https://git.zynh.me/Zynh0722/omf-theme"; flake = false; };
backgrounds = { url = "git+https://git.zynh.me/Zynh0722/backgrounds"; inputs.nixpkgs.follows = "nixpkgs"; };
- umu = { url = "git+https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging\/nix&submodules=1"; inputs.nixpkgs.follows = "nixpkgs"; };
+ umu = { url = "github:Open-Wine-Components/umu-launcher?dir=packaging/nix"; inputs.nixpkgs.follows = "nixpkgs"; };
deploy-rs = { url = "github:serokell/deploy-rs"; inputs.nixpkgs.follows = "nixpkgs"; };
};