Multiple changes for gunter

This commit is contained in:
Torjus Håkestad 2024-03-02 21:16:23 +01:00
parent b3423e8472
commit f0842bf343
7 changed files with 170 additions and 22 deletions

View File

@ -1,7 +1,17 @@
{ inputs, pkgs, lib, config, ... }: {
options.hyprland.enable = lib.mkEnableOption "Hyprland";
config = {
home.packages = with pkgs; [ swww wl-clipboard cliphist hyprpaper hyprlock ];
home.packages = with pkgs; [
cliphist
dunst
hyprlock
hyprpaper
rofi-wayland
slurp
swww
waybar
wl-clipboard
];
wayland.windowManager.hyprland = {
enable = true;
@ -9,12 +19,25 @@
"$mainMod" = "SUPER";
"$term" = "alacritty";
# monitor = [ "eDP-1,1920x1080@60,0x0,1" ];
monitor = [
"DP-3,1920x1080@60,2560x0,1" # top
"DP-8,2560x1440@75,0x1080,1" # left
"DP-2,2560x1440@120,2560x1080,1" # main
"DP-7,2560x1440@75,5120x1080,1" # right
];
input = {
kb_layout = "no";
follow_mouse = 1;
};
env = [
# "LIBVA_DRIVER_NAME,nvidia"
# "XDG_SESSION_TYPE,wayland"
# "GBM_BACKEND,nvidia-drm"
# "__GLX_VENDOR_LIBRARY_NAME,nvidia"
"WLR_NO_HARDWARE_CURSORS,1"
];
decoration = {
rounding = 0;
drop_shadow = true;
@ -55,7 +78,17 @@
misc.force_default_wallpaper = -1;
windowrulev2 = [
"opacity 0.95 override 0.5 override,class:^(Alacritty)$"
"opacity 0.95 override 0.7 override,class:^(Alacritty)$"
"opacity 0.95 override 0.7 override,class:^(kitty)$"
];
bindm = [
"ALT,mouse:272,movewindow"
];
bindr = [
# mumble ptt release
",code:202,exec,mumble rpc stoptalking"
];
bind = [
@ -80,6 +113,10 @@
"$mainMod,l,movewindow,r"
"$mainMod,k,movewindow,u"
"$mainMod,j,movewindow,d"
# mumble ptt click
",code:202,exec,mumble rpc starttalking"
] ++ (builtins.concatLists (builtins.genList
(x:
let
@ -89,7 +126,12 @@
"$mainMod, ${ws}, workspace, ${toString (x + 1)}"
"ALT, ${ws}, workspace, ${toString (x + 1)}"
]) 10));
exec-once = [ "waybar & hyprpaper" ];
exec-once = [
"waybar"
"hyprpaper"
"easy-effects --gapplication-service"
# "dunst"
];
};
};
};

View File

@ -12,8 +12,10 @@
file
go-task
jq
kitty
ncdu
mumble
obs-studio
pamixer
pinentry
pre-commit
@ -22,9 +24,16 @@
restic
ripgrep
rofi-rbw-wayland
spotify
spicetify-cli
steam
steam-run
steamcmd
tokei
unzip
yt-dlp
zoom-us
# Editors
vscode

View File

@ -0,0 +1,76 @@
{ config, lib, pkgs, ... }:
{
services.dunst = {
enable = true;
iconTheme = {
name = "Papirus-Dark";
package = pkgs.papirus-icon-theme;
};
settings = {
global = {
rounded = "yes";
origin = "top-right";
monitor = "0";
alignment = "left";
vertical_alignment = "center";
width = "400";
height = "400";
scale = 0;
gap_size = 0;
progress_bar = true;
transparency = 0;
text_icon_padding = 0;
separator_color = "frame";
sort = "yes";
idle_threshold = 120;
line_height = 0;
markup = "full";
show_age_threshold = 60;
ellipsize = "middle";
ignore_newline = "no";
stack_duplicates = true;
sticky_history = "yes";
history_length = 20;
always_run_script = true;
corner_radius = 10;
follow = "mouse";
font = "Source Sans Pro 10";
format = "<b>%s</b>\\n%b"; #format = "<span foreground='#f3f4f5'><b>%s %p</b></span>\n%b"
frame_color = "#232323";
frame_width = 1;
offset = "15x15";
horizontal_padding = 10;
icon_position = "left";
indicate_hidden = "yes";
min_icon_size = 0;
max_icon_size = 64;
mouse_left_click = "do_action, close_current";
mouse_middle_click = "close_current";
mouse_right_click = "close_all";
padding = 10;
plain_text = "no";
separator_height = 2;
show_indicators = "yes";
shrink = "no";
word_wrap = "yes";
browser = "/usr/bin/env firefox -new-tab";
};
fullscreen_delay_everything = {fullscreen = "delay";};
urgency_critical = {
background = "#d64e4e";
foreground = "#f0e0e0";
};
urgency_low = {
background = "#232323";
foreground = "#2596be";
};
urgency_normal = {
background = "#1e1e2a";
foreground = "#2596be";
};
};
};
}

View File

@ -7,7 +7,7 @@
enableCompletion = true;
syntaxHighlighting.enable = true;
shellAliases = {
nrebuild = "sudo nixos-rebuild switch --flake /home/${user}/nixos#prismo";
nrebuild = "sudo nixos-rebuild switch --flake /home/${user}/nixos";
};
initExtra = ''
bindkey -v

View File

@ -5,9 +5,9 @@
# Bootloader stuff
boot.kernelParams = [
"quiet"
"splash"
"rd.systemd.show_status=false"
# "quiet"
# "splash"
# "rd.systemd.show_status=false"
];
boot.loader.systemd-boot = { enable = true; };
boot.loader.efi = { canTouchEfiVariables = true; };
@ -20,14 +20,38 @@
time.timeZone = "Europe/Oslo";
# Enable opengl
# hardware.opengl = {
# enable = true;
# extraPackages = with pkgs; [
# ];
# };
hardware.opengl = {
enable = true;
driSupport = true;
driSupport32Bit = true;
extraPackages = with pkgs; [
vaapiVdpau
nvidia-vaapi-driver
];
};
# Nvidia stuff
hardware.nvidia = {
modesetting.enable = true;
powerManagement.enable = false;
powerManagement.finegrained = false;
open = false;
nvidiaSettings = true;
package = config.boot.kernelPackages.nvidiaPackages.stable;
};
# Setup hyprland
# nixpkgs.overlays = [
# (self: super: {
# hyprland = super.hyprland.override {
# debug = true;
# };
# })
# ];
services.xserver.enable = true;
services.xserver.videoDrivers = [ "nvidia" ];
services.xserver.displayManager.gdm.wayland = true;
programs.hyprland = {
enable = true;
xwayland.enable = true;
@ -60,10 +84,12 @@
nixpkgs.config.allowUnfree = true;
# Install system-wide packages
environment.systemPackages = with pkgs; [
vim
wget
curl
git
libnotify
usbutils
vim
wget
];
# Do NOT change this value unless you have manually inspected all the changes it would make to your configuration,

View File

@ -3,10 +3,12 @@
fonts.packages = with pkgs; [
fira-code
fira-code-symbols
nerdfonts
noto-fonts
noto-fonts-cjk
noto-fonts-emoji
noto-fonts-monochrome-emoji
source-sans-pro
twemoji-color-font
font-awesome
];

View File

@ -14,13 +14,6 @@
extraGroups = [ "wheel" "networkmanager" ];
# Install some user packages
packages = with pkgs; [
# Hyprland stuff
rofi-wayland
swaylock
waybar
dunst
slurp
wpaperd
];
};
}