update
This commit is contained in:
parent
16a4576471
commit
2efcb6267e
|
@ -3,7 +3,7 @@
|
|||
gruvbox-plus-icon-pack = prev.callPackage ./pkgs/gruvbox-plus-icon-pack {inherit inputs;};
|
||||
eww-hyprland-activewindow = prev.callPackage ./pkgs/eww-hyprland-activewindow {};
|
||||
eww-hyprland-workspaces = prev.callPackage ./pkgs/eww-hyprland-workspaces {};
|
||||
bitwarden-rofi = prev.callPackage ./pkgs/bitwarden-rofi { rofi = prev.rofi-wayland; };
|
||||
bitwarden-rofi = prev.callPackage ./pkgs/bitwarden-rofi {rofi = prev.rofi-wayland;};
|
||||
|
||||
ncmpcpp = prev.ncmpcpp.override {
|
||||
visualizerSupport = true;
|
||||
|
|
|
@ -1,19 +1,18 @@
|
|||
# Shamelessly stolen from https://raw.githubusercontent.com/nix-community/nur-combined/master/repos/reedrw/pkgs/bitwarden-rofi/default.nix
|
||||
|
||||
{ stdenv
|
||||
, lib
|
||||
, fetchFromGitHub
|
||||
, makeWrapper
|
||||
, unixtools
|
||||
, wl-clipboard
|
||||
, ydotool
|
||||
, bitwarden-cli
|
||||
, rofi
|
||||
, jq
|
||||
, keyutils
|
||||
, libnotify
|
||||
}:
|
||||
let
|
||||
{
|
||||
stdenv,
|
||||
lib,
|
||||
fetchFromGitHub,
|
||||
makeWrapper,
|
||||
unixtools,
|
||||
wl-clipboard,
|
||||
ydotool,
|
||||
bitwarden-cli,
|
||||
rofi,
|
||||
jq,
|
||||
keyutils,
|
||||
libnotify,
|
||||
}: let
|
||||
bins = [
|
||||
bitwarden-cli
|
||||
jq
|
||||
|
@ -25,41 +24,39 @@ let
|
|||
ydotool
|
||||
];
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bitwarden-rofi";
|
||||
version = "0.5";
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bitwarden-rofi";
|
||||
version = "0.5";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mattydebie";
|
||||
repo = "bitwarden-rofi";
|
||||
rev = "${version}";
|
||||
sha256 = "sha256-jXPwbvUTlMdwd/SYesfMuu7sQgR2WMiKOK88tGcQrcA=";
|
||||
};
|
||||
src = fetchFromGitHub {
|
||||
owner = "mattydebie";
|
||||
repo = "bitwarden-rofi";
|
||||
rev = "${version}";
|
||||
sha256 = "sha256-jXPwbvUTlMdwd/SYesfMuu7sQgR2WMiKOK88tGcQrcA=";
|
||||
};
|
||||
|
||||
buildInputs = [
|
||||
makeWrapper
|
||||
];
|
||||
buildInputs = [
|
||||
makeWrapper
|
||||
];
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p "$out/bin"
|
||||
install -Dm755 "bwmenu" "$out/bin/bwmenu"
|
||||
install -Dm755 "lib-bwmenu" "$out/bin/lib-bwmenu" # TODO don't put this in bin
|
||||
installPhase = ''
|
||||
mkdir -p "$out/bin"
|
||||
install -Dm755 "bwmenu" "$out/bin/bwmenu"
|
||||
install -Dm755 "lib-bwmenu" "$out/bin/lib-bwmenu" # TODO don't put this in bin
|
||||
|
||||
install -Dm755 -d "$out/usr/share/doc/bitwarden-rofi"
|
||||
install -Dm755 -d "$out/usr/share/doc/bitwarden-rofi/img"
|
||||
install -Dm755 -d "$out/usr/share/doc/bitwarden-rofi"
|
||||
install -Dm755 -d "$out/usr/share/doc/bitwarden-rofi/img"
|
||||
|
||||
install -Dm644 "README.md" "$out/usr/share/doc/bitwarden-rofi/README.md"
|
||||
install -Dm644 img/* "$out/usr/share/doc/bitwarden-rofi/img/"
|
||||
install -Dm644 "README.md" "$out/usr/share/doc/bitwarden-rofi/README.md"
|
||||
install -Dm644 img/* "$out/usr/share/doc/bitwarden-rofi/img/"
|
||||
|
||||
wrapProgram "$out/bin/bwmenu" --prefix PATH : ${lib.makeBinPath bins}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Wrapper for Bitwarden and Rofi";
|
||||
homepage = "https://github.com/mattydebie/bitwarden-rofi";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
|
||||
}
|
||||
wrapProgram "$out/bin/bwmenu" --prefix PATH : ${lib.makeBinPath bins}
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
description = "Wrapper for Bitwarden and Rofi";
|
||||
homepage = "https://github.com/mattydebie/bitwarden-rofi";
|
||||
license = licenses.gpl3;
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
@ -33,8 +33,8 @@
|
|||
systemd-boot = {
|
||||
enable = true;
|
||||
configurationLimit = 10;
|
||||
consoleMode = "max";
|
||||
};
|
||||
timeout = 0;
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -48,7 +48,7 @@
|
|||
192.168.0.18 steam.deck
|
||||
127.0.0.1 modules-cdn.eac-prod.on.epicgames.com
|
||||
'';
|
||||
};
|
||||
};
|
||||
|
||||
# Set your time zone.
|
||||
time.timeZone = "Europe/Vienna";
|
||||
|
@ -135,9 +135,6 @@
|
|||
'';
|
||||
|
||||
user.extraConfig = ''
|
||||
# # needed for xdg-open to find the default browser. Why the fuck do I even need to do that?
|
||||
# DefaultEnvironment="PATH=/etc/profiles/per-user/$USER/bin:/run/current/system/sw/bin"
|
||||
|
||||
#Systemd is a meme. This is the proof
|
||||
DefaultTimeoutStopSec=10s
|
||||
'';
|
||||
|
@ -146,6 +143,7 @@
|
|||
enable = true;
|
||||
};
|
||||
|
||||
|
||||
services = {
|
||||
systemd-networkd-wait-online.enable = lib.mkForce false;
|
||||
};
|
||||
|
|
|
@ -13,7 +13,7 @@
|
|||
];
|
||||
|
||||
boot.initrd.availableKernelModules = ["nvme"];
|
||||
boot.initrd.kernelModules = ["amdgpu"];
|
||||
boot.initrd.kernelModules = [];
|
||||
boot.kernelModules = ["kvm-amd"];
|
||||
boot.extraModulePackages = [];
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
extraPackages = [pkgs.libvdpau-va-gl];
|
||||
driSupport32Bit = true;
|
||||
};
|
||||
chaotic.mesa-git.enable = true;
|
||||
# chaotic.mesa-git.enable = true;
|
||||
|
||||
hardware.steam-hardware.enable = true;
|
||||
|
||||
|
|
|
@ -54,4 +54,4 @@
|
|||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
|
@ -19,10 +19,7 @@ $border_radius: 6px;
|
|||
color: $fg;
|
||||
font-size: 14px;
|
||||
|
||||
border-radius: 0 0 $border-radius $border-radius;
|
||||
border-bottom: 4px solid $border;
|
||||
border-right: 4px solid $border;
|
||||
border-left: 4px solid $border;
|
||||
|
||||
@mixin widget {
|
||||
font-size: 12px;
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
(defpoll TIME :interval "1s" "date '+%H:%M'")
|
||||
(defpoll VOL :interval "1s" "scripts/getvol")
|
||||
(defpoll TIME :interval "1s" "date '+%H:%M'")
|
||||
(defpoll VOL :interval "1s" "scripts/getvol")
|
||||
|
||||
(deflisten ACTIVEWINDOW :initial "[]" "hyprland-activewindow _")
|
||||
(deflisten WORKSPACE0 :initial "[]" "hyprland-workspaces $(hyprctl monitors -j | jq -r \".[0].name\")")
|
||||
(deflisten WORKSPACE1 :initial "[]" "hyprland-workspaces $(hyprctl monitors -j | jq -r \".[1].name\")")
|
||||
(deflisten MUSIC :initial "" "scripts/mpd_current_song.sh")
|
||||
(deflisten WORKSPACE0 :initial "[]" "hyprland-workspaces $(hyprctl monitors -j | jq -r \".[0].name\")")
|
||||
(deflisten WORKSPACE1 :initial "[]" "hyprland-workspaces $(hyprctl monitors -j | jq -r \".[1].name\")")
|
||||
(deflisten MUSIC :initial "" "scripts/mpd_current_song.sh")
|
||||
|
||||
|
||||
;; --------------------------
|
||||
|
@ -32,7 +32,7 @@
|
|||
:halign "center"
|
||||
:space-evenly false
|
||||
|
||||
(widget_music)
|
||||
(widget_music :monitor monitor)
|
||||
)
|
||||
)
|
||||
|
||||
|
@ -41,8 +41,8 @@
|
|||
:halign "end"
|
||||
:space-evenly false
|
||||
|
||||
(widget_systray)
|
||||
(widget_time)
|
||||
(widget_systray :monitor monitor)
|
||||
(widget_time :monitor monitor)
|
||||
)
|
||||
)
|
||||
|
||||
|
@ -71,14 +71,14 @@
|
|||
)
|
||||
)
|
||||
|
||||
(defwidget widget_music []
|
||||
(defwidget widget_music [monitor]
|
||||
(box
|
||||
:class "widget-music"
|
||||
MUSIC
|
||||
)
|
||||
)
|
||||
|
||||
(defwidget widget_systray []
|
||||
(defwidget widget_systray [monitor]
|
||||
(box
|
||||
:class "widget-systray"
|
||||
(systray
|
||||
|
@ -87,7 +87,7 @@
|
|||
)
|
||||
)
|
||||
|
||||
(defwidget widget_time []
|
||||
(defwidget widget_time [monitor]
|
||||
(box
|
||||
:class "widget-time"
|
||||
TIME
|
||||
|
@ -101,7 +101,7 @@
|
|||
:exclusive true
|
||||
:geometry
|
||||
(geometry
|
||||
:width "95%"
|
||||
:width "100%"
|
||||
:height "36px"
|
||||
:anchor "top center"
|
||||
)
|
||||
|
@ -113,7 +113,7 @@
|
|||
:exclusive true
|
||||
:geometry
|
||||
(geometry
|
||||
:width "95%"
|
||||
:width "100%"
|
||||
:height "36px"
|
||||
:anchor "top center"
|
||||
)
|
||||
|
|
|
@ -20,8 +20,8 @@ in {
|
|||
wayland.windowManager.hyprland = {
|
||||
settings = {
|
||||
monitor = [
|
||||
"${leftMonitor.display}, ${leftMonitor.res}, ${leftMonitor.pos}, 1"
|
||||
"${rightMonitor.display}, ${rightMonitor.res}, ${rightMonitor.pos}, 1"
|
||||
"${leftMonitor.display}, ${leftMonitor.res}, ${leftMonitor.pos}, 1, vrr, 2"
|
||||
"${rightMonitor.display}, ${rightMonitor.res}, ${rightMonitor.pos}, 1, vrr, 2"
|
||||
];
|
||||
|
||||
workspace = [
|
||||
|
@ -106,7 +106,7 @@ in {
|
|||
|
||||
exec = [
|
||||
"${pkgs.xorg.xrandr}/bin/xrandr --output ${rightMonitor.display} --primary"
|
||||
"pkill eww; sleep 1; eww open-many bar0 bar1"
|
||||
"pkill eww; sleep 1; eww open-many bar0 bar1 &> /dev/null"
|
||||
"sleep 2; pkill swww-daemon; swww init"
|
||||
|
||||
#Set cursor
|
||||
|
|
|
@ -26,6 +26,7 @@
|
|||
home.username = "manuel";
|
||||
home.homeDirectory = "/home/manuel";
|
||||
home.packages = with pkgs; [
|
||||
inputs.chaotic-nyx.packages.${pkgs.system}.gamescope_git
|
||||
bitwarden-rofi
|
||||
appimage-run
|
||||
armcord
|
||||
|
|
Reference in New Issue