From 1db9388a7d2a86e54ae77ccb28b629c15d948b71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Av=C3=A9?= Date: Tue, 4 Jun 2024 22:27:38 +0200 Subject: [PATCH] Tue Jun 4 10:27:38 PM CEST 2024 --- home/Aloria.nix | 37 +++++++++++++++++++++++++++++++++++++ home/Kell.nix | 8 ++++++++ home/hyprland/default.nix | 7 +------ 3 files changed, 46 insertions(+), 6 deletions(-) create mode 100644 home/Aloria.nix diff --git a/home/Aloria.nix b/home/Aloria.nix new file mode 100644 index 0000000..bfdff7c --- /dev/null +++ b/home/Aloria.nix @@ -0,0 +1,37 @@ +{ inputs, config, pkgs, ... }: + +{ + imports = [ + (import ./common.nix { inherit inputs config pkgs; }) + (import ./hyprland { inherit inputs pkgs; }) + (import ./waybar { inherit inputs pkgs; }) + ./rofi + ./alacritty + ./kitty + ./firefox + ./ssh + ./mpv + ]; + home.packages = with pkgs; [ telegram-desktop webcord devenv ]; + programs.ssh.matchBlocks."*".identityFile = "/home/server/.secrets/SSH/Aloria/id_ed25519"; + + services.hyprpaper = { + settings = { + wallpaper = [ + "HDMI-A-1,${./hyprland/files/wallpaper.png}" + "HDMI-A-2,${./hyprland/files/wallpaper.png}" + "eDP-1,${./hyprland/files/wallpaper.png}" + ]; + }; + }; + + gtk.iconTheme = { + name = "Papirus"; + gtk.iconTheme.package = pkgs.papirus-icon-theme; + }; + programs.waybar = { settings = { mainBar = { output = "eDP-1"; }; }; }; + home.file."${config.xdg.configHome}/hypr/card".text = + # Intel: /dev/dri/by-path/pci-0000:00:02.0-card + # Nvidia: /dev/dri/by-path/pci-0000:01:00.0-card + wayland.windowManager.hyprland.settings.env = ["WLR_DRM_DEVICES,/dev/dri/by-path/pci-0000:00:02.0-card"]; +} diff --git a/home/Kell.nix b/home/Kell.nix index 4a6f33c..2972d20 100644 --- a/home/Kell.nix +++ b/home/Kell.nix @@ -30,4 +30,12 @@ gtk.iconTheme.package = pkgs.papirus-icon-theme; }; programs.waybar = { settings = { mainBar = { output = "DP-2"; }; }; }; + wayland.windowManager.hyprland.settings = { + monitor = [ + "DP-3,preferred,0x550,1" + "DP-2,preferred,1920x0,1" + "HDMI-A-1,preferred,5760x550,1" + ]; + input.kb_options = "compose:rctrl, caps:super, altwin:swap_alt_win"; + } } diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix index 78243a0..7eaaa1b 100644 --- a/home/hyprland/default.nix +++ b/home/hyprland/default.nix @@ -132,11 +132,6 @@ in { "stayfocused, title:^()$,class:^(steam)$" ]; windowrule = [ "noanim,waybar" ]; - monitor = [ - "DP-3,preferred,0x550,1" - "DP-2,preferred,1920x0,1" - "HDMI-A-1,preferred,5760x550,1" - ]; general = { gaps_in = 1; gaps_out = 5; @@ -148,7 +143,7 @@ in { input = { kb_layout = "us"; follow_mouse = 1; - kb_options = "compose:rctrl, caps:super, altwin:swap_alt_win"; + kb_options = "compose:rctrl"; numlock_by_default = true; }; binds = { scroll_event_delay = 1; };