feat: update system

This commit is contained in:
2024-04-04 00:00:36 +02:00
parent 16d3816918
commit 11355f42d5
3 changed files with 96 additions and 68 deletions

6
flake.lock generated
View File

@@ -269,11 +269,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1712176870, "lastModified": 1712177839,
"narHash": "sha256-K1xSXwRTPCSSYKu9ISaZIMm/M+T4NuPwmcWpMhp64ro=", "narHash": "sha256-RaHzysRIdkbOpkKwnjq349DbVcl4eyu2P4D0ber+ngk=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprland", "repo": "hyprland",
"rev": "949eb426136aef2690c31acc6389016aa8755ac8", "rev": "36a8ae9bda4c2e150707e7ee0cb13ef3e8841728",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -8,6 +8,7 @@
imports = [ ./hardware-configuration.nix ]; imports = [ ./hardware-configuration.nix ];
nix = { nix = {
package = pkgs.nixVersions.unstable;
settings.experimental-features = [ settings.experimental-features = [
"nix-command" "nix-command"
"flakes" "flakes"
@@ -161,5 +162,5 @@
fsType = "ntfs"; fsType = "ntfs";
}; };
system.stateVersion = "23.05"; system.stateVersion = "24.05";
} }

View File

@@ -1,4 +1,11 @@
{ config, pkgs, lib, osConfig, ... }: { {
config,
pkgs,
lib,
osConfig,
...
}:
{
config = lib.mkIf osConfig.desktops.hyprland.enable { config = lib.mkIf osConfig.desktops.hyprland.enable {
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
enable = true; enable = true;
@@ -35,35 +42,40 @@
bind = import ./keybinds.nix; bind = import ./keybinds.nix;
bindm = import ./mousebinds.nix; bindm = import ./mousebinds.nix;
bindr = [ "SUPER,SUPER_L,exec,pkill anyrun || anyrun" ]; bindr = [ "SUPER,SUPER_L,exec,pkill anyrun || anyrun" ];
monitor = [ "DP-1,highrr,0x0,1" "DP-1,addreserved,250,0,0,0" ]; monitor = [
"DP-1,highrr,0x0,1"
"DP-1,addreserved,250,0,0,0"
];
workspace = [ workspace = [
"special:calc,border:false,gapsout:200,on-created-empty:[noanim;silent] kitty -e qalc" "special:calc,border:false,gapsout:200,on-created-empty:[noanim;silent] kitty -e qalc"
]; ];
windowrulev2 = let windowrulev2 =
firefoxPip = "class:^(firefox)$,title:^(Picture-in-Picture)$"; let
firefoxPipInitial = "class:^(firefox)$,title:^(Firefox)$"; firefoxPip = "class:^(firefox)$,title:^(Picture-in-Picture)$";
in [ firefoxPipInitial = "class:^(firefox)$,title:^(Firefox)$";
"keepaspectratio,${firefoxPip}" in
"noborder,${firefoxPip}" [
"float,${firefoxPip}" "keepaspectratio,${firefoxPip}"
"float,${firefoxPipInitial}" "noborder,${firefoxPip}"
"pin,${firefoxPip}" "float,${firefoxPip}"
"pin,${firefoxPipInitial}" "float,${firefoxPipInitial}"
"fakefullscreen,${firefoxPip}" "pin,${firefoxPip}"
"fakefullscreen,${firefoxPipInitial}" "pin,${firefoxPipInitial}"
"move 22 72,${firefoxPip}" "fakefullscreen,${firefoxPip}"
"move 22 72,${firefoxPipInitial}" "fakefullscreen,${firefoxPipInitial}"
# For some reason it really wants to be maximized "move 22 72,${firefoxPip}"
"suppressevent maximize,class:^(neovide)$" "move 22 72,${firefoxPipInitial}"
# pinentry # For some reason it really wants to be maximized
"dimaround,class:^(gcr-prompter)$" "suppressevent maximize,class:^(neovide)$"
"noborder,class:^(gcr-prompter)$" # pinentry
"rounding 10,class:^(gcr-prompter)$" "dimaround,class:^(gcr-prompter)$"
"animation slide,class:^(gcr-prompter)$" "noborder,class:^(gcr-prompter)$"
# Flameshot fixes "rounding 10,class:^(gcr-prompter)$"
"float,class:^(flameshot)$" "animation slide,class:^(gcr-prompter)$"
"animation fade,class:^(flameshot)$" # Flameshot fixes
]; "float,class:^(flameshot)$"
"animation fade,class:^(flameshot)$"
];
xwayland.force_zero_scaling = true; xwayland.force_zero_scaling = true;
misc = { misc = {
layers_hog_keyboard_focus = false; layers_hog_keyboard_focus = false;
@@ -73,7 +85,10 @@
force_default_wallpaper = 0; force_default_wallpaper = 0;
vrr = 1; vrr = 1;
}; };
layerrule = [ "blur, anyrun" "ignorealpha 0.3, anyrun" ]; layerrule = [
"blur, anyrun"
"ignorealpha 0.3, anyrun"
];
decoration = { decoration = {
drop_shadow = "yes"; drop_shadow = "yes";
shadow_range = 16; shadow_range = 16;
@@ -110,11 +125,15 @@
}; };
services.flameshot = { services.flameshot = {
enable = true; enable = true;
package = pkgs.flameshot.overrideAttrs (final: prev: { package = pkgs.flameshot.overrideAttrs (
cmakeFlags = [ "-DUSE_WAYLAND_CLIPBOARD=1" "-DUSE_WAYLAND_GRIM=true" ]; final: prev: {
nativeBuildInputs = prev.nativeBuildInputs cmakeFlags = [
++ [ pkgs.libsForQt5.kguiaddons ]; "-DUSE_WAYLAND_CLIPBOARD=1"
}); "-DUSE_WAYLAND_GRIM=true"
];
nativeBuildInputs = prev.nativeBuildInputs ++ [ pkgs.libsForQt5.kguiaddons ];
}
);
settings = { settings = {
General = { General = {
uiColor = "#99d1db"; uiColor = "#99d1db";
@@ -124,25 +143,27 @@
}; };
}; };
services.darkman = let services.darkman =
wallpaperPath = "${config.home.homeDirectory}/.local/state/wallpaper.jpg"; let
in { wallpaperPath = "${config.home.homeDirectory}/.local/state/wallpaper.jpg";
enable = false; in
settings = { {
lat = 52.52; enable = false;
lng = 13.405; settings = {
lat = 52.52;
lng = 13.405;
};
darkModeScripts = {
kitty-theme = ''
${pkgs.kitty}/bin/kitty +kitten themes --reload-in=all --config-file-name ${config.home.homeDirectory}/.config/kitty/current-colors.conf Catppuccin-Frappe
'';
};
lightModeScripts = {
kitty-theme = ''
${pkgs.kitty}/bin/kitty +kitten themes --reload-in=all --config-file-name ${config.home.homeDirectory}/.config/kitty/current-colors.conf Catppuccin-Latte
'';
};
}; };
darkModeScripts = {
kitty-theme = ''
${pkgs.kitty}/bin/kitty +kitten themes --reload-in=all --config-file-name ${config.home.homeDirectory}/.config/kitty/current-colors.conf Catppuccin-Frappe
'';
};
lightModeScripts = {
kitty-theme = ''
${pkgs.kitty}/bin/kitty +kitten themes --reload-in=all --config-file-name ${config.home.homeDirectory}/.config/kitty/current-colors.conf Catppuccin-Latte
'';
};
};
programs.ags = { programs.ags = {
enable = true; enable = true;
configDir = ./ags; configDir = ./ags;
@@ -153,7 +174,10 @@
systemd.user.services.ags = { systemd.user.services.ags = {
Unit = { Unit = {
Description = "ags"; Description = "ags";
PartOf = [ "graphical-session.target" "tray.target" ]; PartOf = [
"graphical-session.target"
"tray.target"
];
}; };
Service = { Service = {
ExecStart = "${pkgs.ags}/bin/ags"; ExecStart = "${pkgs.ags}/bin/ags";
@@ -161,19 +185,21 @@
Restart = "always"; Restart = "always";
KillMode = "mixed"; KillMode = "mixed";
Environment = "PATH=/run/current-system/sw/bin/:${ Environment = "PATH=/run/current-system/sw/bin/:${
with pkgs; with pkgs;
lib.makeBinPath [ lib.makeBinPath [
swww swww
sassc sassc
glib glib
brightnessctl brightnessctl
ydotool ydotool
kitty kitty
hyprpicker hyprpicker
] ]
}"; }";
};
Install = {
WantedBy = [ "graphical-session.target" ];
}; };
Install = { WantedBy = [ "graphical-session.target" ]; };
}; };
programs.kitty = import ./kitty.nix { inherit pkgs; }; programs.kitty = import ./kitty.nix { inherit pkgs; };
programs.anyrun = import ./anyrun.nix { inherit pkgs; }; programs.anyrun = import ./anyrun.nix { inherit pkgs; };
@@ -197,6 +223,7 @@
kdePackages.breeze-icons kdePackages.breeze-icons
# gnome packages # gnome packages
evince evince
baobab
gnome.gvfs gnome.gvfs
gnome.gnome-keyring gnome.gnome-keyring
gnome.nautilus gnome.nautilus