return to kde

This commit is contained in:
atagen 2023-01-31 19:42:12 +11:00
parent 535d41cb1d
commit 428e9731e9
5 changed files with 111 additions and 228 deletions

View file

@ -23,7 +23,6 @@
Unit = {
Description = "the system76 process scheduler kwin dbus proxy";
# Aliases = [ "com.system76.Scheduler.dbusproxy.service" ];
Requires = [ "dbus.service" ];
};

View file

@ -1,10 +1,12 @@
{ config, pkgs, ... }:
{ pkgs, config, ... }:
let
flake-compat = builtins.fetchTarball "https://github.com/edolstra/flake-compat/archive/master.tar.gz";
hyprland = (import flake-compat {
src = builtins.fetchTarball "https://github.com/hyprwm/Hyprland/archive/master.tar.gz";
}).defaultNix;
# nix-rice = builtins.fetchGit {
# url = "https://github.com/bertof/nix-rice.git";
# rev = "ac810023c1bb3d999ab4295ea4eb261412f4b7c0";
# };
# nix-rice-overlay = import (nix-rice + "/overlay.nix");
# pkgs = import <nixpkgs> { overlays = [ nix-rice-overlay ]; };
kitty_notest = pkgs.kitty.overridePythonAttrs (oldAttrs: { doCheck = false; checkPhase = ""; });
in
{
@ -13,7 +15,6 @@ in
./bolt.nix
# ./fossil.nix
# ./plank.nix
hyprland.homeManagerModules.default
];
nixpkgs.config.packageOverrides = pkgs: {
@ -21,110 +22,6 @@ in
inherit pkgs;
};
};
wayland.windowManager.hyprland = {
enable = true;
systemdIntegration = true;
nvidiaPatches = true;
extraConfig = ''
exec-once = waybar
exec-once = keepassxc
exec-once = mako
exec-once = ckb-next -c -b
exec-once = swaybg -i $HOME/Downloads/00026.png
exec-once = xrdb $HOME/.Xresources
input {
kb_layout=us
kb_options=caps:escape,escape:caps
}
general {
no_border_on_floating=true
layout=dwindle
border_size=3
gaps_in=10
gaps_out=20
}
dwindle {
preserve_split=true
pseudotile=true
use_active_for_splits=true
}
decoration {
rounding=8
blur=0
}
animations {
enabled=1
bezier=overshot,0.05,0.9,0.1,1.1
bezier=smooth,0.06,0.94,0.1,1.0
bezier=slosmooth,0.1,0.89,0.14,0.96
animation=windows,1,6,overshot,popin
animation=workspaces,1,6,smooth,slidevert
animation=specialWorkspace,1,6,overshot,slide
}
misc {
disable_hyprland_logo=true
disable_splash_rendering=true
}
monitor=,highrr,auto,1
bind=SUPER,Return,exec,kitty
bind=SUPER,F,exec,firefox
bind=SUPER,D,exec,fuzzel
bind=SUPER_SHIFT,Q,killactive
bind=SUPER_SHIFT,space,fullscreen,0
bind=SUPER,space,togglefloating
bind=SUPER,h,movefocus,l
bind=SUPER,l,movefocus,r
bind=SUPER,j,movefocus,d
bind=SUPER,k,movefocus,u
bind=SUPER_SHIFT,h,movewindow,l
bind=SUPER_SHIFT,l,movewindow,r
bind=SUPER_SHIFT,j,movewindow,d
bind=SUPER_SHIFT,k,movewindow,u
bind=SUPER,s,togglesplit
bind=SUPER,1,workspace,1
bind=SUPER,2,workspace,2
bind=SUPER,3,workspace,3
bind=SUPER,4,workspace,4
bind=SUPER_SHIFT,1,movetoworkspacesilent,1
bind=SUPER_SHIFT,2,movetoworkspacesilent,2
bind=SUPER_SHIFT,3,movetoworkspacesilent,3
bind=SUPER_SHIFT,4,movetoworkspacesilent,4
bind=SUPER_CTRL,h,resizeactive,-40 0
bind=SUPER_CTRL,l,resizeactive,40 0
bind=SUPER_CTRL,j,resizeactive,0 -40
bind=SUPER_CTRL,k,resizeactive,0 40
bind=SUPER,minus,togglespecialworkspace
bind=SUPER_SHIFT,minus,movetoworkspace,special
bind=SUPER_SHIFT,S,exec,grim -g "$(slurp)" -t png -o "$HOME/Pictures/$(date +%F_%H-%m-%S).png" && notify-send "Screenshot taken."
bind=SUPER_SHIFT_CTRL,S,exec,wf-recorder -a -f "$HOME/Videos/recording_($date +%F_%H-%m-%S).mp4" && notify-send "Recording desktop.."
bind=SUPER_SHIFT,E,exec,wlogout
bind=,XF86AudioMute,exec,pactl set-sink-mute @DEFAULT_SINK@ toggle && notify-send "Audio" "Mute $(if [ $(pactl get-sink-mute @DEFAULT_SINK@ | rg yes | wc -l) -eq 1 ]; then printf on; else printf off; fi)."
bind=,XF86AudioRaiseVolume,exec,pactl set-sink-volume @DEFAULT_SINK@ +5% && notify-send "Audio" "Volume at $(pactl get-sink-volume @DEFAULT_SINK@ | cut -d' ' -f 6)"
bind=,XF86AudioLowerVolume,exec,pactl set-sink-volume @DEFAULT_SINK@ -5% && notify-send "Audio" "Volume at $(pactl get-sink-volume @DEFAULT_SINK@ | cut -d' ' -f 6)"
bind=,XF86AudioStop,exec,cmus-remote -s && notify-send "Music" "Playback stopped."
bind=,XF86AudioPlay,exec,cmus-remote -u && notify-send "Music" "Playback status: $(cmus-remote -Q | head -n 1 | cut -d' ' -f 2)"
bind=,XF86AudioPrev,exec,cmus-remote -r && notify-send "Music" "Now playing:\n$(cmus-remote -Q | rg -e 'artist|title' | cut -d' ' -f 3-)"
bind=,XF86AudioNext,exec,cmus-remote -n && notify-send "Music" "Now playing:\n$(cmus-remote -Q | rg -e 'artist|title' | cut -d' ' -f 3-)"
'';
};
nixpkgs.config.allowUnfree = true;
home.packages = with pkgs; [
@ -134,18 +31,6 @@ in
clementine
inkscape
grim
slurp
mako
swaybg
wlogout
wf-recorder
libnotify
fuzzel
waybar
pulseaudio # yuck! just for pactl..
btop
bat
joshuto
@ -154,7 +39,6 @@ in
lazygit
fzf
# kdeconnect # maybe once i get an android
keepassxc
@ -166,33 +50,26 @@ in
zoxide
meslo-lgs-nf
libreoffice-qt
# libreoffice-qt
libsForQt5.ark
libsForQt5.qtstyleplugin-kvantum
libsForQt5.bismuth
hackneyed
gtk-engine-murrine
# plasma-browser-integration
plasma-browser-integration
(callPackage ./homepkgs/git-credential-keepassxc.nix { })
(callPackage ./homepkgs/culr.nix { })
(callPackage ./homepkgs/glpaper.nix { })
# (callPackage ./homepkgs/glpaper.nix { })
];
xdg.enable = true;
programs.mako = {
enable = true;
anchor = "bottom-right";
borderRadius = 8;
borderSize = 2;
defaultTimeout = 3500;
ignoreTimeout = true;
font = "Visby Regular 14";
};
xdg.systemDirs.data = [ "${pkgs.hackneyed}/share" ];
programs.vscode = {
enable = true;
@ -203,34 +80,34 @@ in
mutableExtensionsDir = false;
};
# xdg.desktopEntries = {
# vscodium-url = {
# name = "VsCodium";
# genericName = "Text Editor";
# exec = "codium --disable-gpu-sandbox --open-url %U";
# icon = "code";
# comment = "Code Editing. Redefined.";
# categories = [ "Utility" "TextEditor" "Development" "IDE" ];
# # keywords = [ "vscode" ];
# mimeType = [ "x-scheme-handler/vscode" ];
# noDisplay = true;
# startupNotify = true;
# type = "Application";
# };
# vscodium = {
# categories = [ "Utility" "TextEditor" "Development" "IDE" ];
# comment = "Code Editing. Redefined.";
# exec = "codium --disable-gpu-sandbox %F";
# genericName = "Text Editor";
# icon = "code";
# # keywords = [ "vscode" ];
# mimeType = [ "text/plain" "inode/directory" ];
# name = "VsCodium";
# startupNotify = true;
# # startupWMClass = "vscodium";
# type = "Application";
# };
# };
xdg.desktopEntries = {
codium-url = {
name = "VsCodium";
genericName = "Text Editor";
exec = "codium --disable-gpu-sandbox --open-url %U";
icon = "code";
comment = "Code Editing. Redefined.";
categories = [ "Utility" "TextEditor" "Development" "IDE" ];
# keywords = [ "vscode" ];
mimeType = [ "x-scheme-handler/vscode" ];
noDisplay = true;
startupNotify = true;
type = "Application";
};
codium = {
categories = [ "Utility" "TextEditor" "Development" "IDE" ];
comment = "Code Editing. Redefined.";
exec = "codium --disable-gpu-sandbox %F";
genericName = "Text Editor";
icon = "code";
# keywords = [ "vscode" ];
mimeType = [ "text/plain" "inode/directory" ];
name = "VsCodium";
startupNotify = true;
# startupWMClass = "vscodium";
type = "Application";
};
};
programs.direnv = {
enable = true;
@ -241,10 +118,10 @@ in
gtk = {
enable = true;
# theme = {
# package = (pkgs.callPackage ./homepkgs/simplewaita-gtk.nix {});
# name = "simplewaita";
# };
theme = {
package = (pkgs.callPackage ./homepkgs/simplewaita-gtk.nix {});
name = "simplewaita";
};
};
programs.firefox =
@ -511,9 +388,9 @@ fresh
theme = "bogster";
};
# home.sessionVariables = {
# GTK_THEME = "simplewaita";
# };
home.sessionVariables = {
GTK_THEME = "simplewaita";
};
home.stateVersion = "22.11";

31
home/homepkgs/glpaper.nix Normal file
View file

@ -0,0 +1,31 @@
{ lib, stdenv, fetchFromSourcehut, meson, ninja, pkg-config, wlroots, wayland, wayland-protocols
, libX11, libGL }:
stdenv.mkDerivation rec {
pname = "glpaper";
version = "unstable-latest";
src = fetchFromSourcehut {
owner = "~scoopta";
repo = pname;
vc = "hg";
rev = "9ba3806561312d83ed66dc8583c36d70fda8cd7a";
sha256 = "sha256-//IKW2BfpqwcR2WAPShs0kzn5nkV/yyABPvOYm3zMPU=";
};
nativeBuildInputs = [ meson ninja pkg-config ];
buildInputs = [
wayland
libX11 # required by libglvnd
libGL
];
meta = with lib; {
description =
"Wallpaper program for wlroots based Wayland compositors such as sway that allows you to render glsl shaders as your wallpaper";
homepage = "https://hg.sr.ht/~scoopta/glpaper";
license = licenses.gpl3Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ ccellado ];
};
}