Skip to content

Commit 6b8660b

Browse files
committed
chore: zed input
1 parent cfbeb5f commit 6b8660b

File tree

7 files changed

+109
-13
lines changed

7 files changed

+109
-13
lines changed

flake.lock

Lines changed: 91 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,7 @@
123123
};
124124

125125
# #################### Zed ####################
126-
# zed-editor = {
127-
# url = "github:zed-industries/zed?ref=v0.169.1-pre";
128-
# inputs.nixpkgs.follows = "nixpkgs";
129-
# };
126+
zed-editor.url = "github:zed-industries/zed/nightly";
130127
};
131128

132129
outputs =

home/denrei/common/core/zed/default.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
lib,
44
config,
55
configVars,
6+
inputs,
67
...
78
}:
89
{
@@ -23,6 +24,7 @@
2324

2425
programs.zed-editor = {
2526
enable = true;
27+
package = inputs.zed-editor.packages.${pkgs.system}.default;
2628
extensions = [
2729
"nix"
2830
"lua"

home/denrei/common/core/zed/settings.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"version": "2",
66
"default_model": {
77
"provider": "copilot_chat",
8-
"model": "claude-3-7-sonnet"
8+
"model": "gpt-4o"
99
},
1010
"inline_alternatives": [
1111
{
@@ -103,8 +103,8 @@
103103
"formatter": [
104104
{
105105
"code_actions": {
106-
"source.organizeImports.ruff": true,
107-
"source.fixAll.ruff": true
106+
"source.organizeImports.ruff": false,
107+
"source.fixAll.ruff": false
108108
}
109109
},
110110
{

hosts/altair/default.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@
6969
programs.ssh.startAgent = true;
7070
# services.gnome.gnome-keyring.enable = true;
7171
# TODO enable and move to greetd area? may need authentication dir or something?
72-
security.pam.services.greetd.enableGnomeKeyring = true;
73-
# security.pam.services.gdm-password.enableGnomeKeyring = true;
72+
# security.pam.services.greetd.enableGnomeKeyring = true;
73+
security.pam.services.gdm-password.enableGnomeKeyring = true;
7474

7575
networking = {
7676
hostName = "altair";

hosts/canopus/default.nix

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
inputs,
99
configLib,
1010
...
11-
}: {
11+
}:
12+
{
1213
imports =
1314
[
1415
#################### Every Host Needs This ####################
@@ -63,7 +64,8 @@
6364

6465
programs.ssh.startAgent = true;
6566
# TODO enable and move to greetd area? may need authentication dir or something?
66-
security.pam.services.greetd.enableGnomeKeyring = true;
67+
# security.pam.services.greetd.enableGnomeKeyring = true;
68+
security.pam.services.gdm-password.enableGnomeKeyring = true;
6769

6870
networking = {
6971
hostName = "canopus";
@@ -82,7 +84,10 @@
8284
allowedUDPPortRanges = allowedTCPPortRanges;
8385
};
8486

85-
networking.firewall.allowedTCPPorts = [80 443];
87+
networking.firewall.allowedTCPPorts = [
88+
80
89+
443
90+
];
8691

8792
hardware.bluetooth = {
8893
enable = true;

hosts/common/core/nix.nix

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
"https://nix-community.cachix.org"
3232
"https://yazi.cachix.org"
3333
"https://devenv.cachix.org"
34+
"https://zed-industries.cachix.org"
3435
# "https://cosmic.cachix.org"
3536
# "https://ghostty.cachix.org"
3637
];
@@ -41,6 +42,7 @@
4142
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
4243
"yazi.cachix.org-1:Dcdz63NZKfvUCbDGngQDAZq6kOroIrFoyO064uvLh8k="
4344
"devenv.cachix.org-1:w1cLUi8dv3hnoSPGAuibQv+f9TZLr6cv/Hm9XgU50cw="
45+
"zed-industries.cachix.org-1:QW3RoXK0Lm4ycmU5/3bmYRd3MLf4RbTGPqRulGlX5W0="
4446
# "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE="
4547
# "ghostty.cachix.org-1:QB389yTa6gTyneehvqG58y0WnHjQOqgnA+wBnpWWxns="
4648
];

0 commit comments

Comments
 (0)