diff --git a/flake.lock b/flake.lock index 0686edb68804423447f079adae1443ab4276af62..14324cc391332ddd9ca1358e22b720adbdd2e550 100644 --- a/flake.lock +++ b/flake.lock @@ -186,22 +186,6 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_10": { - "locked": { - "lastModified": 1769527094, - "narHash": "sha256-xV20Alb7ZGN7qujnsi5lG1NckSUmpIb05H2Xar73TDc=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "afce96367b2e37fc29afb5543573cd49db3357b7", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { "locked": { "lastModified": 1755615617, @@ -380,8 +364,7 @@ "nixpkgs-unstable": "nixpkgs-unstable", "nur": "nur", "pokego": "pokego", "spectre": "spectre", - "tclip": "tclip", - "zed": "zed" + "tclip": "tclip" } }, "spectre": { @@ -467,24 +450,6 @@ "original": { "owner": "numtide", "repo": "flake-utils", "type": "github" - } - }, - "zed": { - "inputs": { - "nixpkgs": "nixpkgs_10" - }, - "locked": { - "lastModified": 1769869472, - "narHash": "sha256-kLCEiAHvRrFfeTTHA7VNc+EmYDFDIyxSg4M6gr5b89M=", - "ref": "refs/heads/main", - "rev": "89a68629e88a19f08826e5c17bf96af6415ef7a3", - "revCount": 4, - "type": "git", - "url": "https://git.jolheiser.com/zed.drv.git" - }, - "original": { - "type": "git", - "url": "https://git.jolheiser.com/zed.drv.git" } } }, diff --git a/flake.nix b/flake.nix index 52ca3393e85e9956a7ec697ce299091750f39218..a73f1093937c2fe88184597a17b31b52187d2d4d 100644 --- a/flake.nix +++ b/flake.nix @@ -20,7 +20,6 @@ nixos-hardware.url = "github:nixos/nixos-hardware/master"; catppuccin.url = "github:catppuccin/nix"; nur.url = "github:nix-community/NUR"; helix.url = "git+https://git.jolheiser.com/helix.drv.git"; - zed.url = "git+https://git.jolheiser.com/zed.drv.git"; gomodinit.url = "git+https://git.jolheiser.com/gomodinit.git"; cfg.url = "git+https://git.jolheiser.com/cfg.git"; spectre.url = "git+https://git.jolheiser.com/go-spectre.git"; @@ -47,7 +46,6 @@ pkgs = prev; }; jolheiser = { helix = inputs.helix.packages.${prev.system}.default; - zed = inputs.zed.packages.${prev.system}.default; gomodinit = inputs.gomodinit.packages.${prev.system}.default; cfg = inputs.cfg.packages.${prev.system}.default; spectre = inputs.spectre.packages.${prev.system}.default; @@ -71,14 +69,15 @@ inherit pkgs; extraSpecialArgs = { inherit jolheiser inputs; }; - modules = [ - agenix.homeManagerModules.age - catppuccin.homeModules.catppuccin - ./home - ] - ++ (if gui then [ ./home/gui ] else [ ./home/nogui ]) - ++ (pkgs.lib.optional de ./home/de) - ++ extraModules; + modules = + [ + agenix.homeManagerModules.age + catppuccin.homeModules.catppuccin + ./home + ] + ++ (if gui then [ ./home/gui ] else [ ./home/nogui ]) + ++ (pkgs.lib.optional de ./home/de) + ++ extraModules; }; in { diff --git a/home/gui/default.nix b/home/gui/default.nix index baf9d868f44e667d1455065ed979ed89fddd7607..3a80abc05fd1c755374db49e74b182c95a48423d 100644 --- a/home/gui/default.nix +++ b/home/gui/default.nix @@ -15,8 +15,6 @@ home = { packages = with pkgs; [ obsidian gimp3 - - jolheiser.zed ]; }; } diff --git a/home/gui/niri.kdl b/home/gui/niri.kdl index 1699e66ee568b6083eb5ecc715d8184e260a60cf..99e455add52d2fb2f4e7ddaf42446a512dd1d56b 100644 --- a/home/gui/niri.kdl +++ b/home/gui/niri.kdl @@ -81,7 +81,6 @@ binds { Mod+Shift+Slash { show-hotkey-overlay; } Mod+T hotkey-overlay-title="Open a Terminal: ghostty" { spawn "ghostty"; } - Mod+I hotkey-overlay-title="Open an IDE: zed" { spawn "zeditor"; } Mod+D hotkey-overlay-title="Run an Application: sherlock" { spawn "sherlock"; } Mod+B hotkey-overlay-title="Open a Browser: firefox" { spawn "firefox"; } Super+L hotkey-overlay-title="Lock the Screen: swaylock" { spawn "swaylock"; }