From 794022de7c7fdcbd8bd99bd9b47b577185fb3f74 Mon Sep 17 00:00:00 2001 From: Erwin Boskma Date: Wed, 11 Dec 2024 16:48:09 +0100 Subject: [PATCH] work: Add ghostty, wlvncc, fix sway keybinds --- flake.lock | 110 ++++++++++++++++++++++++++++++++++++++++++- flake.nix | 4 ++ users/erwin/work.nix | 15 ++++-- 3 files changed, 123 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 0e8b5d6..f1171e6 100644 --- a/flake.lock +++ b/flake.lock @@ -329,6 +329,41 @@ "type": "github" } }, + "flake-utils_3": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1705309234, + "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "ghostty": { + "inputs": { + "nixpkgs-stable": "nixpkgs-stable_2", + "nixpkgs-unstable": "nixpkgs-unstable", + "zig": "zig" + }, + "locked": { + "lastModified": 1733921208, + "narHash": "sha256-ywBbTxe+hf46qQbPviMmZ0yMsZNFnvwuupnK+Yz3JnQ=", + "path": "/home/erwin/ghostty-main", + "type": "path" + }, + "original": { + "path": "/home/erwin/ghostty-main", + "type": "path" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -570,6 +605,22 @@ } }, "nixpkgs-stable_2": { + "locked": { + "lastModified": 1733423277, + "narHash": "sha256-TxabjxEgkNbCGFRHgM/b9yZWlBj60gUOUnRT/wbVQR8=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "e36963a147267afc055f7cf65225958633e536bf", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "release-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_3": { "locked": { "lastModified": 1730741070, "narHash": "sha256-edm8WG19kWozJ/GqyYx2VjW99EdhjKwbY3ZwdlPAAlo=", @@ -585,6 +636,22 @@ "type": "github" } }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1733229606, + "narHash": "sha256-FLYY5M0rpa5C2QAE3CKLYAM6TwbKicdRK6qNrSHlNrE=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "566e53c2ad750c84f6d31f9ccb9d00f823165550", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "pamedia": { "inputs": { "crane": "crane_2", @@ -620,7 +687,7 @@ "nixpkgs": [ "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { "lastModified": 1733665616, @@ -648,6 +715,7 @@ "eww": "eww", "flake-parts": "flake-parts_2", "flake-utils": "flake-utils_2", + "ghostty": "ghostty", "ha-now-playing": "ha-now-playing", "home-manager": "home-manager", "microvm": "microvm", @@ -765,6 +833,21 @@ "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" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -784,6 +867,31 @@ "repo": "treefmt-nix", "type": "github" } + }, + "zig": { + "inputs": { + "flake-compat": [ + "ghostty" + ], + "flake-utils": "flake-utils_3", + "nixpkgs": [ + "ghostty", + "nixpkgs-stable" + ] + }, + "locked": { + "lastModified": 1717848532, + "narHash": "sha256-d+xIUvSTreHl8pAmU1fnmkfDTGQYCn2Rb/zOwByxS2M=", + "owner": "mitchellh", + "repo": "zig-overlay", + "rev": "02fc5cc555fc14fda40c42d7c3250efa43812b43", + "type": "github" + }, + "original": { + "owner": "mitchellh", + "repo": "zig-overlay", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index b3eacd1..6cdc8ee 100644 --- a/flake.nix +++ b/flake.nix @@ -102,6 +102,10 @@ url = "github:vincentbernat/caddy-nix"; }; + ghostty = { + url = "/home/erwin/ghostty-main"; + }; + caddy-with-plugins = { url = "github:eboskma/caddy-with-plugins"; inputs = { diff --git a/users/erwin/work.nix b/users/erwin/work.nix index 26d9c0f..9bb1586 100644 --- a/users/erwin/work.nix +++ b/users/erwin/work.nix @@ -165,8 +165,8 @@ in extraKeybindings = { "Ctrl+Alt+1" = "exec ${pkgs.wayvnc}/bin/wayvncctl output-set DP-1"; "Ctrl+Alt+2" = "exec ${pkgs.wayvnc}/bin/wayvncctl output-set DP-3"; - "Mod4+Ctrl+l" = "--locked output DP-1 enable, output DP-3 enable, output HDMI-A-1 disable"; - "Mod4+Ctrl+r" = "--locked output DP-1 disable, output DP-3 disable, output HDMI-A-1 enable"; + "--locked Mod4+Ctrl+l" = "output DP-1 enable, output DP-3 enable, output HDMI-A-1 disable"; + "--locked Mod4+Ctrl+r" = "output DP-1 disable, output DP-3 disable, output HDMI-A-1 enable"; }; }; swaynotificationcenter.enable = true; @@ -245,6 +245,7 @@ in easyeffects fd ffmpeg-full + inputs.ghostty.packages.${pkgs.system}.ghostty icemon imagemagick (imv.override { @@ -283,6 +284,7 @@ in # winetricks # wineWowPackages.waylandFull wl-clipboard + wlvncc zathura zeal ] @@ -343,9 +345,12 @@ in }; configFile = { - "gtk-4.0/assets".source = "${homeCfg.gtk.theme.package}/share/themes/${homeCfg.gtk.theme.name}/gtk-4.0/assets"; - "gtk-4.0/gtk.css".source = "${homeCfg.gtk.theme.package}/share/themes/${homeCfg.gtk.theme.name}/gtk-4.0/gtk.css"; - "gtk-4.0/gtk-dark.css".source = "${homeCfg.gtk.theme.package}/share/themes/${homeCfg.gtk.theme.name}/gtk-4.0/gtk-dark.css"; + "gtk-4.0/assets".source = + "${homeCfg.gtk.theme.package}/share/themes/${homeCfg.gtk.theme.name}/gtk-4.0/assets"; + "gtk-4.0/gtk.css".source = + "${homeCfg.gtk.theme.package}/share/themes/${homeCfg.gtk.theme.name}/gtk-4.0/gtk.css"; + "gtk-4.0/gtk-dark.css".source = + "${homeCfg.gtk.theme.package}/share/themes/${homeCfg.gtk.theme.name}/gtk-4.0/gtk-dark.css"; }; };