[Hyprland,Eww] Refactors configs so that I can share more between Vega and Altair
This commit is contained in:
@@ -1,33 +1,24 @@
|
||||
{ ... }:
|
||||
let
|
||||
monitors = [
|
||||
"DP-1"
|
||||
"DP-2"
|
||||
];
|
||||
in
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
imports =
|
||||
map (x: ../../../home-manager + x) [
|
||||
"/features/astronomy.nix"
|
||||
"/features/chat.nix"
|
||||
"/features/development/development.nix"
|
||||
"/features/development/docker.nix"
|
||||
"/features/development/haskell.nix"
|
||||
"/features/development/markdown.nix"
|
||||
"/features/development/typescript.nix"
|
||||
"/features/development/vscode.nix"
|
||||
"/features/eww"
|
||||
"/features/email.nix"
|
||||
"/features/gaming.nix"
|
||||
"/features/image-editing.nix"
|
||||
"/features/linux-desktop.nix"
|
||||
"/features/mounts/mcp-archive.nix"
|
||||
"/features/notes.nix"
|
||||
"/features/3d-printing.nix"
|
||||
]
|
||||
++ [
|
||||
(import ../../../home-manager/features/hyprpaper.nix monitors)
|
||||
];
|
||||
imports = map (x: ../../../home-manager + x) [
|
||||
"/features/astronomy.nix"
|
||||
"/features/chat.nix"
|
||||
"/features/development/development.nix"
|
||||
"/features/development/docker.nix"
|
||||
"/features/development/haskell.nix"
|
||||
"/features/development/markdown.nix"
|
||||
"/features/development/typescript.nix"
|
||||
"/features/development/vscode.nix"
|
||||
"/features/eww"
|
||||
"/features/email.nix"
|
||||
"/features/gaming.nix"
|
||||
"/features/image-editing.nix"
|
||||
"/features/linux-desktop.nix"
|
||||
"/features/mounts/mcp-archive.nix"
|
||||
"/features/notes.nix"
|
||||
"/features/3d-printing.nix"
|
||||
"/features/hyprpaper.nix"
|
||||
];
|
||||
|
||||
home = {
|
||||
stateVersion = "24.11";
|
||||
@@ -48,17 +39,34 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
# TODO: Merge into lua config
|
||||
hardware.monitors = {
|
||||
"DP-2" = {
|
||||
position = "0x0";
|
||||
mode = "3440x1440@164";
|
||||
};
|
||||
"DP-1" = {
|
||||
mode = "2560x1440";
|
||||
position = "-1440x-510";
|
||||
rotation = "90";
|
||||
};
|
||||
};
|
||||
|
||||
programs.eww.widgets = [
|
||||
"primary-statusbar"
|
||||
"secondary-statusbar"
|
||||
];
|
||||
|
||||
# TODO: Still merging these into the LUA config
|
||||
# wayland.windowManager.hyprland.settings = {
|
||||
# exec-once = [
|
||||
# exec_once = [
|
||||
# # Set up eww here because it's based on the monitor configuration
|
||||
# "sleep 2 && eww open-many primary-statusbar secondary-statusbar"
|
||||
# # Set DP-2 as the primary monitor, otherwise it defaults to DP-1 because it's first in the list.
|
||||
# "xrandr --output DP-2 --primary"
|
||||
# ];
|
||||
# windowrule = [
|
||||
# # Rofi doesn't center properly when I have the two asymetric monitors, so we need hyprland to manage it.
|
||||
# "match:class Rofi, center on"
|
||||
# ];
|
||||
# # windowrule = [
|
||||
# # # Rofi doesn't center properly when I have the two asymetric monitors, so we need hyprland to manage it.
|
||||
# # "match:class Rofi, center on"
|
||||
# # ];
|
||||
# };
|
||||
}
|
||||
|
||||
@@ -9,7 +9,8 @@
|
||||
# Enable networking
|
||||
networking.networkmanager.enable = true;
|
||||
# Disable wpa-supplicant to avoid conflicts with network manager.
|
||||
networking.wireless.enable = false;
|
||||
# Appears this is not needed as of 26.05
|
||||
# networking.wireless.enable = true;
|
||||
|
||||
# Set your time zone.
|
||||
time.timeZone = "America/Los_Angeles";
|
||||
|
||||
@@ -1,58 +1,62 @@
|
||||
{ pkgs, ... }:
|
||||
{
|
||||
imports =
|
||||
map (x: ../../../home-manager + x) [
|
||||
"/features/chat.nix"
|
||||
"/features/development/development.nix"
|
||||
"/features/development/docker.nix"
|
||||
"/features/development/haskell.nix"
|
||||
"/features/development/markdown.nix"
|
||||
"/features/development/typescript.nix"
|
||||
"/features/email.nix"
|
||||
"/features/eww"
|
||||
"/features/image-editing.nix"
|
||||
"/features/linux-desktop.nix"
|
||||
"/features/notes.nix"
|
||||
]
|
||||
++ [
|
||||
(import ../../../home-manager/features/hyprpaper.nix [ "HDMI-A-1" ])
|
||||
];
|
||||
|
||||
home.packages = with pkgs; [
|
||||
slack
|
||||
zoom-us
|
||||
chromium
|
||||
imports = map (x: ../../../home-manager + x) [
|
||||
"/features/chat.nix"
|
||||
"/features/development/development.nix"
|
||||
"/features/development/docker.nix"
|
||||
"/features/development/haskell.nix"
|
||||
"/features/development/markdown.nix"
|
||||
"/features/development/typescript.nix"
|
||||
"/features/email.nix"
|
||||
"/features/eww"
|
||||
"/features/image-editing.nix"
|
||||
"/features/linux-desktop.nix"
|
||||
"/features/notes.nix"
|
||||
"/features/hyprpaper.nix"
|
||||
];
|
||||
|
||||
home.stateVersion = "24.11";
|
||||
home = {
|
||||
stateVersion = "24.11";
|
||||
|
||||
home.username = "drew";
|
||||
home.homeDirectory = "/home/drew";
|
||||
username = "drew";
|
||||
homeDirectory = "/home/drew";
|
||||
};
|
||||
|
||||
programs.git.settings.user = {
|
||||
name = "Drew Haven";
|
||||
email = "periodic@blazestar.net";
|
||||
};
|
||||
|
||||
hardware.monitors = {
|
||||
"HDMI-A-1" = {
|
||||
position = "0x0";
|
||||
mode = "3440x1440@75.05t s";
|
||||
};
|
||||
};
|
||||
|
||||
programs.eww.widgets = [
|
||||
"vertical-statusbar"
|
||||
];
|
||||
|
||||
# TODO: Merge into LUA configs
|
||||
# wayland.windowManager.hyprland.settings = {
|
||||
# # Set up eww here because it's based on the monitor configuration
|
||||
# # Eww is idempotent, so it's fine to just run it on every reload to make sure things are open
|
||||
# exec-once = [
|
||||
# "sleep 2 && eww open-many vertical-statusbar"
|
||||
# ];
|
||||
# # Set up workspaces for this system
|
||||
# # See https://wiki.hyprland.org/Configuring/Workspace-Rules/ for workspace rules
|
||||
# workspace = [
|
||||
# "1, defaultName:1"
|
||||
# "2, defaultName:2"
|
||||
# "3, defaultName:3"
|
||||
# "4, defaultName:4"
|
||||
# "5, defaultName:5"
|
||||
# "6, defaultName:6"
|
||||
# "7, defaultName:7"
|
||||
# "8, defaultName:8"
|
||||
# "9, defaultName:9"
|
||||
# ];
|
||||
# };
|
||||
wayland.windowManager.hyprland.settings = {
|
||||
# Set up eww here because it's based on the monitor configuration
|
||||
# Eww is idempotent, so it's fine to just run it on every reload to make sure things are open
|
||||
# exec_once = [
|
||||
# "sleep 2 && eww open-many vertical-statusbar"
|
||||
# ];
|
||||
# Set up workspaces for this system
|
||||
# See https://wiki.hyprland.org/Configuring/Workspace-Rules/ for workspace rules
|
||||
# workspace = [
|
||||
# "1, defaultName:1"
|
||||
# "2, defaultName:2"
|
||||
# "3, defaultName:3"
|
||||
# "4, defaultName:4"
|
||||
# "5, defaultName:5"
|
||||
# "6, defaultName:6"
|
||||
# "7, defaultName:7"
|
||||
# "8, defaultName:8"
|
||||
# "9, defaultName:9"
|
||||
# ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -55,4 +55,5 @@
|
||||
# Graphics settings
|
||||
# Using the default production drivers.
|
||||
graphics.enable = true;
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user