Theaninova/TheaninovOS
1
0
Fork 0
mirror of https://github.com/Theaninova/TheaninovOS.git synced 2025-12-12 11:36:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: update system

Browse Source
This commit is contained in:
Thea Schöbl
2024-04-04 00:00:36 +02:00
parent 16d3816918
commit 11355f42d5
3 changed files with 96 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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": {

3
hosts/MONSTER/default.nix
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";
} }

55
modules/home-manager/desktops/hyprland/default.nix
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,14 +42,19 @@
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 =
let
firefoxPip = "class:^(firefox)$,title:^(Picture-in-Picture)$"; firefoxPip = "class:^(firefox)$,title:^(Picture-in-Picture)$";
firefoxPipInitial = "class:^(firefox)$,title:^(Firefox)$"; firefoxPipInitial = "class:^(firefox)$,title:^(Firefox)$";
in [ in
[
"keepaspectratio,${firefoxPip}" "keepaspectratio,${firefoxPip}"
"noborder,${firefoxPip}" "noborder,${firefoxPip}"
"float,${firefoxPip}" "float,${firefoxPip}"
@@ -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,9 +143,11 @@
}; };
}; };
services.darkman = let services.darkman =
let
wallpaperPath = "${config.home.homeDirectory}/.local/state/wallpaper.jpg"; wallpaperPath = "${config.home.homeDirectory}/.local/state/wallpaper.jpg";
in { in
{
enable = false; enable = false;
settings = { settings = {
lat = 52.52; lat = 52.52;
@@ -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";
@@ -173,7 +197,9 @@
] ]
}"; }";
}; };
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