greetd: use proper package for greetd

This commit is contained in:
DashieTM 2024-05-12 23:29:35 +02:00
parent 52d35e019d
commit 4d957a817a
23 changed files with 484 additions and 373 deletions

View file

@ -7,33 +7,62 @@
];
home.packages = with pkgs; [
#basics
git
gcc
meson
ninja
rustup
go
nodejs_20
deno
python3
typst
typst-lsp
typstfmt
neovide
tree-sitter
dotnet-sdk
unzip
pkg-config
sqlite
plantuml
d-spy
#editors
neovide
##fallback
vscodium
#rust
rustup
#python
python3
python312Packages.python-lsp-server
python312Packages.python-lsp-ruff
python312Packages.python-lsp-black
#ts/js
nodejs_20
deno
typescript
nodePackages.typescript-language-server
nodePackages.prettier
#go
go
gopls
#typst
typst
typst-lsp
typstfmt
ltex-ls
#java
gradle
maven
jdt-language-server
adoptopenjdk-jre-bin
#.!
dotnet-sdk_8
omnisharp-roslyn
csharpier
#vscode-extensions.vscjava.vscode-java-test
#vscode-extensions.vscjava.vscode-java-debug
#zig
zig
zls
];
}

View file

@ -26,8 +26,6 @@ in
flatpak
networkmanager
zoxide
pkgs.greetd.greetd
pkgs.greetd.regreet
fastfetch
pkgs.gnome.gnome-keyring
dbus
@ -42,12 +40,13 @@ in
zenith
nh
amberol
satty
pulseaudio
playerctl
ncspot
poppler_utils
neofetch
brave
greetd.regreet
(callPackage
../override/oxinoti.nix
{ })

View file

@ -2,19 +2,10 @@
let
base_imports = [
inputs.hyprland.homeManagerModules.default
inputs.hyprlock.homeManagerModules.default
inputs.anyrun.homeManagerModules.default
inputs.ironbar.homeManagerModules.default
inputs.nix-flatpak.homeManagerModules.nix-flatpak
./hyprland/default.nix
./flatpak.nix
./common.nix
./coding.nix
./xdg.nix
./media.nix
./utils.nix
./oxi/default.nix
./themes/default.nix
./individual_configs/default.nix
];
in
{
@ -22,16 +13,30 @@ in
xdg.portal = {
enable = true;
extraPortals = [
pkgs.xdg-desktop-portal-hyprland
pkgs.xdg-desktop-portal-gtk
];
};
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.users.dashie.imports = [
{
_module = { args = { inherit inputs; }; };
}
mod
] ++ base_imports;
home-manager.users.dashie = {
#home-manager overlap -> use flake instead
disabledModules = [ "programs/hyprlock.nix" ];
imports = [
{
_module = { args = { inherit inputs; }; };
}
./hyprland/default.nix
./flatpak.nix
./common.nix
./coding.nix
./xdg.nix
./media.nix
./utils.nix
./oxi/default.nix
./themes/default.nix
./individual_configs/default.nix
mod
] ++ base_imports;
};
}

View file

@ -6,13 +6,9 @@
}];
services.flatpak.uninstallUnmanaged = true;
services.flatpak.packages = [
# fallback if necessary, but generally avoided as nix is superior :)
"com.github.tchx84.Flatseal"
"io.github.Foldex.AdwSteamGtk"
"org.gnome.dspy"
"org.onlyoffice.desktopeditors"
"org.gtk.Gtk3theme.adw-gtk3"
"com.brave.Browser"
"com.rustdesk.RustDesk"
];
}

View file

