sako/nixos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

f slur....

Browse source
This commit is contained in:
Sakooooo 2024-10-15 11:47:14 +04:00
parent e248729f41
commit 32d50fe9ef
Signed by: sako
GPG key ID: 3FD715D87D7725E0
2 changed files with 63 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

136
modules/desktop/hyprland/default.nix
View file

@ -1,80 +1,69 @@
{ inputs, outputs, options, config, lib, pkgs, ...}: { inputs, outputs, options, config, lib, pkgs, ... }:
let let cfg = config.modules.desktop.hyprland;
cfg = config.modules.desktop.hyprland; in {
in imports = [ inputs.hyprland.nixosModules.default ];
{
imports = [
inputs.hyprland.nixosModules.default
];
options.modules.desktop.hyprland = { options.modules.desktop.hyprland = { enable = lib.mkEnableOption false; };
enable = lib.mkEnableOption false;
};
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
modules.desktop.dunst.enable = lib.mkForce false; modules.desktop.dunst.enable = lib.mkForce false;
services.gnome.gnome-keyring.enable = true; services.gnome.gnome-keyring.enable = true;
services.greetd = { services.greetd = {
enable = true; enable = true;
settings = { settings = {
terminal = { terminal = { vt = 2; };
vt = 2; default_session = {
}; command =
default_session = { "${pkgs.greetd.tuigreet}/bin/tuigreet --time --time-format '%I:%M %p | %a • %h | %F' --cmd Hyprland";
command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --time-format '%I:%M %p | %a • %h | %F' --cmd Hyprland"; user = "greeter";
user = "greeter"; };
}; };
}; };
};
# https://github.com/apognu/tuigreet/issues/68#issuecomment-1586359960 # https://github.com/apognu/tuigreet/issues/68#issuecomment-1586359960
# make greetd not have systemd logs overlap # make greetd not have systemd logs overlap
systemd.services.greetd.serviceConfig = { systemd.services.greetd.serviceConfig = {
Type = "idle"; Type = "idle";
StandardInput = "tty"; StandardInput = "tty";
StandardOutput = "tty"; StandardOutput = "tty";
StandardError = "journal"; # Without this errors will spam on screen StandardError = "journal"; # Without this errors will spam on screen
# Without these bootlogs will spam on screen # Without these bootlogs will spam on screen
TTYReset = true; TTYReset = true;
TTYVHangup = true; TTYVHangup = true;
TTYVTDisallocate = true; TTYVTDisallocate = true;
}; };
services.xserver = { services.xserver = {
enable = true;
# displayManager = {
# # lightdm = {
# # enable = true;
# # background = ../../../config/background.png;
# # greeters.gtk = {
# # enable = true;
# # theme = {
# # name = "vimix-dark-ruby";
# # package = pkgs.vimix-gtk-themes;
# # };
# # };
# # };
# gdm = {
# enable = true;
# };
# };
};
services.libinput = {
enable = true; enable = true;
# displayManager = {
# # lightdm = {
# # enable = true;
# # background = ../../../config/background.png;
# # greeters.gtk = {
# # enable = true;
# # theme = {
# # name = "vimix-dark-ruby";
# # package = pkgs.vimix-gtk-themes;
# # };
# # };
# # };
# gdm = {
# enable = true;
# };
# };
};
services.libinput = {
enable = true;
# no mouse accel # no mouse accel
mouse = { mouse = { accelProfile = "flat"; };
accelProfile = "flat";
};
# no touchpad accel # no touchpad accel
touchpad = { touchpad = { accelProfile = "flat"; };
accelProfile = "flat"; };
};
};
users.users.sako.packages = with pkgs; [ users.users.sako.packages = with pkgs; [
# use wayland counterparts # use wayland counterparts
@ -114,9 +103,7 @@ in
wl-clipboard wl-clipboard
]; ];
programs.hyprland = { programs.hyprland = { enable = true; };
enable = true;
};
programs.hyprlock.enable = true; programs.hyprlock.enable = true;
@ -126,7 +113,7 @@ in
# piece of shit thanks! # piece of shit thanks!
services.emacs.startWithGraphical = false; services.emacs.startWithGraphical = false;
home-manager.users.sako = { pkgs , ...}: { home-manager.users.sako = { pkgs, ... }: {
home.pointerCursor = { home.pointerCursor = {
# name = "Catppuccin-Mocha-Dark"; # name = "Catppuccin-Mocha-Dark";
name = "catppuccin-mocha-dark-cursors"; name = "catppuccin-mocha-dark-cursors";
@ -136,10 +123,10 @@ in
}; };
gtk = { gtk = {
enable = true; enable = true;
theme.name = "Fluent-red-Dark"; theme.name = "Fluent-pink-Dark";
iconTheme.name = "Fluent-red-dark"; iconTheme.name = "Fluent-pink-dark";
}; };
home.file = { home.file = {
"background.png" = { "background.png" = {
enable = true; enable = true;
source = ../../../config/background.png; source = ../../../config/background.png;
@ -148,12 +135,13 @@ in
# thanks PartyWumpus # thanks PartyWumpus
# https://github.com/PartyWumpus/dotfiles/blob/277949d84d53a58a3f52be935cd3c581c89d5d7c/modules/hyprland/hyprland.nix#L492 # https://github.com/PartyWumpus/dotfiles/blob/277949d84d53a58a3f52be935cd3c581c89d5d7c/modules/hyprland/hyprland.nix#L492
"/nixos/config/ags/types" = { "/nixos/config/ags/types" = {
source = "${inputs.ags.packages.x86_64-linux.agsWithTypes.out}/share/com.github.Aylur.ags/types"; source =
"${inputs.ags.packages.x86_64-linux.agsWithTypes.out}/share/com.github.Aylur.ags/types";
}; };
}; };
xdg.configFile = { xdg.configFile = {
hypr = { hypr = {
source = ../../../config/hyprland; source = ../../../config/hyprland;
recursive = true; recursive = true;
}; };
waybar = { waybar = {
@ -168,7 +156,7 @@ in
source = ../../../config/ags; source = ../../../config/ags;
recursive = true; recursive = true;
}; };
}; };
}; };
environment.sessionVariables.NIXOS_OZONE_WL = "1"; environment.sessionVariables.NIXOS_OZONE_WL = "1";

2
overlays/default.nix
View file

@ -16,7 +16,7 @@
prev.vimix-gtk-themes.override { themeVariants = [ "ruby" ]; }; prev.vimix-gtk-themes.override { themeVariants = [ "ruby" ]; };
fluent-gtk-theme = prev.fluent-gtk-theme.override { fluent-gtk-theme = prev.fluent-gtk-theme.override {
colorVariants = [ "dark" ]; colorVariants = [ "dark" ];
themeVariants = [ "red" ]; themeVariants = [ "pink" ];
tweaks = [ "square" ]; tweaks = [ "square" ];
}; };
fluent-icon-theme = fluent-icon-theme =