From 701c9d71f0a02bdb18ff691d6d47653f1150bf8a Mon Sep 17 00:00:00 2001 From: Lilith Date: Wed, 12 Mar 2025 14:42:18 +0100 Subject: [PATCH] matshell --- flake.nix | 15 ++++++++++++++- home/default.nix | 6 ++++-- home/hyprland/default.nix | 18 ++++++++---------- home/matshell.nix | 7 +++++++ hosts/lilith-pc/default.nix | 12 +++++++++++- 5 files changed, 44 insertions(+), 14 deletions(-) create mode 100644 home/matshell.nix diff --git a/flake.nix b/flake.nix index aca80abc..5b06ab65 100644 --- a/flake.nix +++ b/flake.nix @@ -28,7 +28,20 @@ }; }; - ags.url = "github:Aylur/ags"; + ags = { + url = "github:aylur/ags"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.astal = { + url = "github:aylur/astal"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + }; + + matshell = { + url = "github:Neurarian/matshell"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.ags.follows = "ags"; + }; }; outputs = { diff --git a/home/default.nix b/home/default.nix index d4ee6551..8b6aedd0 100644 --- a/home/default.nix +++ b/home/default.nix @@ -6,13 +6,15 @@ home-manager.backupFileExtension = "bak"; home-manager.users."lilith" = { imports = [ - ags.homeManagerModules.default + # ags.homeManagerModules.default sops-nix.homeManagerModules.sops - ./ags # ToDo: get codin :3 + # ./ags # ToDo: get codin :3 ./hyprland ./rofi.nix ./dunst.nix + ./matshell.nix + ./env.nix ./alacritty.nix diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix index 8156bd92..e4dbb90a 100644 --- a/home/hyprland/default.nix +++ b/home/hyprland/default.nix @@ -6,9 +6,7 @@ # ./utils.nix ]; - wayland.windowManager = let - - hyprDefaults = { + wayland.windowManager.hyprland = { enable = true; xwayland.enable = true; @@ -22,6 +20,8 @@ "HYPRCURSOR_THEME,rose-pine-hyprcursor" ]; + xwayland.force_zero_scaling = true; + monitor = [ ",preferred,1" ]; @@ -77,9 +77,11 @@ passes = 1; }; - drop_shadow = true; - shadow_range = 4; - shadow_render_power = 3; + shadow = { + enabled = true; + range = 4; + render_power = 3; + }; }; animations = { @@ -126,7 +128,6 @@ "$mainMod, P, exec, if (( $(pgrep keepassxc -c) < 2 )); then keepassxc; fi" "$mainMod, O, togglespecialworkspace, chatgpt" - "$mainMod, O, exec, [workspace special:chatgpt] pgrep firefox | xargs ps -fp | grep -- '-P ChatGPT --url chat.openai.com' || firefox -P ChatGPT --url chat.openai.com" ", print, exec, hyprshot -m region -o /home/lilith/sync/screenshots -z" "CTRL, print, exec, hyprshot -m output -o /home/lilith/sync/screenshots -z" @@ -175,7 +176,4 @@ ]; }; }; - in { - hyprland = hyprDefaults; - }; } diff --git a/home/matshell.nix b/home/matshell.nix new file mode 100644 index 00000000..a61ae358 --- /dev/null +++ b/home/matshell.nix @@ -0,0 +1,7 @@ +{ matshell, ...}: { + imports = [ matshell.homeManagerModules.default ]; + + programs.ags = { + matshell.enable = true; + }; +} diff --git a/hosts/lilith-pc/default.nix b/hosts/lilith-pc/default.nix index ea8f50d4..38427439 100644 --- a/hosts/lilith-pc/default.nix +++ b/hosts/lilith-pc/default.nix @@ -1,2 +1,12 @@ -{...}: { +{ lib, ...}: { + home-manager.users."lilith".wayland.windowManager.hyprland.settings = { + input.kb_layout = lib.mkForce "en"; + + monitor = lib.mkForce [ + "DP-3, 3840x2160, 0x0, 1.5" + "DP-4, 2560x1440, 2560x0, 1" + ",preferred,auto,1" + ]; + }; } +