naps62/nixos-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replace rofi with rofi-wayland

Browse Source
This commit is contained in:
Miguel Palhas
2024-11-03 17:16:03 +00:00
parent 0a82392422
commit f8473d2a9c
3 changed files with 113 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flake.lock
Generated
+98 -69
View File
@@ -6,11 +6,11 @@
"systems": "systems_2"
},
"locked": {
"lastModified": 1727303518,
"narHash": "sha256-lO5JMynTxNZxg/+E4/Y9reeLGIz/M8cEue+Re4cP6qo=",
"lastModified": 1728326430,
"narHash": "sha256-tV1ABHuA1HItMdCTuNdA8fMB+qw7LpjvI945VwMSABI=",
"owner": "Aylur",
"repo": "ags",
"rev": "cd543afec4d9ed708990e5ba52184716809bf248",
"rev": "60180a184cfb32b61a1d871c058b31a3b9b0743d",
"type": "github"
},
"original": {
@@ -70,11 +70,11 @@
},
"catppuccin": {
"locked": {
"lastModified": 1727910534,
"narHash": "sha256-IjdGPDnBNk3r5h02kiPTKUOfn+UiKNWlhy/ozC0NgyQ=",
"lastModified": 1730458408,
"narHash": "sha256-JQ+SphQn13bdibKUrBBBznYehXX4xJrxD1ifBp6vSWw=",
"owner": "catppuccin",
"repo": "nix",
"rev": "bad96d3fabf8d2e8f0bf0c2cb899a9fccf01ea03",
"rev": "191fbf2d81a63fad8f62f1233c0051f09b75d0ad",
"type": "github"
},
"original": {
@@ -91,11 +91,11 @@
]
},
"locked": {
"lastModified": 1722113426,
"narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=",
"lastModified": 1728330715,
"narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=",
"owner": "numtide",
"repo": "devshell",
"rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae",
"rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef",
"type": "github"
},
"original": {
@@ -111,11 +111,11 @@
},
"locked": {
"dir": "pkgs/firefox-addons",
"lastModified": 1728187412,
"narHash": "sha256-KIJdXDYnaU6rHhzmLaVRjccwxIIaMBZXBRPGqUVyPiU=",
"lastModified": 1730635639,
"narHash": "sha256-B3PP5BGzu1PVb2e978uXj+7gWRJMHUAE5eUXxyHTxHQ=",
"owner": "rycee",
"repo": "nur-expressions",
"rev": "40e077fcddef8fadcb796a20f2e69ee752af4545",
"rev": "178c79df993216cc9be02630d6cf42868b29f9c2",
"type": "gitlab"
},
"original": {
@@ -221,11 +221,11 @@
]
},
"locked": {
"lastModified": 1727826117,
"narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
"lastModified": 1730504689,
"narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
"rev": "506278e768c2a08bec68eb62932193e341f55c90",
"type": "github"
},
"original": {
@@ -288,11 +288,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1728119511,
"narHash": "sha256-kJHt+BoDTc9aYXnmy7X+kQto9cT77lDKHAYp5FyY4OY=",
"lastModified": 1730625090,
"narHash": "sha256-lWfkkj+GEUM0UqYLD2Rx3zzILTL3xdmGJKGR4fwONpA=",
"owner": "shazow",
"repo": "foundry.nix",
"rev": "c45f6bc1f2110b1d209e116be203648a06a02f80",
"rev": "1c6a742bcbfd55a80de0e1f967a60174716a1560",
"type": "github"
},
"original": {
@@ -316,11 +316,11 @@
]
},
"locked": {
"lastModified": 1727805723,
"narHash": "sha256-b8flytpuc4Ey/g3mcvpS/ICORcD4h56QDZeP5LogevY=",
"lastModified": 1729104314,
"narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "2f5ae3fc91db865eff2c5a418da85a0fbe6238a3",
"rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6",
"type": "github"
},
"original": {
@@ -346,11 +346,11 @@
]
},
"locked": {
"lastModified": 1728092656,
"narHash": "sha256-eMeCTJZ5xBeQ0f9Os7K8DThNVSo9gy4umZLDfF5q6OM=",
"lastModified": 1730302582,
"narHash": "sha256-W1MIJpADXQCgosJZT8qBYLRuZls2KSiKdpnTVdKBuvU=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "1211305a5b237771e13fcca0c51e60ad47326a9a",
"rev": "af8a16fe5c264f5e9e18bcee2859b40a656876cf",
"type": "github"
},
"original": {
@@ -405,11 +405,11 @@
},
"hardware": {
"locked": {
"lastModified": 1728056216,
"narHash": "sha256-IrO06gFUDTrTlIP3Sz+mRB6WUoO2YsgMtOD3zi0VEt0=",
"lastModified": 1730537918,
"narHash": "sha256-GJB1/aaTnAtt9sso/EQ77TAGJ/rt6uvlP0RqZFnWue8=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "b7ca02c7565fbf6d27ff20dd6dbd49c5b82eef28",
"rev": "f6e0cd5c47d150c4718199084e5764f968f1b560",
"type": "github"
},
"original": {
@@ -448,11 +448,11 @@
]
},
"locked": {
"lastModified": 1728041527,
"narHash": "sha256-03liqiJtk9UP7YQHW4r8MduKCK242FQzud8iWvvlK+o=",
"lastModified": 1730633670,
"narHash": "sha256-ZFJqIXpvVKvzOVFKWNRDyIyAo+GYdmEPaYi1bZB6uf0=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e",
"rev": "8f6ca7855d409aeebe2a582c6fd6b6a8d0bf5661",
"type": "github"
},
"original": {
@@ -469,11 +469,11 @@
]
},
"locked": {
"lastModified": 1728041527,
"narHash": "sha256-03liqiJtk9UP7YQHW4r8MduKCK242FQzud8iWvvlK+o=",
"lastModified": 1730490306,
"narHash": "sha256-AvCVDswOUM9D368HxYD25RsSKp+5o0L0/JHADjLoD38=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e",
"rev": "1743615b61c7285976f85b303a36cdf88a556503",
"type": "github"
},
"original": {
@@ -623,11 +623,11 @@
"nixpkgs": "nixpkgs_5"
},
"locked": {
"lastModified": 1730100704,
"narHash": "sha256-L1SSqLhwBc4NYegileXcfe6LN8VYzDdfUiVzwcCUVE0=",
"lastModified": 1730628553,
"narHash": "sha256-yfPRDXpOjqXic7sPHkB3eW0HcsIsPhiZ+BIPFvt4JQs=",
"owner": "Jas-SinghFSU",
"repo": "HyprPanel",
"rev": "41a8e44ffdc0503382e77a9db973a6de27749173",
"rev": "9287e1d6a40d5aaa7ae0a8f38623327241f03e6f",
"type": "github"
},
"original": {
@@ -686,6 +686,34 @@
"type": "github"
}
},
"ixx": {
"inputs": {
"flake-utils": [
"nixvim",
"nuschtosSearch",
"flake-utils"
],
"nixpkgs": [
"nixvim",
"nuschtosSearch",
"nixpkgs"
]
},
"locked": {
"lastModified": 1729544999,
"narHash": "sha256-YcyJLvTmN6uLEBGCvYoMLwsinblXMkoYkNLEO4WnKus=",
"owner": "NuschtOS",
"repo": "ixx",
"rev": "65c207c92befec93e22086da9456d3906a4e999c",
"type": "github"
},
"original": {
"owner": "NuschtOS",
"ref": "v0.0.5",
"repo": "ixx",
"type": "github"
}
},
"neovim-nightly-overlay": {
"inputs": {
"flake-compat": "flake-compat",
@@ -696,11 +724,11 @@
"nixpkgs": "nixpkgs_6"
},
"locked": {
"lastModified": 1727852635,
"narHash": "sha256-eY0Y5ZDMo5IS+K42kMwAMCLsYHoAgPW3R4UxeGfzP0U=",
"lastModified": 1730088025,
"narHash": "sha256-FIdIaN7f6karwtDV65VXTV8VThNrR63nwykfgXpm4p4=",
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
"rev": "377cf41246ee443c86c4ae48f66f5100038fe158",
"rev": "f35afbe60a4ff71fd65fec3839fc38943f961951",
"type": "github"
},
"original": {
@@ -712,11 +740,11 @@
"neovim-src": {
"flake": false,
"locked": {
"lastModified": 1727825968,
"narHash": "sha256-7DbbGIAbJesqYEkZh2FaEo5wycZ/cRbvZP6k01Z5+ZM=",
"lastModified": 1729121305,
"narHash": "sha256-c94xkA/RuszC4PfmB+MWqOo2vbO66GTO6XKer0mbltA=",
"owner": "neovim",
"repo": "neovim",
"rev": "2168d772b864fd05109fb4299e409d4bdc1df39d",
"rev": "852954ff6d96adce0158f74ca494fdcef3aa1921",
"type": "github"
},
"original": {
@@ -752,11 +780,11 @@
]
},
"locked": {
"lastModified": 1727999297,
"narHash": "sha256-LTJuQPCsSItZ/8TieFeP30iY+uaLoD0mT0tAj1gLeyQ=",
"lastModified": 1730448474,
"narHash": "sha256-qE/cYKBhzxHMtKtLK3hlSR3uzO1pWPGLrBuQK7r0CHc=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "8c8388ade72e58efdeae71b4cbb79e872c23a56b",
"rev": "683d0c4cd1102dcccfa3f835565378c7f3cbe05e",
"type": "github"
},
"original": {
@@ -844,11 +872,11 @@
},
"nixpkgs_5": {
"locked": {
"lastModified": 1727634051,
"narHash": "sha256-S5kVU7U82LfpEukbn/ihcyNt2+EvG7Z5unsKW9H/yFA=",
"lastModified": 1729880355,
"narHash": "sha256-RP+OQ6koQQLX5nw0NmcDrzvGL8HDLnyXt/jHhL1jwjM=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "06cf0e1da4208d3766d898b7fdab6513366d45b9",
"rev": "18536bf04cd71abd345f9579158841376fdd0c5a",
"type": "github"
},
"original": {
@@ -860,11 +888,11 @@
},
"nixpkgs_6": {
"locked": {
"lastModified": 1727747005,
"narHash": "sha256-2PBox0LkPhxirg1asEIpvfFARjq5KLw0EHPCy4unjPs=",
"lastModified": 1728863046,
"narHash": "sha256-DZBO2465PL5V89e8hFSJewyH4QbCPpW3ssws7ckT/0A=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9682b2197dabc185fcca802ac1ac21136e48fcc2",
"rev": "d4f247e89f6e10120f911e2e2d2254a050d0f732",
"type": "github"
},
"original": {
@@ -876,11 +904,11 @@
},
"nixpkgs_7": {
"locked": {
"lastModified": 1728018373,
"narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=",
"lastModified": 1730531603,
"narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "bc947f541ae55e999ffdb4013441347d83b00feb",
"rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d",
"type": "github"
},
"original": {
@@ -892,11 +920,11 @@
},
"nixpkgs_8": {
"locked": {
"lastModified": 1728018373,
"narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=",
"lastModified": 1730200266,
"narHash": "sha256-l253w0XMT8nWHGXuXqyiIC/bMvh1VRszGXgdpQlfhvU=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "bc947f541ae55e999ffdb4013441347d83b00feb",
"rev": "807e9154dcb16384b1b765ebe9cd2bba2ac287fd",
"type": "github"
},
"original": {
@@ -935,11 +963,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1728176751,
"narHash": "sha256-hVmdzrZMFC/5q3dSjbKX9qocWN9coPBhs8muLsL3738=",
"lastModified": 1730569492,
"narHash": "sha256-NByr7l7JetL9kIrdCOcRqBu+lAkruYXETp1DMiDHNQs=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "d42c804ad515f45f8addaf5a4bb0b8ce405ea140",
"rev": "6f210158b03b01a1fd44bf3968165e6da80635ce",
"type": "github"
},
"original": {
@@ -951,17 +979,18 @@
"nuschtosSearch": {
"inputs": {
"flake-utils": "flake-utils_3",
"ixx": "ixx",
"nixpkgs": [
"nixvim",
"nixpkgs"
]
},
"locked": {
"lastModified": 1728017046,
"narHash": "sha256-ofWYux/uUAv8wq7sWw8XWke0sh8p4qYxSOn8d+EaJ8c=",
"lastModified": 1730515563,
"narHash": "sha256-8lklUZRV7nwkPLF3roxzi4C2oyLydDXyAzAnDvjkOms=",
"owner": "NuschtOS",
"repo": "search",
"rev": "ba81d9c1eae20fc3a1cd066062a05ac2e799e629",
"rev": "9e22bd742480916ff5d0ab20ca2522eaa3fa061e",
"type": "github"
},
"original": {
@@ -996,11 +1025,11 @@
]
},
"locked": {
"lastModified": 1728187146,
"narHash": "sha256-mJ7wJvr9AhakBYbPYq3Md7nLj2T+c57V/lfdvxe/gis=",
"lastModified": 1730543154,
"narHash": "sha256-r12a4K6sZaTcmj4cu+ClDern7JMP/k/O82ZBCrgfXog=",
"owner": "nix-community",
"repo": "nix4nvchad",
"rev": "c77eae90663c5e75988f2f21268aa162f9882e3d",
"rev": "9d7eabd828eb01d9bb0968a5b901683a5da4a3ff",
"type": "github"
},
"original": {
@@ -1162,11 +1191,11 @@
]
},
"locked": {
"lastModified": 1727984844,
"narHash": "sha256-xpRqITAoD8rHlXQafYZOLvUXCF6cnZkPfoq67ThN0Hc=",
"lastModified": 1730321837,
"narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "4446c7a6fc0775df028c5a3f6727945ba8400e64",
"rev": "746901bb8dba96d154b66492a29f5db0693dbfcc",
"type": "github"
},
"original": {
home/common/programs/hyprland/rofi.nix
+7 -3
View File
@@ -1,3 +1,7 @@
{pkgs,...}:{
home.packages = with pkgs; [rofi (callPackage ../../../../pkgs/rofi-launchers/package.nix {})];
}
{ pkgs, ... }:
{
home.packages = with pkgs; [
rofi-wayland
(callPackage ../../../../pkgs/rofi-launchers/package.nix { })
];
}
pkgs/rofi-launchers/package.nix
+8 -4
View File
@@ -1,4 +1,9 @@
{ lib, stdenvNoCC, fetchFromGitHub, rofi }:
{
lib,
stdenvNoCC,
fetchFromGitHub,
rofi-wayland,
}:
stdenvNoCC.mkDerivation {
name = "rofi-launchers";
@@ -10,14 +15,14 @@ stdenvNoCC.mkDerivation {
hash = "sha256-ZSosFsi/M5Gqb9gsUqS7hu89uOu9078Dus4Y+WCphZc=";
};
buildInputs = [ rofi ];
buildInputs = [ rofi-wayland ];
postPatch = ''
files=$(find files/scripts -type l)
for file in $files; do
substituteInPlace $file \
--replace-fail '$HOME/.config/rofi' "$out/share" \
--replace-fail "rofi " "${lib.getExe rofi} "
--replace-fail "rofi " "${lib.getExe rofi-wayland} "
done
files=$(find files/launchers -type f -name "*.rasi")
@@ -54,4 +59,3 @@ stdenvNoCC.mkDerivation {
platforms = lib.platforms.linux;
};
}