migrate swaymux and rmenu to nixpkgs
This commit is contained in:
parent
0d1fcc118a
commit
7d6cd8f824
9 changed files with 40 additions and 1416 deletions
|
|
@ -16,8 +16,7 @@ in {
|
|||
};
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
(callPackage ../custom/pwvucontrol/package.nix {})
|
||||
# pwvucontrol
|
||||
pwvucontrol
|
||||
playerctl
|
||||
pulseaudio
|
||||
];
|
||||
|
|
|
|||
|
|
@ -28,7 +28,6 @@ in {
|
|||
ffmpeg-full
|
||||
lm_sensors
|
||||
imagemagick
|
||||
pypy3
|
||||
nmap
|
||||
|
||||
hyfetch
|
||||
|
|
|
|||
|
|
@ -81,6 +81,7 @@
|
|||
nixpkgs.config.allowUnfree = true;
|
||||
|
||||
nix.settings.experimental-features = [ "nix-command" "flakes" ];
|
||||
# nix.package = pkgs.nixVersions.unstable;
|
||||
|
||||
|
||||
programs.dconf.enable = true;
|
||||
|
|
|
|||
1240
custom/pwvucontrol/Cargo.lock
generated
1240
custom/pwvucontrol/Cargo.lock
generated
File diff suppressed because it is too large
Load diff
|
|
@ -1,84 +0,0 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchFromGitLab
|
||||
, cargo
|
||||
, desktop-file-utils
|
||||
, meson
|
||||
, ninja
|
||||
, pkg-config
|
||||
, rustPlatform
|
||||
, rustc
|
||||
, wrapGAppsHook4
|
||||
, cairo
|
||||
, gdk-pixbuf
|
||||
, glib
|
||||
, gtk4
|
||||
, libadwaita
|
||||
, pango
|
||||
, pipewire
|
||||
, wireplumber
|
||||
}:
|
||||
|
||||
let
|
||||
wireplumber_0_4 = wireplumber.overrideAttrs (attrs: rec {
|
||||
version = "0.4.17";
|
||||
src = fetchFromGitLab {
|
||||
domain = "gitlab.freedesktop.org";
|
||||
owner = "pipewire";
|
||||
repo = "wireplumber";
|
||||
rev = version;
|
||||
hash = "sha256-vhpQT67+849WV1SFthQdUeFnYe/okudTQJoL3y+wXwI=";
|
||||
};
|
||||
});
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "pwvucontrol";
|
||||
version = "0.3.1";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "saivert";
|
||||
repo = "pwvucontrol";
|
||||
rev = version;
|
||||
hash = "sha256-t4JUpKtuO1JgrdsNbl0M/SwPmoqu7WxsaD74vlJeVhY=";
|
||||
};
|
||||
|
||||
cargoDeps = rustPlatform.importCargoLock {
|
||||
lockFile = ./Cargo.lock;
|
||||
outputHashes = {
|
||||
"wireplumber-0.1.0" = "sha256-+LZ8xKok2AOegW8WvfrfZGXuQB4xHrLNshcTOHab+xQ=";
|
||||
};
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
cargo
|
||||
desktop-file-utils
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
rustPlatform.bindgenHook
|
||||
rustPlatform.cargoSetupHook
|
||||
rustc
|
||||
wrapGAppsHook4
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
cairo
|
||||
gdk-pixbuf
|
||||
glib
|
||||
gtk4
|
||||
libadwaita
|
||||
pango
|
||||
pipewire
|
||||
wireplumber_0_4
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Pipewire Volume Control";
|
||||
homepage = "https://github.com/saivert/pwvucontrol";
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ figsoda ];
|
||||
mainProgram = "pwvucontrol";
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
98
flake.lock
98
flake.lock
|
|
@ -78,11 +78,11 @@
|
|||
"yafas": "yafas"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1712021690,
|
||||
"narHash": "sha256-/4xiYWwtW1ghY0XCtVMH2mdW2zmnPnAnUd3etrz0YzI=",
|
||||
"lastModified": 1712410564,
|
||||
"narHash": "sha256-SaieRX6F81W84WA973bA8NGAybjomH01y79FLLj5l6c=",
|
||||
"owner": "chaotic-cx",
|
||||
"repo": "nyx",
|
||||
"rev": "fcca2ca3ceee4caa84822f2697e9b6856fc5dbda",
|
||||
"rev": "658cc876186c56526ebacaa5954e3c88fb7e3577",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -138,11 +138,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1711850778,
|
||||
"narHash": "sha256-LUctBrbSTAZ6TRtXsWju4AuNf9OhcbxNni0PRBGKE1c=",
|
||||
"lastModified": 1712369716,
|
||||
"narHash": "sha256-9zs+0GTfSyGHdpiA6dPJXnDKAHmfr01OE9FxDE9KvPI=",
|
||||
"owner": "girlbossceo",
|
||||
"repo": "conduwuit",
|
||||
"rev": "00ddc1c88ec9137225840d9d788db0bc6f6939d1",
|
||||
"rev": "2516d44cb178547194a66fa9c44930ab9bddd910",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -234,11 +234,11 @@
|
|||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1709336216,
|
||||
"narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=",
|
||||
"lastModified": 1712014858,
|
||||
"narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2",
|
||||
"rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -331,11 +331,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1711231487,
|
||||
"narHash": "sha256-dRdFjStMA7GeuD/V4vzKblzuHwxMPgzEboRleVdZlUM=",
|
||||
"lastModified": 1712296875,
|
||||
"narHash": "sha256-Cmyer1n39J5IucCiyy84kf1XLr1Gdz/i5HKbzzEOQYM=",
|
||||
"owner": "Jovian-Experiments",
|
||||
"repo": "Jovian-NixOS",
|
||||
"rev": "1171169117f63f1de9ef2ea36efd8dcf377c6d5a",
|
||||
"rev": "9b0e8712f1a9e5569036b227d539b745fcf54aad",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -357,11 +357,11 @@
|
|||
"rust-overlay": "rust-overlay"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1711933933,
|
||||
"narHash": "sha256-hS3tHWo1BuF/IqCkg7OpnTayGFp4A0vkNdQZBpnKZ+4=",
|
||||
"lastModified": 1712361380,
|
||||
"narHash": "sha256-1cEiFtUvjBlp4J4kCvlsEobrTEsAzRBhRNvG8N1XH9w=",
|
||||
"owner": "martinvonz",
|
||||
"repo": "jj",
|
||||
"rev": "320f50e00fcbd0d3ce27feb1e14b8e36d76b658f",
|
||||
"rev": "93cebcd0c0e910b8b7de606982efa8430a94676e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -394,11 +394,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1711945827,
|
||||
"narHash": "sha256-lMqYPDoQy1roYoYVvdJdGQic/xuRGCJ+o5EeLD/B5fo=",
|
||||
"lastModified": 1712150496,
|
||||
"narHash": "sha256-24MK9P+3OIBeaVsyy6r/W77/9TVLCQGDF8RVOCkK4Uk=",
|
||||
"owner": "YaLTeR",
|
||||
"repo": "niri",
|
||||
"rev": "4f56ff16f998b32d70488257bcd91617a61a4147",
|
||||
"rev": "8be938197486acb2af4ba91aae0fac57619a46c8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -430,11 +430,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1711847810,
|
||||
"narHash": "sha256-gLeUuU3hQ2ErboVIyzDNes2bywdTYDidvi6wG5+tnQ8=",
|
||||
"lastModified": 1712452624,
|
||||
"narHash": "sha256-R35K+4krhK5B2fcV6W2HFe/uhXmP8YGTb35uZ+nDAxw=",
|
||||
"owner": "fufexan",
|
||||
"repo": "nix-gaming",
|
||||
"rev": "4ec1bf4262e913af85e3f699f564769ec2f23cff",
|
||||
"rev": "06314bbf8fedd83c7253442994a2f0c81d47988e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -468,11 +468,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1711703276,
|
||||
"narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=",
|
||||
"lastModified": 1712439257,
|
||||
"narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "d8fe5e6c92d0d190646fb9f1056741a229980089",
|
||||
"rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -485,11 +485,11 @@
|
|||
"nixpkgs-lib": {
|
||||
"locked": {
|
||||
"dir": "lib",
|
||||
"lastModified": 1709237383,
|
||||
"narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=",
|
||||
"lastModified": 1711703276,
|
||||
"narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8",
|
||||
"rev": "d8fe5e6c92d0d190646fb9f1056741a229980089",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -516,34 +516,12 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"rmenu": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1712079308,
|
||||
"narHash": "sha256-+tFKdtoJMFOqEmQ0sSwRFixO5KgDUagwYk89VWND1LU=",
|
||||
"owner": "imgurbot12",
|
||||
"repo": "rmenu",
|
||||
"rev": "64fdbaafc4af323ba57d07263addf1be0d349631",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "imgurbot12",
|
||||
"repo": "rmenu",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"root": {
|
||||
"inputs": {
|
||||
"agenix": "agenix",
|
||||
"chaotic": "chaotic",
|
||||
"nix-gaming": "nix-gaming",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"rmenu": "rmenu",
|
||||
"swaymux": "swaymux"
|
||||
"nixpkgs": "nixpkgs"
|
||||
}
|
||||
},
|
||||
"rust-analyzer-src": {
|
||||
|
|
@ -590,26 +568,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"swaymux": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1712078592,
|
||||
"narHash": "sha256-OMJ9wKNuvD1Z9KV7Bp7aIA5gWbBl9PmTdGcGegE0vqM=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "522f5db3d17b4392aec627e11f9be8e868eb77cf",
|
||||
"revCount": 34,
|
||||
"type": "git",
|
||||
"url": "https://git.grimmauld.de/Grimmauld/swaymux"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "https://git.grimmauld.de/Grimmauld/swaymux"
|
||||
}
|
||||
},
|
||||
"systems": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
|
|
|
|||
12
flake.nix
12
flake.nix
|
|
@ -17,18 +17,9 @@
|
|||
url = "github:fufexan/nix-gaming";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
swaymux = {
|
||||
url = "git+https://git.grimmauld.de/Grimmauld/swaymux";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
rmenu = {
|
||||
# url = "git+file:///home/grimmauld/coding/rmenu";
|
||||
url = "github:imgurbot12/rmenu";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
};
|
||||
|
||||
outputs = inputs @ { self, swaymux, rmenu, nix-gaming, agenix, nixpkgs, chaotic, ... }: let
|
||||
outputs = inputs @ { self, nix-gaming, agenix, nixpkgs, chaotic, ... }: let
|
||||
system = "x86_64-linux";
|
||||
in {
|
||||
nixosConfigurations = {
|
||||
|
|
@ -39,7 +30,6 @@
|
|||
agenix.nixosModules.default
|
||||
chaotic.nixosModules.default
|
||||
nix-gaming.nixosModules.pipewireLowLatency
|
||||
rmenu.nixosModules.default
|
||||
./load_common.nix
|
||||
./specific/grimm-nixos-laptop/configuration.nix
|
||||
|
||||
|
|
|
|||
|
|
@ -75,7 +75,8 @@
|
|||
"format-alt": "{time} {icon}",
|
||||
// "format-good": "", // An empty format will hide the module
|
||||
// "format-full": "",
|
||||
"format-icons": ["", "", "", "", ""]
|
||||
"format-icons": ["", "", "", "", ""],
|
||||
"on-click": "rmenu -r powermenu"
|
||||
},
|
||||
"battery#bat2": {
|
||||
"bat": "BAT2"
|
||||
|
|
|
|||
|
|
@ -1,15 +1,13 @@
|
|||
{ inputs, system, pkgs, config, lib, ... }: let
|
||||
swaymux_pkg = inputs.swaymux.packages."${system}".default;
|
||||
in {
|
||||
environment.systemPackages = (with pkgs; [
|
||||
{ inputs, system, pkgs, config, lib, ... }: {
|
||||
environment.systemPackages = with pkgs; [
|
||||
alacritty
|
||||
wmenu
|
||||
rmenu
|
||||
grim
|
||||
slurp
|
||||
brightnessctl
|
||||
wl-clipboard
|
||||
])
|
||||
++ [ swaymux_pkg ];
|
||||
swaymux
|
||||
];
|
||||
|
||||
grimmShared.sway = {
|
||||
enable = true;
|
||||
|
|
@ -25,6 +23,7 @@ in {
|
|||
right = "l";
|
||||
term = "alacritty";
|
||||
menu = "rmenu -r drun | xargs swaymsg exec --";
|
||||
menu_run = "rmenu -r run | xargs swaymsg exec --";
|
||||
|
||||
primecol = "#8800FF";
|
||||
accentcol = "#5700a0";
|
||||
|
|
@ -36,6 +35,7 @@ in {
|
|||
};
|
||||
keybinds = {
|
||||
"$mod+d" = "exec $menu";
|
||||
"$mod+Shift+d" = "exec $menu_run";
|
||||
"$mod+Shift+s" = ''exec grim -g "$(slurp -d)" - | wl-copy'';
|
||||
"$mod+Return" = "exec $term";
|
||||
"$mod+Shift+q" = "kill";
|
||||
|
|
|
|||
Loading…
Reference in a new issue