@ -12,9 +12,9 @@
steam
lutris
wine
adwsteamgtk
];
hardware.xone.enable = true;
programs.steam.enable = true;
programs.gamemode.enable = true;
programs.gamemode = {

View file

@ -30,7 +30,7 @@
"$mod SUPER,G,exec,oxicalc"
"$mod SUPER,D,exec,oxishut"
"$mod SUPER,A,exec,oxipaste"
"$mod SUPERSHIFT,L,exec, playerctl -a pause & swaylock -c 000000 & systemctl suspend"
"$mod SUPERSHIFT,L,exec, playerctl -a pause & hyprlock & systemctl hibernate"
# media keys
",XF86AudioMute,exec, $HOME/.config/scripts/audio_control.sh mute"
@ -166,9 +166,12 @@
disable_splash_rendering = true;
disable_hyprland_logo = true;
swallow_regex = "^(.*)(kitty)(.*)$";
initial_workspace_tracking = 1;
};
cursor = {
# conversion seems to be borked right now, i want a smooth bibata :(
enable_hyprcursor = false;
initial_workspace_tracking = 1;
};
gestures = {
@ -186,7 +189,7 @@
"XCURSOR_THEME,Bibata-Modern-Classic"
"XCURSOR_SIZE,24"
"QT_QPA_PLATFORM,wayland"
"QT_QPA_PLATFORMTHEME = \"qt5ct\""
"QT_QPA_PLATFORMTHEME,qt5ct"
"QT_WAYLAND_FORCE_DPI,96"
"QT_AUTO_SCREEN_SCALE_FACTOR,0"
"QT_WAYLAND_DISABLE_WINDOWDECORATION,1"

View file

@ -1,4 +1,5 @@
{ pkgs
{ inputs
, pkgs
, ...
}: {
imports = [
@ -6,22 +7,20 @@
./config.nix
./ironbar.nix
./hyprpaper.nix
./hyprgreet.nix
./hyprlock.nix
];
home.packages = with pkgs; [
xorg.xprop
grim
slurp
swappy
satty
xdg-desktop-portal-gtk
xdg-desktop-portal-hyprland
hyprpaper
# xdg-desktop-portal-hyprland
copyq
gnome.nautilus
gnome.sushi
wl-clipboard
kooha
hyprcursor
hyprpaper
hyprpicker

View file

@ -1,23 +0,0 @@
{
xdg.configFile."hypr/hyprgreet.conf" = {
text =
''
exec-once=gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'
monitor=DP-1,3440x1440@180,0x0,1
monitor=DP-2,disable
monitor=HDMI-A-1,disable
input {
force_no_accel = true
}
misc {
disable_splash_rendering = true
disable_hyprland_logo = true
}
exec-once=regreet --style /home/dashie/.config/gtk-3.0/gtk.css; hyprctl dispatch exit
'';
};
}

View file

@ -0,0 +1,37 @@
{ pkgs
, inputs
, config
, ...
}:
{
programs.hyprlock.enable = true;
programs.hyprlock = {
backgrounds = [
{
monitor = "";
path = "";
color = "rgba(26, 27, 38, 1.0)";
}
];
input-fields = [
{
monitor = "${config.programs.ironbar.monitor}";
placeholder_text = "password or something";
}
];
labels = [
{
monitor = "";
text = "$TIME";
font_size = 50;
valign = "center";
halign = "center";
}
];
};
}

View file

@ -14,6 +14,7 @@
zathura
evince
libreoffice-fresh
onlyoffice-bin
pdftk
# spotify
#ncspot
@ -23,7 +24,9 @@
inkscape
gimp
krita
# recording
obs-studio
];
programs.obs-studio.enable = true;
programs.obs-studio.plugins = with pkgs; [
obs-studio-plugins.obs-vaapi
];
}

View file

@ -1,109 +1,109 @@
{
# TODO: reenable this again
# right now its broken because flatpak...
# xdg.configFile."gtk-4.0/gtk.css" = {
# text =
# ''
# /*
# Generated with Gradience
#
# Issues caused by theming should be reported to Gradience repository, and not to upstream
#
# https://github.com/GradienceTeam/Gradience
# */
#
# @define-color accent_color #a9b1d6;
# @define-color accent_bg_color #a9b1d6;
# @define-color accent_fg_color rgba(0, 0, 0, 0.87);
# @define-color destructive_color #F28B82;
# @define-color destructive_bg_color #F28B82;
# @define-color destructive_fg_color rgba(0, 0, 0, 0.87);
# @define-color success_color #81C995;
# @define-color success_bg_color #81C995;
# @define-color success_fg_color rgba(0, 0, 0, 0.87);
# @define-color warning_color #FDD633;
# @define-color warning_bg_color #FDD633;
# @define-color warning_fg_color rgba(0, 0, 0, 0.87);
# @define-color error_color #F28B82;
# @define-color error_bg_color #F28B82;
# @define-color error_fg_color rgba(0, 0, 0, 0.87);
# @define-color window_bg_color #1a1b26;
# @define-color window_fg_color #c0caf5;
# @define-color view_bg_color #1a1b26;
# @define-color view_fg_color #c0caf5;
# @define-color headerbar_bg_color #1a1b26;
# @define-color headerbar_fg_color #c0caf5;
# @define-color headerbar_border_color rgba(192, 202, 245, 0.12);
# @define-color headerbar_backdrop_color @window_bg_color;
# @define-color headerbar_shade_color rgba(0, 0, 0, 0.36);
# @define-color card_bg_color #1a1b26;
# @define-color card_fg_color #c0caf5;
# @define-color card_shade_color rgba(0, 0, 0, 0.36);
# @define-color dialog_bg_color #1a1b26;
# @define-color dialog_fg_color #c0caf5;
# @define-color popover_bg_color #1a1b26;
# @define-color popover_fg_color #c0caf5;
# @define-color shade_color rgba(0, 0, 0, 0.36);
# @define-color scrollbar_outline_color rgba(0, 0, 0, 0.5);
# @define-color sidebar_bg_color #1a1b26;
# @define-color sidebar_fg_color #c0caf5;
# @define-color secondary_sidebar_bg_color #1a1b26;
# @define-color secondary_sidebar_fg_color #c0caf5;
# @define-color sidebar_shade_color rgba(0, 0, 0, 0.36);
# @define-color secondary_sidebar_shade_color rgba(0, 0, 0, 0.36);
# @define-color thumbnail_bg_color #1a1b26;
# @define-color thumbnail_fg_color #c0caf5;
# @define-color sidebar_backdrop_color @sidebar_bg_color;
# @define-color secondary_sidebar_backdrop_color @sidebar_bg_color;
# @define-color blue_1 #99c1f1;
# @define-color blue_2 #62a0ea;
# @define-color blue_3 #3584e4;
# @define-color blue_4 #1c71d8;
# @define-color blue_5 #1a5fb4;
# @define-color green_1 #8ff0a4;
# @define-color green_2 #57e389;
# @define-color green_3 #33d17a;
# @define-color green_4 #2ec27e;
# @define-color green_5 #26a269;
# @define-color yellow_1 #f9f06b;
# @define-color yellow_2 #f8e45c;
# @define-color yellow_3 #f6d32d;
# @define-color yellow_4 #f5c211;
# @define-color yellow_5 #e5a50a;
# @define-color orange_1 #ffbe6f;
# @define-color orange_2 #ffa348;
# @define-color orange_3 #ff7800;
# @define-color orange_4 #e66100;
# @define-color orange_5 #c64600;
# @define-color red_1 #f66151;
# @define-color red_2 #ed333b;
# @define-color red_3 #e01b24;
# @define-color red_4 #c01c28;
# @define-color red_5 #a51d2d;
# @define-color purple_1 #dc8add;
# @define-color purple_2 #c061cb;
# @define-color purple_3 #9141ac;
# @define-color purple_4 #813d9c;
# @define-color purple_5 #613583;
# @define-color brown_1 #cdab8f;
# @define-color brown_2 #b5835a;
# @define-color brown_3 #986a44;
# @define-color brown_4 #865e3c;
# @define-color brown_5 #63452c;
# @define-color light_1 #ffffff;
# @define-color light_2 #f6f5f4;
# @define-color light_3 #deddda;
# @define-color light_4 #c0bfbc;
# @define-color light_5 #9a9996;
# @define-color dark_1 #77767b;
# @define-color dark_2 #5e5c64;
# @define-color dark_3 #3d3846;
# @define-color dark_4 #241f31;
# @define-color dark_5 #000000;
#
# .navigation-sidebar {
# background-color: #1a1b26;
# }
# '';
# };
xdg.configFile."gtk-4.0/gtk.css" = {
text =
''
/*
Generated with Gradience
Issues caused by theming should be reported to Gradience repository, and not to upstream
https://github.com/GradienceTeam/Gradience
*/
@define-color accent_color #a9b1d6;
@define-color accent_bg_color #a9b1d6;
@define-color accent_fg_color rgba(0, 0, 0, 0.87);
@define-color destructive_color #F28B82;
@define-color destructive_bg_color #F28B82;
@define-color destructive_fg_color rgba(0, 0, 0, 0.87);
@define-color success_color #81C995;
@define-color success_bg_color #81C995;
@define-color success_fg_color rgba(0, 0, 0, 0.87);
@define-color warning_color #FDD633;
@define-color warning_bg_color #FDD633;
@define-color warning_fg_color rgba(0, 0, 0, 0.87);
@define-color error_color #F28B82;
@define-color error_bg_color #F28B82;
@define-color error_fg_color rgba(0, 0, 0, 0.87);
@define-color window_bg_color #1a1b26;
@define-color window_fg_color #c0caf5;
@define-color view_bg_color #1a1b26;
@define-color view_fg_color #c0caf5;
@define-color headerbar_bg_color #1a1b26;
@define-color headerbar_fg_color #c0caf5;
@define-color headerbar_border_color rgba(192, 202, 245, 0.12);
@define-color headerbar_backdrop_color @window_bg_color;
@define-color headerbar_shade_color rgba(0, 0, 0, 0.36);
@define-color card_bg_color #1a1b26;
@define-color card_fg_color #c0caf5;
@define-color card_shade_color rgba(0, 0, 0, 0.36);
@define-color dialog_bg_color #1a1b26;
@define-color dialog_fg_color #c0caf5;
@define-color popover_bg_color #1a1b26;
@define-color popover_fg_color #c0caf5;
@define-color shade_color rgba(0, 0, 0, 0.36);
@define-color scrollbar_outline_color rgba(0, 0, 0, 0.5);
@define-color sidebar_bg_color #1a1b26;
@define-color sidebar_fg_color #c0caf5;
@define-color secondary_sidebar_bg_color #1a1b26;
@define-color secondary_sidebar_fg_color #c0caf5;
@define-color sidebar_shade_color rgba(0, 0, 0, 0.36);
@define-color secondary_sidebar_shade_color rgba(0, 0, 0, 0.36);
@define-color thumbnail_bg_color #1a1b26;
@define-color thumbnail_fg_color #c0caf5;
@define-color sidebar_backdrop_color @sidebar_bg_color;
@define-color secondary_sidebar_backdrop_color @sidebar_bg_color;
@define-color blue_1 #99c1f1;
@define-color blue_2 #62a0ea;
@define-color blue_3 #3584e4;
@define-color blue_4 #1c71d8;
@define-color blue_5 #1a5fb4;
@define-color green_1 #8ff0a4;
@define-color green_2 #57e389;
@define-color green_3 #33d17a;
@define-color green_4 #2ec27e;
@define-color green_5 #26a269;
@define-color yellow_1 #f9f06b;
@define-color yellow_2 #f8e45c;
@define-color yellow_3 #f6d32d;
@define-color yellow_4 #f5c211;
@define-color yellow_5 #e5a50a;
@define-color orange_1 #ffbe6f;
@define-color orange_2 #ffa348;
@define-color orange_3 #ff7800;
@define-color orange_4 #e66100;
@define-color orange_5 #c64600;
@define-color red_1 #f66151;
@define-color red_2 #ed333b;
@define-color red_3 #e01b24;
@define-color red_4 #c01c28;
@define-color red_5 #a51d2d;
@define-color purple_1 #dc8add;
@define-color purple_2 #c061cb;
@define-color purple_3 #9141ac;
@define-color purple_4 #813d9c;
@define-color purple_5 #613583;
@define-color brown_1 #cdab8f;
@define-color brown_2 #b5835a;
@define-color brown_3 #986a44;
@define-color brown_4 #865e3c;
@define-color brown_5 #63452c;
@define-color light_1 #ffffff;
@define-color light_2 #f6f5f4;
@define-color light_3 #deddda;
@define-color light_4 #c0bfbc;
@define-color light_5 #9a9996;
@define-color dark_1 #77767b;
@define-color dark_2 #5e5c64;
@define-color dark_3 #3d3846;
@define-color dark_4 #241f31;
@define-color dark_5 #000000;
.navigation-sidebar {
background-color: #1a1b26;
}
'';
};
}

View file

@ -24,9 +24,6 @@ in
xdg.configFile."qt5ct/qss/tab.qss" = {
text = "${qss}";
};
xdg.configFile."qt6ct/qss/tab.qss" = {
text = "${qss}";
};
xdg.configFile."qt5ct/qt5ct.conf" = {
text =
''