master
Varris 2 months ago
parent 6ddc5edceb
commit 263e1ebe0a

@ -9,11 +9,6 @@
inputs.nixpkgs.follows = "nixpkgs";
};
hyprland = {
url = "github:hyprwm/Hyprland";
inputs.nixpkgs.follows = "nixpkgs";
};
# Fish Plugins
bobthefish = {
url = "github:oh-my-fish/theme-bobthefish";
@ -39,12 +34,12 @@
};
wlroots-git = {
url = "git+https://gitlab.freedesktop.org/wlroots/wlroots.git";
url = "gitlab:wlroots/wlroots/1712a7d27444d62f8da8eeedf0840b386a810e96?host=gitlab.freedesktop.org";
flake = false;
};
sway-git = {
url = "github:swaywm/sway";
url = "github:swaywm/sway/5c239eaac59f327294aceac739c6fa035456ed14";
flake = false;
};
@ -54,12 +49,12 @@
};
xorg-git = {
url = "git+https://gitlab.freedesktop.org/xorg/xserver.git";
url = "gitlab:xorg/xserver?host=gitlab.freedesktop.org";
flake = false;
};
mesa-git = {
url = "git+https://gitlab.freedesktop.org/mesa/mesa.git";
url = "gitlab:mesa/mesa?host=gitlab.freedesktop.org";
flake = false;
};
@ -72,6 +67,7 @@
url = "github:alexays/waybar";
flake = false;
};
};
outputs = { self, nixpkgs, home-manager, ... }@inputs:
@ -89,10 +85,12 @@
in
{
overlays.default = final: prev: rec {
nerdfonts = prev.nerdfonts.override { fonts = [ "JetBrainsMono" ]; };
nerdfonts = prev.nerdfonts.override {
fonts = [ "JetBrainsMono" ];
};
wlroots-git = prev.wlroots.overrideAttrs (old: {
version = "git";
version = "0.16.0";
src = inputs.wlroots-git;
nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.cmake pkgs.hwdata ];
postPatch = ''

@ -30,7 +30,7 @@
grub2-theme = {
enable = true;
theme = "vimix";
theme = "stylish";
screen = "2k";
};
};
@ -108,6 +108,8 @@
interval = "weekly";
};
services.udisks2.enable = true;
security = {
sudo.enable = false;
doas = {
@ -179,7 +181,7 @@
};
};
services.gnome.gnome-keyring.enable = true;
services.gnome.gnome-keyring.enable = false;
xdg.portal = {
enable = true;

@ -1,9 +0,0 @@
{ pkgs, lib, inputs, ... }:
{
imports = [
inputs.hyprland.homeManagerModules.default
];
wayland.windowManager.hyprland.enable = true;
}

@ -4,9 +4,11 @@
config = {
profile = "gpu-hq";
ytdl-format = "bestvideo+bestaudio";
hwdec = "vaapi-copy";
gpu-context = "wayland";
hwdec = "vaapi";
# gpu-context = "wayland";
force-window = "yes";
ao = "pipewire";
# vo = "dmabuf-wayland";
};
};
}

@ -6,6 +6,8 @@ let
left_monitor = "HDMI-A-1";
right_monitor = "DP-1";
fuzzel_command = "${pkgs.fuzzel}/bin/fuzzel -T ${pkgs.foot}/bin/foot --layer=overlay -x 20 -w 80 -r 0 -B 2 --line-height=12 -f 'JetBrainsMono Nerd Font:size=8' -b '#282828f2' -t '#EBDBB2ff' -S '#EBDBB2ff' -C '#d65d0eff' -s '#3C3836ff' -m '#D65D0Eff' -M '#D65D0Eff' ";
wob-voldaemon = pkgs.writeShellScriptBin "wob-volumedaemon.sh" ''
if pgrep "wob"; then
killall wob &> /dev/null
@ -28,7 +30,7 @@ let
password_files=( "''${password_files[@]#"$prefix"/}" )
password_files=( "''${password_files[@]%.gpg}" )
password=$(printf '%s\n' "''${password_files[@]}" | ${pkgs.rofi-wayland}/bin/rofi -dmenu -p "pass" "$@")
password=$(printf '%s\n' "''${password_files[@]}" | ${fuzzel_command} -d -p "pass: " "$@")
[[ -n $password ]] || exit
@ -42,10 +44,8 @@ let
echo "Xwayland: $DSP - Primary monitor set"
'';
rofi-theme = inputs.rofi-theme + "/gruvbox-dark.rasi";
killprocess = pkgs.writeShellScriptBin "killprocess.sh" ''
ps -x -o pid=,comm= | column -t -o " " | ${pkgs.rofi-wayland}/bin/rofi -dmenu -p "kill process" | awk '{print $1}' | uniq | xargs -r kill -9
ps -x -o pid=,comm= | column -t -o " " | ${fuzzel_command} -d -p "kill process: " | awk '{print $1}' | uniq | xargs -r kill -9
'';
in
{
@ -78,7 +78,7 @@ in
"${modifier}+Print" =
"exec ${pkgs.sway-contrib.grimshot}/bin/grimshot -c --notify copy active";
"${modifier}+d" = "exec ${pkgs.rofi-wayland}/bin/rofi -show drun -show-icons";
"${modifier}+d" = "exec ${fuzzel_command}";
"${modifier}+Shift+p" = "exec ${passmenu}/bin/passmenu.sh";
"${modifier}+Shift+o" = "exec ${killprocess}/bin/killprocess.sh";
@ -221,13 +221,6 @@ in
font = "JetBrainsMono Nerd Font Regular 9";
};
programs.rofi = {
enable = true;
package = pkgs.rofi-wayland;
theme = "${rofi-theme}";
font = "JetBrainsMono Nerd Font Regular 9";
};
programs.foot = {
enable = true;
settings = {

@ -111,7 +111,7 @@
enableFishIntegration = true;
};
services.gnome-keyring.enable = true;
services.gnome-keyring.enable = false; #Reenable when nixpkgs PR #201229 has been merged
services.easyeffects = {
enable = true;

Loading…
Cancel
Save