Shinonome/omarchy-nix
1
0
Fork 1
mirror of https://github.com/henrysipp/omarchy-nix.git synced 2026-06-05 18:29:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

Small enhancements for omanix (#3)

Browse Source 
- Signal package
- Configurable GDK_SCALE
- Add input.nix (lol)
This commit is contained in:
mrosseel
2025-07-09 03:43:25 +02:00
committed by GitHub
parent 8bb8681985
commit 5e93a53cec
5 changed files with 42 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config.nix
+5
View File
@@ -33,6 +33,11 @@ lib: {
type = lib.types.listOf lib.types.str; type = lib.types.listOf lib.types.str;
default = []; default = [];
}; };
scale = lib.mkOption {
type = lib.types.int;
default = 2;
description = "Display scale factor (1 for 1x displays, 2 for 2x displays)";
};
quick_app_bindings = lib.mkOption { quick_app_bindings = lib.mkOption {
type = lib.types.listOf lib.types.str; type = lib.types.listOf lib.types.str;
description = "A list of single keystroke key bindings to launch common apps."; description = "A list of single keystroke key bindings to launch common apps.";
flake.lock
Generated
+30 -30
View File
@@ -20,11 +20,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1750372185, "lastModified": 1751740947,
"narHash": "sha256-lVBKxd9dsZOH1fA6kSE5WNnt8e+09fN+NL/Q3BjTWHY=", "narHash": "sha256-35040CHH7P3JGmhGVfEb2oJHL/A5mI2IXumhkxrBnao=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "aquamarine", "repo": "aquamarine",
"rev": "7cef49d261cbbe537e8cb662485e76d29ac4cbca", "rev": "dfc1db15a08c4cd234288f66e1199c653495301f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -94,11 +94,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1751131846, "lastModified": 1751824240,
"narHash": "sha256-VqXwSsEpmQlVUK0Y6FZ4YQwB63zWWD6ziHgQW2zEiUA=", "narHash": "sha256-aDDC0CHTlL7QDKWWhdbEgVPK6KwWt+ca0QkmHYZxMzI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "da077f20db88a173629624a30380658840d377b3", "rev": "fd9e55f5fac45a26f6169310afca64d56b681935",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -152,11 +152,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1750371717, "lastModified": 1751808145,
"narHash": "sha256-cNP+bVq8m5x2Rl6MTjwfQLCdwbVmKvTH7yqVc1SpiJM=", "narHash": "sha256-OXgL0XaKMmfX2rRQkt9SkJw+QNfv0jExlySt1D6O72g=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprgraphics", "repo": "hyprgraphics",
"rev": "15c6f8f3a567fec9a0f732cd310a7ff456deef88", "rev": "b841473a0bd4a1a74a0b64f1ec2ab199035c349f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -181,11 +181,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1751122874, "lastModified": 1751904574,
"narHash": "sha256-0biNUPDAN2RC+RFEdaJ5z3jt5zAP6wrKNyO1wxhwgjo=", "narHash": "sha256-jXkava/9BRiY2JEVmB68mpkFd+JU3BnNbh2RtRBXfTA=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "Hyprland", "repo": "Hyprland",
"rev": "ab900d8752af11ada256ea6fca54d5404587405c", "rev": "bb958a9e139d6ae90d45fe360287d33e229f971e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -328,11 +328,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1750703126, "lastModified": 1751888065,
"narHash": "sha256-zJHmLsiW6P8h9HaH5eMKhEh/gvym3k6/Ywr4UHKpJfc=", "narHash": "sha256-F2SV9WGqgtRsXIdUrl3sRe0wXlQD+kRRZcSfbepjPJY=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprutils", "repo": "hyprutils",
"rev": "d46bd32da554c370f98180a1e465f052b9584805", "rev": "a8229739cf36d159001cfc203871917b83fdf917",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -353,11 +353,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1750371869, "lastModified": 1751881472,
"narHash": "sha256-lGk4gLjgZQ/rndUkzmPYcgbHr8gKU5u71vyrjnwfpB4=", "narHash": "sha256-meB0SnXbwIe2trD041MLKEv6R7NZ759QwBcVIhlSBfE=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "hyprwayland-scanner", "repo": "hyprwayland-scanner",
"rev": "aa38edd6e3e277ae6a97ea83a69261a5c3aab9fd", "rev": "8fb426b3e5452fd9169453fd6c10f8c14ca37120",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -387,11 +387,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1750365781, "lastModified": 1751792365,
"narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=", "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54", "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -418,11 +418,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1751011381, "lastModified": 1751792365,
"narHash": "sha256-krGXKxvkBhnrSC/kGBmg5MyupUUT5R6IBCLEzx9jhMM=", "narHash": "sha256-J1kI6oAj25IG4EdVlg2hQz8NZTBNYvIS0l4wpr9KcUo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "30e2e2857ba47844aa71991daa6ed1fc678bcbb7", "rev": "1fd8bada0b6117e6c7eb54aad5813023eed37ccb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -442,11 +442,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1749636823, "lastModified": 1750779888,
"narHash": "sha256-WUaIlOlPLyPgz9be7fqWJA5iG6rHcGRtLERSCfUDne4=", "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "623c56286de5a3193aa38891a6991b28f9bab056", "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -506,11 +506,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1750372504, "lastModified": 1751300244,
"narHash": "sha256-VBeZb1oqZM1cqCAZnFz/WyYhO8aF/ImagI7WWg/Z3Og=", "narHash": "sha256-PFuv1TZVYvQhha0ac53E3YgdtmLShrN0t4T6xqHl0jE=",
"owner": "hyprwm", "owner": "hyprwm",
"repo": "xdg-desktop-portal-hyprland", "repo": "xdg-desktop-portal-hyprland",
"rev": "400308fc4f9d12e0a93e483c2e7a649e12af1a92", "rev": "6115f3fdcb2c1a57b4a80a69f3c797e47607b90a",
"type": "github" "type": "github"
}, },
"original": { "original": {
modules/home-manager/hyprland/configuration.nix
+1 -11
View File
@@ -10,6 +10,7 @@ in {
./autostart.nix ./autostart.nix
./bindings.nix ./bindings.nix
./envs.nix ./envs.nix
./input.nix
./looknfeel.nix ./looknfeel.nix
./windows.nix ./windows.nix
]; ];
@@ -23,17 +24,6 @@ in {
"$messenger" = lib.mkDefault "signal-desktop"; "$messenger" = lib.mkDefault "signal-desktop";
"$webapp" = lib.mkDefault "$browser --app"; "$webapp" = lib.mkDefault "$browser --app";
# Environment variables
env = [
"GDK_SCALE,2" # Change to 1 if on a 1x display
# TODO: Flake config
# Uncomment if running NVIDIA GPU:
# "NVD_BACKEND,direct"
# "LIBVA_DRIVER_NAME,nvidia"
# "__GLX_VENDOR_LIBRARY_NAME,nvidia"
];
monitor = cfg.monitors; monitor = cfg.monitors;
}; };
} }
modules/home-manager/hyprland/envs.nix
+3 -7
View File
@@ -6,8 +6,8 @@
... ...
}: }:
let let
hasNvidiaDrivers = builtins.elem "nvidia" osConfig.services.xserver.videoDrivers; cfg = config.omarchy;
hasNvidiaDrivers = builtins.elem "nvidia" osConfig.services.xserver.videoDrivers;
nvidiaEnv = [ nvidiaEnv = [
"NVD_BACKEND,direct" "NVD_BACKEND,direct"
"LIBVA_DRIVER_NAME,nvidia" "LIBVA_DRIVER_NAME,nvidia"
@@ -18,11 +18,7 @@ in
wayland.windowManager.hyprland.settings = { wayland.windowManager.hyprland.settings = {
# Environment variables # Environment variables
env = (lib.optionals hasNvidiaDrivers nvidiaEnv) ++ [ env = (lib.optionals hasNvidiaDrivers nvidiaEnv) ++ [
"GDK_SCALE,2" # Change to 1 if on a 1x display "GDK_SCALE,${toString cfg.scale}"
# Uncomment if running NVIDIA GPU:
# "NVD_BACKEND,direct"
# "LIBVA_DRIVER_NAME,nvidia"
# "__GLX_VENDOR_LIBRARY_NAME,nvidia"
# Cursor size # Cursor size
"XCURSOR_SIZE,24" "XCURSOR_SIZE,24"
modules/packages.nix
+1 -1
View File
@@ -50,7 +50,7 @@
# kdePackages.kdenLive # kdePackages.kdenLive
# pinta # pinta
# libreoffice # libreoffice
# signal_desktop signal-desktop
# Commercial GUIs # Commercial GUIs
typora typora