diff --git a/flake.lock b/flake.lock index 6646c08..7bd5e59 100644 --- a/flake.lock +++ b/flake.lock @@ -915,6 +915,22 @@ "type": "github" } }, + "nixpkgs-cutter": { + "locked": { + "lastModified": 1738351607, + "narHash": "sha256-jJ9u1dLnhGeAeQdmziihaka33zEwBOIKmlB6YbFcIjs=", + "owner": "cything", + "repo": "nixpkgs", + "rev": "940b291c7c6ad8e999cb34d8d5de7913f6776c26", + "type": "github" + }, + "original": { + "owner": "cything", + "ref": "cutter-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-garage": { "locked": { "lastModified": 1736921030, @@ -1208,6 +1224,7 @@ "lix-module": "lix-module", "niri": "niri", "nixpkgs": "nixpkgs_5", + "nixpkgs-cutter": "nixpkgs-cutter", "nixpkgs-garage": "nixpkgs-garage", "nixvim": "nixvim", "nvim-github-theme": "nvim-github-theme", diff --git a/flake.nix b/flake.nix index 0f4e96a..9bf1fff 100644 --- a/flake.nix +++ b/flake.nix @@ -70,6 +70,7 @@ }; nixpkgs-garage.url = "github:cything/nixpkgs/garage-module"; # unmerged PR + nixpkgs-cutter.url = "github:cything/nixpkgs/cutter-unstable"; nvim-github-theme = { url = "github:projekt0n/github-nvim-theme"; @@ -136,7 +137,7 @@ settings.global.excludes = [ "secrets/*" - "**/*.png" # tries to format a png file?? + "**/*.png" # tries to format a png file ]; }; }; @@ -149,6 +150,9 @@ overlays = [ inputs.niri.overlays.niri inputs.rust-overlay.overlays.default + (final: prev: { + cutter = inputs.nixpkgs-cutter.legacyPackages.${prev.system}.cutter; + }) ] ++ import ./overlay; }; in @@ -169,7 +173,7 @@ ./modules inputs.lanzaboote.nixosModules.lanzaboote inputs.niri.nixosModules.niri - inputs.lix-module.nixosModules.default # broken + inputs.lix-module.nixosModules.default ]; }; chunk = lib.nixosSystem { diff --git a/home/yt/ytnix.nix b/home/yt/ytnix.nix index c047e8f..0aa8b30 100644 --- a/home/yt/ytnix.nix +++ b/home/yt/ytnix.nix @@ -111,6 +111,8 @@ sequoia sccache awscli2 + lldb + (cutter.withPlugins (plugins: [ plugins.rz-ghidra ])) ]; programs.waybar.enable = true; @@ -148,8 +150,6 @@ ''; }; - services.gnome-keyring.enable = true; - programs.direnv = { enable = true; nix-direnv.enable = true; diff --git a/home/zsh/default.nix b/home/zsh/default.nix index eb920d5..52fd38a 100644 --- a/home/zsh/default.nix +++ b/home/zsh/default.nix @@ -89,8 +89,8 @@ "ga" = "git add"; "gaa" = "git add --all"; "gb" = "git branch"; - "gc" = "git commit --verbose -s"; - "gcmsg" = "git commit -s --message"; + "gc" = "git commit --verbose"; + "gcmsg" = "git commit --message"; "gd" = "git diff"; "gdca" = "git diff --cached"; "gds" = "git diff --staged"; diff --git a/hosts/ytnix/default.nix b/hosts/ytnix/default.nix index 0bb554d..ecc2d7e 100644 --- a/hosts/ytnix/default.nix +++ b/hosts/ytnix/default.nix @@ -282,6 +282,8 @@ xdg.portal = { enable = true; wlr.enable = true; + xdgOpenUsePortal = true; + extraPortals = with pkgs; [ xdg-desktop-portal-gtk xdg-desktop-portal-gnome ]; }; programs.obs-studio = {