ssh and vscode

This commit is contained in:
2024-11-07 17:24:17 +01:00
parent 9a63e0423e
commit a551e28e24
10 changed files with 179 additions and 12 deletions

137
flake.lock generated
View File

@@ -175,7 +175,6 @@
} }
}, },
"flake-compat_3": { "flake-compat_3": {
"flake": false,
"locked": { "locked": {
"lastModified": 1696426674, "lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
@@ -191,6 +190,22 @@
} }
}, },
"flake-compat_4": { "flake-compat_4": {
"flake": false,
"locked": {
"lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_5": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1673956053, "lastModified": 1673956053,
@@ -260,6 +275,24 @@
} }
}, },
"flake-utils_2": { "flake-utils_2": {
"inputs": {
"systems": "systems_6"
},
"locked": {
"lastModified": 1726560853,
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_3": {
"inputs": { "inputs": {
"systems": [ "systems": [
"stylix", "stylix",
@@ -825,7 +858,44 @@
"type": "github" "type": "github"
} }
}, },
"nix-alien": {
"inputs": {
"flake-compat": "flake-compat_3",
"flake-utils": "flake-utils_2",
"nix-filter": "nix-filter",
"nix-index-database": "nix-index-database",
"nixpkgs": "nixpkgs_6"
},
"locked": {
"lastModified": 1728984726,
"narHash": "sha256-v5GnrRqFRAmtfDbWxYKkaQsinz7EyAmFlUVDwH9MPTo=",
"owner": "thiagokokada",
"repo": "nix-alien",
"rev": "3d6cd128d04a4df25584a3b23b9298a07661dbf6",
"type": "github"
},
"original": {
"owner": "thiagokokada",
"repo": "nix-alien",
"type": "github"
}
},
"nix-filter": { "nix-filter": {
"locked": {
"lastModified": 1710156097,
"narHash": "sha256-1Wvk8UP7PXdf8bCCaEoMnOT1qe5/Duqgj+rL8sRQsSM=",
"owner": "numtide",
"repo": "nix-filter",
"rev": "3342559a24e85fc164b295c3444e8a139924675b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "nix-filter",
"type": "github"
}
},
"nix-filter_2": {
"locked": { "locked": {
"lastModified": 1693833173, "lastModified": 1693833173,
"narHash": "sha256-hlMABKrGbEiJD5dwUSfnw1CQ3bG7KKwDV+Nx3bEZd7U=", "narHash": "sha256-hlMABKrGbEiJD5dwUSfnw1CQ3bG7KKwDV+Nx3bEZd7U=",
@@ -863,6 +933,27 @@
"type": "github" "type": "github"
} }
}, },
"nix-index-database": {
"inputs": {
"nixpkgs": [
"nix-alien",
"nixpkgs"
]
},
"locked": {
"lastModified": 1728790083,
"narHash": "sha256-grMdAd4KSU6uPqsfLzA1B/3pb9GtGI9o8qb0qFzEU/Y=",
"owner": "nix-community",
"repo": "nix-index-database",
"rev": "5c54c33aa04df5dd4b0984b7eb861d1981009b22",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nix-index-database",
"type": "github"
}
},
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1730200266, "lastModified": 1730200266,
@@ -960,6 +1051,22 @@
} }
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": {
"lastModified": 1728492678,
"narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1730531603, "lastModified": 1730531603,
"narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=",
@@ -1023,7 +1130,8 @@
"hyprsunset": "hyprsunset", "hyprsunset": "hyprsunset",
"hyprsysteminfo": "hyprsysteminfo", "hyprsysteminfo": "hyprsysteminfo",
"lanzaboote": "lanzaboote", "lanzaboote": "lanzaboote",
"nixpkgs": "nixpkgs_6", "nix-alien": "nix-alien",
"nixpkgs": "nixpkgs_7",
"nur": "nur", "nur": "nur",
"spicetify-nix": "spicetify-nix", "spicetify-nix": "spicetify-nix",
"split-monitor-workspaces": "split-monitor-workspaces", "split-monitor-workspaces": "split-monitor-workspaces",
@@ -1057,7 +1165,7 @@
}, },
"spicetify-nix": { "spicetify-nix": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_3", "flake-compat": "flake-compat_4",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
@@ -1081,7 +1189,7 @@
"hyprland": [ "hyprland": [
"hyprland" "hyprland"
], ],
"nix-filter": "nix-filter" "nix-filter": "nix-filter_2"
}, },
"locked": { "locked": {
"lastModified": 1729443896, "lastModified": 1729443896,
@@ -1103,14 +1211,14 @@
"base16-fish": "base16-fish", "base16-fish": "base16-fish",
"base16-helix": "base16-helix", "base16-helix": "base16-helix",
"base16-vim": "base16-vim", "base16-vim": "base16-vim",
"flake-compat": "flake-compat_4", "flake-compat": "flake-compat_5",
"flake-utils": "flake-utils_2", "flake-utils": "flake-utils_3",
"gnome-shell": "gnome-shell", "gnome-shell": "gnome-shell",
"home-manager": "home-manager_3", "home-manager": "home-manager_3",
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"systems": "systems_6", "systems": "systems_7",
"tinted-foot": "tinted-foot", "tinted-foot": "tinted-foot",
"tinted-kitty": "tinted-kitty", "tinted-kitty": "tinted-kitty",
"tinted-tmux": "tinted-tmux" "tinted-tmux": "tinted-tmux"
@@ -1219,6 +1327,21 @@
"type": "github" "type": "github"
} }
}, },
"systems_7": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"tinted-foot": { "tinted-foot": {
"flake": false, "flake": false,
"locked": { "locked": {

View File

@@ -5,6 +5,7 @@
nixpkgs.url = "nixpkgs/nixos-unstable"; nixpkgs.url = "nixpkgs/nixos-unstable";
chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable";
nur.url = "github:nix-community/NUR"; nur.url = "github:nix-community/NUR";
nix-alien.url = "github:thiagokokada/nix-alien";
hyprsunset.url = "github:hyprwm/hyprsunset"; hyprsunset.url = "github:hyprwm/hyprsunset";
hyprsysteminfo.url = "github:/hyprwm/hyprsysteminfo"; hyprsysteminfo.url = "github:/hyprwm/hyprsysteminfo";

7
home/configs/keys.nix Normal file
View File

@@ -0,0 +1,7 @@
{ lib }: {
options.local.keys = lib.mkOption { };
config.local.keys = {
senpai = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINBehbdWBTyhs8Tqnc7w172XhWcPAcAM6BC9Gny3i8An";
};
}

View File

@@ -19,6 +19,8 @@
# ./programs/yazi.nix # ./programs/yazi.nix
# ./programs/zathura.nix # ./programs/zathura.nix
# ./configs/keys.nix
./system/dunst.nix ./system/dunst.nix
./system/hyprland.nix ./system/hyprland.nix
./system/rofi.nix ./system/rofi.nix

View File

@@ -1,4 +1,4 @@
{ { pkgs, config, ... }: {
programs.git = { programs.git = {
enable = true; enable = true;
@@ -15,6 +15,17 @@
branch.sort = "-committerdate"; branch.sort = "-committerdate";
pull.rebase = "false"; pull.rebase = "false";
rerere.enabled = true; rerere.enabled = true;
# gpg = {
# format = "ssh";
# ssh.defaultKeyCommand = pkgs.writeShellScript "git_key" ''
# if ssh-add -L | grep -vq '${config.local.keys.senpai}'; then
# ssh-add -t 1m ~/.ssh/id_ed25519
# fi
# echo 'key::${config.local.keys.senpai}'
# '';
# };
push.gpgsign = "if-asked";
}; };
}; };
} }

View File

@@ -2,6 +2,16 @@
services.gpg-agent = { services.gpg-agent = {
enable = true; enable = true;
defaultCacheTtl = 1800; defaultCacheTtl = 1800;
enableSshSupport = true; # enableSshSupport = true;
}; };
# programs.ssh = {
# startAgent = true;
# # agentTimeout = "1h";
# extraConfig = ''
# AddKeysToAgent yes
# IdentityFile ~/.ssh/senpai_ed25519;
# '';
# };
} }

