From 196bd09206e6beec16765cc8ad586b7a54a9eac6 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Mon, 25 Nov 2024 10:38:50 -0600 Subject: [PATCH 1/4] Fix hyprland status in eww bar --- flake.nix | 6 ++---- modules/home-manager/eww/scripts/hypr-workspaces.bash | 2 +- modules/nixos/default.nix | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/flake.nix b/flake.nix index 05e2719..360137a 100644 --- a/flake.nix +++ b/flake.nix @@ -49,7 +49,7 @@ "https://cache.nixos.org/" "https://helix.cachix.org" "https://nix-community.cachix.org" - "https://nix.h.lyte.dev" + # "https://nix.h.lyte.dev" "https://hyprland.cachix.org" ]; @@ -294,7 +294,6 @@ hardware.nixosModules.common-cpu-intel outputs.nixosModules.deno-netlify-ddns-client - { services.deno-netlify-ddns-client = { enable = true; @@ -341,7 +340,6 @@ slippi.nixosModules.default outputs.nixosModules.deno-netlify-ddns-client - { services.deno-netlify-ddns-client = { enable = true; @@ -462,6 +460,7 @@ kde-connect password-manager graphical-workstation + plasma6 virtual-machines virtual-machines-gui laptop @@ -672,7 +671,6 @@ troubleshooting-tools outputs.nixosModules.deno-netlify-ddns-client - { services.deno-netlify-ddns-client = { enable = true; diff --git a/modules/home-manager/eww/scripts/hypr-workspaces.bash b/modules/home-manager/eww/scripts/hypr-workspaces.bash index 6c46e0b..8f869f5 100755 --- a/modules/home-manager/eww/scripts/hypr-workspaces.bash +++ b/modules/home-manager/eww/scripts/hypr-workspaces.bash @@ -63,7 +63,7 @@ workspaces # listen to events and re-render while true; do # TODO: not sure why this socat | read invocation seems to stop? - socat - "UNIX-CONNECT:/tmp/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock" | while read -r line; do + socat - "UNIX-CONNECT:$XDG_RUNTIME_DIR/hypr/$HYPRLAND_INSTANCE_SIGNATURE/.socket2.sock" | while read -r line; do workspaces "$line" done done diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 742680d..f4f4e6b 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -409,7 +409,7 @@ "https://cache.nixos.org/" "https://helix.cachix.org" "https://nix-community.cachix.org" - "https://nix.h.lyte.dev" + # "https://nix.h.lyte.dev" "https://hyprland.cachix.org" ]; trusted-public-keys = [ From 50b5b24d0f0e2c940586aeb1868efe82d44a68bf Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Mon, 2 Dec 2024 19:58:12 -0600 Subject: [PATCH 2/4] Merge --- nixos/foxtrot.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/nixos/foxtrot.nix b/nixos/foxtrot.nix index 794141a..1d72177 100644 --- a/nixos/foxtrot.nix +++ b/nixos/foxtrot.nix @@ -285,7 +285,6 @@ in }; }; - /* wayland.windowManager.hyprland = { settings = { env = [ @@ -293,11 +292,10 @@ in ]; # See https://wiki.hyprland.org/Configuring/Keywords/ for more monitor = [ - "eDP-1,2256x1504@60,0x0,${toString scale}" + "eDP-1,2880x1920@120Hz,0x0,1.66667" ]; }; }; - */ wayland.windowManager.sway = { config = { @@ -305,7 +303,7 @@ in "BOE NE135A1M-NY1 Unknown" = { mode = "2880x1920@120Hz"; position = "1092,2160"; - scale = toString 1.75; + scale = toString (5 / 3); }; "Dell Inc. DELL U2720Q CWTM623" = { From 6e4d4cfafcefe4ee91bb7e46ff899bbb1191c7b6 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Mon, 2 Dec 2024 20:09:05 -0600 Subject: [PATCH 3/4] Re-activate the cache --- flake.nix | 2 +- modules/nixos/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 9da6d23..fa15dbf 100644 --- a/flake.nix +++ b/flake.nix @@ -49,7 +49,7 @@ "https://cache.nixos.org/" "https://helix.cachix.org" "https://nix-community.cachix.org" - # "https://nix.h.lyte.dev" + "https://nix.h.lyte.dev" "https://hyprland.cachix.org" ]; diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index 7d5c3ca..0b39ebc 100644 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -409,7 +409,7 @@ "https://cache.nixos.org/" "https://helix.cachix.org" "https://nix-community.cachix.org" - # "https://nix.h.lyte.dev" + "https://nix.h.lyte.dev" "https://hyprland.cachix.org" ]; trusted-public-keys = [ From 3a7c517435b41ad602234435004d53caed0ff579 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Tue, 3 Dec 2024 12:53:29 -0600 Subject: [PATCH 4/4] Wez --- flake.lock | 153 +++++++++++++++++++++++- flake.nix | 18 ++- modules/home-manager/wezterm/config.lua | 4 +- 3 files changed, 162 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index b1365de..2d95732 100644 --- a/flake.lock +++ b/flake.lock @@ -135,6 +135,41 @@ "type": "github" } }, + "flake-utils_2": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "freetype2": { + "flake": false, + "locked": { + "lastModified": 1687587065, + "narHash": "sha256-+Fh+/k+NWL5Ow9sDLtp8Cv/8rLNA1oByQQCIQS/bysY=", + "owner": "wez", + "repo": "freetype2", + "rev": "e4586d960f339cf75e2e0b34aee30a0ed8353c0d", + "type": "github" + }, + "original": { + "owner": "wez", + "repo": "freetype2", + "rev": "e4586d960f339cf75e2e0b34aee30a0ed8353c0d", + "type": "github" + } + }, "git-hooks": { "inputs": { "flake-compat": "flake-compat", @@ -262,6 +297,23 @@ "type": "github" } }, + "harfbuzz": { + "flake": false, + "locked": { + "lastModified": 1711722720, + "narHash": "sha256-GdxcAPx5QyniSHPAN1ih28AD9JLUPR0ItqW9JEsl3pU=", + "owner": "harfbuzz", + "repo": "harfbuzz", + "rev": "63973005bc07aba599b47fdd4cf788647b601ccd", + "type": "github" + }, + "original": { + "owner": "harfbuzz", + "ref": "8.4.0", + "repo": "harfbuzz", + "type": "github" + } + }, "helix": { "inputs": { "crane": "crane", @@ -507,6 +559,23 @@ "type": "github" } }, + "libpng": { + "flake": false, + "locked": { + "lastModified": 1549245649, + "narHash": "sha256-1+cRp0Ungme/OGfc9kGJbklYIWAFxk8Il1M+NV4KSgw=", + "owner": "glennrp", + "repo": "libpng", + "rev": "8439534daa1d3a5705ba92e653eda9251246dd61", + "type": "github" + }, + "original": { + "owner": "glennrp", + "repo": "libpng", + "rev": "8439534daa1d3a5705ba92e653eda9251246dd61", + "type": "github" + } + }, "mobile-nixos": { "flake": false, "locked": { @@ -695,7 +764,8 @@ "nixpkgs": "nixpkgs_3", "nixpkgs-unstable": "nixpkgs-unstable", "slippi": "slippi", - "sops-nix": "sops-nix" + "sops-nix": "sops-nix", + "wezterm": "wezterm" } }, "rust-overlay": { @@ -719,6 +789,27 @@ "type": "github" } }, + "rust-overlay_2": { + "inputs": { + "nixpkgs": [ + "wezterm", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729477859, + "narHash": "sha256-r0VyeJxy4O4CgTB/PNtfQft9fPfN1VuGvnZiCxDArvg=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "ada8266712449c4c0e6ee6fcbc442b3c217c79e1", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "slippi": { "inputs": { "git-hooks": "git-hooks_2", @@ -793,6 +884,49 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "wezterm": { + "inputs": { + "flake-utils": "flake-utils_2", + "freetype2": "freetype2", + "harfbuzz": "harfbuzz", + "libpng": "libpng", + "nixpkgs": [ + "nixpkgs-unstable" + ], + "rust-overlay": "rust-overlay_2", + "zlib": "zlib" + }, + "locked": { + "dir": "nix", + "lastModified": 1732918908, + "narHash": "sha256-k43oaC+35/LGqJ+3MjIhn4Ko+ap3wTvHCJ4sj9W/o+k=", + "owner": "wez", + "repo": "wezterm", + "rev": "4906789a6d61da58f73b95f89b59c41af60e0f3b", + "type": "github" + }, + "original": { + "dir": "nix", + "owner": "wez", + "repo": "wezterm", + "type": "github" + } + }, "xdph": { "inputs": { "hyprland-protocols": [ @@ -833,6 +967,23 @@ "repo": "xdg-desktop-portal-hyprland", "type": "github" } + }, + "zlib": { + "flake": false, + "locked": { + "lastModified": 1484501380, + "narHash": "sha256-j5b6aki1ztrzfCqu8y729sPar8GpyQWIrajdzpJC+ww=", + "owner": "madler", + "repo": "zlib", + "rev": "cacf7f1d4e3d44d871b605da3b647f07d718623f", + "type": "github" + }, + "original": { + "owner": "madler", + "ref": "v1.2.11", + "repo": "zlib", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index fa15dbf..01c6256 100644 --- a/flake.nix +++ b/flake.nix @@ -23,8 +23,8 @@ hardware.url = "github:nixos/nixos-hardware"; hyprland.url = "github:hyprwm/Hyprland"; - # wezterm.url = "github:wez/wezterm?dir=nix"; - # wezterm.inputs.nixpkgs.follows = "nixpkgs-unstable"; + wezterm.url = "github:wez/wezterm?dir=nix"; + wezterm.inputs.nixpkgs.follows = "nixpkgs-unstable"; slippi.url = "github:lytedev/slippi-nix"; # slippi.url = "git+file:///home/daniel/code/open-source/slippi-nix"; @@ -69,7 +69,7 @@ disko, sops-nix, git-hooks, - # wezterm, + wezterm, home-manager, home-manager-unstable, helix, @@ -230,11 +230,9 @@ }; }; - modifications = final: prev: - # let - # wezterm-input = wezterm; - # in - rec { + modifications = final: prev: let + wezterm-input = wezterm; + in rec { helix = helix.outputs.packages.${prev.system}.helix; final.helix = helix; /* @@ -243,9 +241,9 @@ not-yet-merged (abandoned?): https://github.com/wez/wezterm/pull/4737 I did try using the latest code via the flake, but alas it did not resolve my issues with mux'ing */ - # wezterm = wezterm-input.outputs.packages.${prev.system}.default; + wezterm = wezterm-input.outputs.packages.${prev.system}.default; # wezterm = (import nixpkgs {inherit (prev) system;}).wezterm; - # final.wezterm = wezterm; + final.wezterm = wezterm; # zellij = prev.zellij.overrideAttrs rec { # version = "0.41.0"; diff --git a/modules/home-manager/wezterm/config.lua b/modules/home-manager/wezterm/config.lua index 851bf64..58c931f 100644 --- a/modules/home-manager/wezterm/config.lua +++ b/modules/home-manager/wezterm/config.lua @@ -22,8 +22,8 @@ config.window_background_opacity = 1.0 config.enable_kitty_keyboard = true config.show_new_tab_button_in_tab_bar = true -config.front_end = "WebGpu" -config.webgpu_power_preference = 'HighPerformance' +-- config.front_end = "WebGpu" +-- config.webgpu_power_preference = 'HighPerformance' config.enable_wayland = true -- config.use_ime = true