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"
},
"locked": {
"lastModified": 1712176870,
"narHash": "sha256-K1xSXwRTPCSSYKu9ISaZIMm/M+T4NuPwmcWpMhp64ro=",
"lastModified": 1712177839,
"narHash": "sha256-RaHzysRIdkbOpkKwnjq349DbVcl4eyu2P4D0ber+ngk=",
"owner": "hyprwm",
"repo": "hyprland",
"rev": "949eb426136aef2690c31acc6389016aa8755ac8",
"rev": "36a8ae9bda4c2e150707e7ee0cb13ef3e8841728",
"type": "github"
},
"original": {

View File

@@ -8,6 +8,7 @@
imports = [ ./hardware-configuration.nix ];
nix = {
package = pkgs.nixVersions.unstable;
settings.experimental-features = [
"nix-command"
"flakes"
@@ -161,5 +162,5 @@
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 {
wayland.windowManager.hyprland = {
enable = true;
@@ -35,14 +42,19 @@
bind = import ./keybinds.nix;
bindm = import ./mousebinds.nix;
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 = [
"special:calc,border:false,gapsout:200,on-created-empty:[noanim;silent] kitty -e qalc"
];
windowrulev2 = let
windowrulev2 =
let
firefoxPip = "class:^(firefox)$,title:^(Picture-in-Picture)$";
firefoxPipInitial = "class:^(firefox)$,title:^(Firefox)$";
in [
in
[
"keepaspectratio,${firefoxPip}"
"noborder,${firefoxPip}"
"float,${firefoxPip}"
@@ -73,7 +85,10 @@
force_default_wallpaper = 0;
vrr = 1;
};
layerrule = [ "blur, anyrun" "ignorealpha 0.3, anyrun" ];
layerrule = [
"blur, anyrun"
"ignorealpha 0.3, anyrun"
];
decoration = {
drop_shadow = "yes";
shadow_range = 16;
@@ -110,11 +125,15 @@
};
services.flameshot = {
enable = true;
package = pkgs.flameshot.overrideAttrs (final: prev: {
cmakeFlags = [ "-DUSE_WAYLAND_CLIPBOARD=1" "-DUSE_WAYLAND_GRIM=true" ];
nativeBuildInputs = prev.nativeBuildInputs
++ [ pkgs.libsForQt5.kguiaddons ];
});
package = pkgs.flameshot.overrideAttrs (
final: prev: {
cmakeFlags = [
"-DUSE_WAYLAND_CLIPBOARD=1"
"-DUSE_WAYLAND_GRIM=true"
];
nativeBuildInputs = prev.nativeBuildInputs ++ [ pkgs.libsForQt5.kguiaddons ];
}
);
settings = {
General = {
uiColor = "#99d1db";
@@ -124,9 +143,11 @@
};
};
services.darkman = let
services.darkman =
let
wallpaperPath = "${config.home.homeDirectory}/.local/state/wallpaper.jpg";
in {
in
{
enable = false;
settings = {
lat = 52.52;
@@ -153,7 +174,10 @@
systemd.user.services.ags = {
Unit = {
Description = "ags";
PartOf = [ "graphical-session.target" "tray.target" ];
PartOf = [
"graphical-session.target"
"tray.target"
];
};
Service = {
ExecStart = "${pkgs.ags}/bin/ags";
@@ -173,7 +197,9 @@
]
}";
};
Install = { WantedBy = [ "graphical-session.target" ]; };
Install = {
WantedBy = [ "graphical-session.target" ];
};
};
programs.kitty = import ./kitty.nix { inherit pkgs; };
programs.anyrun = import ./anyrun.nix { inherit pkgs; };
@@ -197,6 +223,7 @@
kdePackages.breeze-icons
# gnome packages
evince
baobab
gnome.gvfs
gnome.gnome-keyring
gnome.nautilus