View File

@@ -77,5 +77,6 @@
vim vim
nixfmt-rfc-style nixfmt-rfc-style
nemo nemo
nix-direnv
]; ];
} }

View File

@@ -1,15 +1,24 @@
{ pkgs, ... }: { { pkgs, ... }: {
programs.vscode = { programs.vscode = {
enable = true; enable = true;
package = pkgs.vscodium-fhs; package = pkgs.vscodium.fhsWithPackages (ps: with ps; [
rustup
zlib
openssl.dev
pkg-config
nixfmt-rfc-style
python3
]);
extensions = with pkgs.vscode-extensions; [ extensions = with pkgs.vscode-extensions; [
ms-python.python ms-python.python
ms-python.debugpy ms-python.debugpy
jnoortheen.nix-ide jnoortheen.nix-ide
mkhl.direnv
arrterian.nix-env-selector
mvllow.rose-pine mvllow.rose-pine
github.copilot github.copilot
github.copilot-chat # github.copilot-chat
ms-vsliveshare.vsliveshare ms-vsliveshare.vsliveshare
rust-lang.rust-analyzer rust-lang.rust-analyzer
]; ];

View File

@@ -9,6 +9,8 @@
brightnessctl brightnessctl
]; ];
programs.nix-ld.enable = true;
services.zerotierone = { services.zerotierone = {
enable = true; enable = true;
}; };
@@ -42,7 +44,7 @@
programs.mtr.enable = true; programs.mtr.enable = true;
programs.gnupg.agent = { programs.gnupg.agent = {
enable = true; enable = true;
enableSSHSupport = true; enableSSHSupport = false;
settings = { settings = {
max-cache-ttl = 60480000; max-cache-ttl = 60480000;
default-cache-ttl = 60480000; default-cache-ttl = 60480000;

View File

@@ -11,4 +11,5 @@
UseDns = true; UseDns = true;
}; };
}; };
} }