From cddaa01e9913b123f65c5dc8429ec8ad987c3276 Mon Sep 17 00:00:00 2001 From: Evan Reichard Date: Sun, 6 Apr 2025 10:54:47 -0400 Subject: [PATCH] y --- flake.lock | 36 +++++++++---------- .../evanreichard@mbp-nixos/default.nix | 1 + .../programs/graphical/ghidra/default.nix | 14 ++++++++ .../graphical/ghostty/config/ghostty.conf | 2 ++ modules/nixos/services/rke2/default.nix | 2 +- 5 files changed, 36 insertions(+), 19 deletions(-) create mode 100755 modules/home/programs/graphical/ghidra/default.nix diff --git a/flake.lock b/flake.lock index f4cf1cb..7c4770d 100755 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1741786315, - "narHash": "sha256-VT65AE2syHVj6v/DGB496bqBnu1PXrrzwlw07/Zpllc=", + "lastModified": 1743598667, + "narHash": "sha256-ViE7NoFWytYO2uJONTAX35eGsvTYXNHjWALeHAg8OQY=", "owner": "nix-community", "repo": "disko", - "rev": "0d8c6ad4a43906d14abd5c60e0ffe7b587b213de", + "rev": "329d3d7e8bc63dd30c39e14e6076db590a6eabe6", "type": "github" }, "original": { @@ -50,11 +50,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1743119709, - "narHash": "sha256-tlJY7MfAena/yi3lmd7y7vQGpLma4Q1BLtO4dvzF/Vs=", + "lastModified": 1743861198, + "narHash": "sha256-PzbPHoSI5U1juWd01Spf3ST7ylR9mQ84v5p7NksBplY=", "owner": "rycee", "repo": "nur-expressions", - "rev": "f8861a4b09a181dd88f6626d0202d9225ae85d65", + "rev": "7408ed5bbc9009741094f4dd4cc1abec79e79e7e", "type": "gitlab" }, "original": { @@ -154,11 +154,11 @@ ] }, "locked": { - "lastModified": 1742655702, - "narHash": "sha256-jbqlw4sPArFtNtA1s3kLg7/A4fzP4GLk9bGbtUJg0JQ=", + "lastModified": 1743808813, + "narHash": "sha256-2lDQBOmlz9ggPxcS7/GvcVdzXMIiT+PpMao6FbLJSr0=", "owner": "nix-community", "repo": "home-manager", - "rev": "0948aeedc296f964140d9429223c7e4a0702a1ff", + "rev": "a9f8b3db211b4609ddd83683f9db89796c7f6ac6", "type": "github" }, "original": { @@ -206,11 +206,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1741402956, - "narHash": "sha256-y2hByvBM03s9T2fpeLjW6iprbxnhV9mJMmSwCHc41ZQ=", + "lastModified": 1743259260, + "narHash": "sha256-ArWLUgRm1tKHiqlhnymyVqi5kLNCK5ghvm06mfCl4QY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ed0b1881565c1ffef490c10d663d4f542031dad3", + "rev": "eb0e0f21f15c559d2ac7633dc81d079d1caf5f5f", "type": "github" }, "original": { @@ -222,11 +222,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1742937945, - "narHash": "sha256-lWc+79eZRyvHp/SqMhHTMzZVhpxkRvthsP1Qx6UCq0E=", + "lastModified": 1743813633, + "narHash": "sha256-BgkBz4NpV6Kg8XF7cmHDHRVGZYnKbvG0Y4p+jElwxaM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d02d88f8de5b882ccdde0465d8fa2db3aa1169f7", + "rev": "7819a0d29d1dd2bc331bec4b327f0776359b1fa6", "type": "github" }, "original": { @@ -293,11 +293,11 @@ ] }, "locked": { - "lastModified": 1743305778, - "narHash": "sha256-Ux/UohNtnM5mn9SFjaHp6IZe2aAnUCzklMluNtV6zFo=", + "lastModified": 1743910657, + "narHash": "sha256-zr2jmWeWyhCD8WmO2aWov2g0WPPuZfcJDKzMJZYGq3Y=", "owner": "Mic92", "repo": "sops-nix", - "rev": "8e873886bbfc32163fe027b8676c75637b7da114", + "rev": "523f58a4faff6c67f5f685bed33a7721e984c304", "type": "github" }, "original": { diff --git a/homes/aarch64-linux/evanreichard@mbp-nixos/default.nix b/homes/aarch64-linux/evanreichard@mbp-nixos/default.nix index 47236fd..243f1ed 100755 --- a/homes/aarch64-linux/evanreichard@mbp-nixos/default.nix +++ b/homes/aarch64-linux/evanreichard@mbp-nixos/default.nix @@ -22,6 +22,7 @@ in graphical = { wms.hyprland = enabled; ghostty = enabled; + ghidra = enabled; browsers.firefox = { enable = true; gpuAcceleration = true; diff --git a/modules/home/programs/graphical/ghidra/default.nix b/modules/home/programs/graphical/ghidra/default.nix new file mode 100755 index 0000000..18662e6 --- /dev/null +++ b/modules/home/programs/graphical/ghidra/default.nix @@ -0,0 +1,14 @@ +{ pkgs, lib, config, namespace, ... }: +let + inherit (lib) mkIf mkEnableOption; + cfg = config.${namespace}.programs.graphical.ghidra; +in +{ + options.${namespace}.programs.graphical.ghidra = { + enable = mkEnableOption "Enable Ghidra"; + }; + + config = mkIf cfg.enable { + home.packages = with pkgs; [ ghidra ]; + }; +} diff --git a/modules/home/programs/graphical/ghostty/config/ghostty.conf b/modules/home/programs/graphical/ghostty/config/ghostty.conf index f8bd1cc..14a8792 100755 --- a/modules/home/programs/graphical/ghostty/config/ghostty.conf +++ b/modules/home/programs/graphical/ghostty/config/ghostty.conf @@ -16,6 +16,8 @@ keybind = ctrl+left=goto_split:left keybind = ctrl+right=goto_split:right keybind = ctrl+up=goto_split:up keybind = ctrl+down=goto_split:down +keybind = ctrl+]=next_tab +keybind = ctrl+[=previous_tab # Keybindings - Navigation - Tabs keybind = ctrl+1=goto_tab:1 diff --git a/modules/nixos/services/rke2/default.nix b/modules/nixos/services/rke2/default.nix index d65e2ae..927fb61 100644 --- a/modules/nixos/services/rke2/default.nix +++ b/modules/nixos/services/rke2/default.nix @@ -7,7 +7,7 @@ let in { options.${namespace}.services.rke2 = with types; { - enable = lib.mkEnableOption "Enabel RKE2"; + enable = lib.mkEnableOption "Enable RKE2"; disable = mkOpt (listOf str) [ ] "Disable services"; };