added hyprland :)

This commit is contained in:
Charlie Root 2024-05-04 15:00:14 +02:00
commit cce12a0d08
10 changed files with 147 additions and 20 deletions

View file

@ -7,6 +7,7 @@ in {
system = "x86_64-linux"; system = "x86_64-linux";
specialArgs = { inherit lib inputs self; }; specialArgs = { inherit lib inputs self; };
modules = [ modules = [
inputs.stylix.nixosModules.stylix
./vali/mars ./vali/mars
../modules ../modules
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager

Binary file not shown.

After

Width:  |  Height:  |  Size: 93 KiB

View file

@ -24,11 +24,62 @@
keep-derivations = true keep-derivations = true
''; '';
}; };
/*
stylix = {
image = ./2024-04-21-14-50.png;
polarity = "dark";
autoEnable = true;
base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-soft.yaml";
opacity = {
applications = 0.9;
popups = 0.9;
desktop = 0.9;
};
targets = {
fish.enable = true;
grub.enable = true;
gtk.enable = true;
nixos-icons.enable = true;
plymouth.enable = true;
#emacs.enable = true;
firefox.enable = true;
kitty.enable = true;
lazygit.enable = true;
rofi.enable = true;
tmux.enable = true;
vim.enable = true;
zathura.enable = true;
};
fonts = {
sizes = {
terminal = 14;
};
sansSerif = {
package = pkgs.dejavu_fonts;
name = "DejaVu Sans";
};
monospace = {
package = (pkgs.nerdfonts.override {fonts = ["JetBrainsMono"];});
name = "JetBrainsMono";
};
emoji = {
package = pkgs.noto-fonts-emoji;
name = "Noto Color Emoji";
};
};
cursor = {
package = pkgs.bibata-cursors;
name = "Bibata-Modern-Classic";
size = 24;
};
};
*/
security.sudo.package = pkgs.sudo.override { withInsults = true; }; security.sudo.package = pkgs.sudo.override { withInsults = true; };
security.polkit.enable = true; security.polkit.enable = true;
programs.kdeconnect.enable = true; programs.kdeconnect.enable = true;
programs.dconf.enable = true; programs.dconf.enable = true;
services.picom.enable = true;
modules = { modules = {
other = { other = {
system = { system = {
@ -48,22 +99,24 @@
mpv.enable = true; mpv.enable = true;
kitty.enable = true; kitty.enable = true;
awesome.enable = true; awesome.enable = true;
hyprland.enable = true;
newsboat.enable = true; newsboat.enable = true;
emacs.enable = true; emacs.enable = true;
fish.enable = true; fish.enable = true;
stylix.enable = true;
}; };
services = { services = {
pipewire.enable = true; pipewire.enable = true;
}; };
themes = { themes = {
cursor = { cursor = {
enable = true; enable = false;
package = pkgs.bibata-cursors; package = pkgs.bibata-cursors;
name = "Bibata-Modern-Classic"; name = "Bibata-Modern-Classic";
size = 24; size = 24;
}; };
gtk = { gtk = {
enable = true; enable = false;
package = pkgs.materia-theme; package = pkgs.materia-theme;
name = "Materia-dark"; name = "Materia-dark";
# iconTheme = { # iconTheme = {
@ -72,7 +125,7 @@
# }; # };
}; };
qt = { qt = {
enable = true; enable = false;
package = pkgs.kde-gruvbox; package = pkgs.kde-gruvbox;
name = "Gruvbox-Dark"; name = "Gruvbox-Dark";
}; };

View file

@ -5,6 +5,7 @@ _: {
./hardware-configuration.nix ./hardware-configuration.nix
./profile.nix ./profile.nix
./awesome/awesome.nix ./awesome/awesome.nix
./hyprland/hyprland.nix
]; ];
} }

View file

View file

@ -0,0 +1,32 @@
{ config, pkgs, lib, ... }:
with lib;
let
username = config.modules.other.system.username;
cfg = config.modules.programs.hyprland;
in {
options.modules.programs.hyprland.enable = mkEnableOption "hyprland";
config = mkIf cfg.enable {
programs.hyprland = {
enable = true;
xwayland.enable = true;
};
environment.sessionVariables = {
WLR_NO_HARDWARE_CURSORS = "1";
NIXOS_OZONE_WL = "1";
};
hardware = {
opengl.enable = true;
nvidia.modesetting.enable = true;
};
environment.systemPackages = with pkgs; [
(waybar.overrideAttrs (oldAttrs: {
mesonFlags = oldAttrs.mesonFlags ++ ["-Dexperimental=true"];
}))
dunst
libnotify
hyprpaper
];
};
}

View file

@ -6,6 +6,7 @@ _: {
./mpv.nix ./mpv.nix
./qt.nix ./qt.nix
./zathura.nix ./zathura.nix
./stylix.nix
./rofi.nix ./rofi.nix
./kitty.nix ./kitty.nix
./vivado.nix ./vivado.nix

View file

@ -17,6 +17,7 @@ in {
''; '';
extraPackages = epkgs: [ extraPackages = epkgs: [
epkgs.evil epkgs.evil
epkgs.gruvbox-theme
]; ];
}; };

View file

@ -10,13 +10,13 @@ in {
programs.kitty = { programs.kitty = {
enable = true; enable = true;
settings = { settings = {
font_size = "13.0"; # font_size = "13.0";
mouse_hide_wait = -1; mouse_hide_wait = -1;
url_style = "curly"; url_style = "curly";
open_url_with = "default"; open_url_with = "default";
background_opacity = "0.9"; #background_opacity = "0.9";
confirm_os_window_close = "0"; confirm_os_window_close = "0";
font_family = "JetBrainsMono Nerd Font"; #font_family = "JetBrainsMono Nerd Font";
cursor_text_color = "background"; cursor_text_color = "background";

View file

@ -1,4 +1,4 @@
{ config, lib, ... }: { config, pkgs, lib, ... }:
with lib; let with lib; let
cfg = config.modules.programs.stylix; cfg = config.modules.programs.stylix;
username = config.modules.other.system.username; username = config.modules.other.system.username;
@ -7,20 +7,58 @@ in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
home-manager.users.${username} = { home-manager.users.${username} = {
programs.btop = { stylix = {
enable = true; autoEnable = true;
settings = { base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-soft.yaml";
theme_background = false; polarity = "dark";
vim_keys = true; targets = {
update_ms = 1000; btop.enable = true;
cpu_single_graph = true; fish.enable = true;
clock_format = "%X"; emacs.enable = true;
use_fstab = true; firefox.enable = true;
io_mode = true; kitty.enable = true;
net_sync = true; lazygit.enable = true;
net_iface = "enp4s0"; rofi.enable = true;
log_level = "WARNING"; tmux.enable = true;
vim.enable = true;
zathura.enable = true;
gtk.enable = true;
}; };
opacity = {
applications = 0.9;
popups = 0.9;
desktop = 0.9;
};
fonts = {
sizes = {
terminal = 14;
popups = 14;
};
sansSerif = {
package = pkgs.dejavu_fonts;
name = "DejaVu Sans";
};
monospace = {
package = (pkgs.nerdfonts.override {fonts = ["JetBrainsMono"];});
name = "JetBrainsMono";
};
emoji = {
package = pkgs.noto-fonts-emoji;
name = "Noto Color Emoji";
};
};
};
};
stylix = {
image = ../../hosts/vali/mars/2024-04-21-14-50.png;
cursor = {
package = pkgs.bibata-cursors;
name = "Bibata-Modern-Classic";
size = 24;
}; };
}; };
}; };