From a551e28e241ffc2afec39ce977a6ccde158d67cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Czy=C5=BC?= Date: Thu, 7 Nov 2024 17:24:17 +0100 Subject: [PATCH] ssh and vscode --- flake.lock | 137 +++++++++++++++++++++++++++++++++++-- flake.nix | 1 + home/configs/keys.nix | 7 ++ home/home.nix | 2 + home/programs/git.nix | 13 +++- home/programs/gpg.nix | 12 +++- home/programs/packages.nix | 1 + home/programs/vscodium.nix | 13 +++- hosts/modules/packages.nix | 4 +- hosts/modules/ssh.nix | 1 + 10 files changed, 179 insertions(+), 12 deletions(-) create mode 100644 home/configs/keys.nix diff --git a/flake.lock b/flake.lock index 01804f0..29d192c 100644 --- a/flake.lock +++ b/flake.lock @@ -175,7 +175,6 @@ } }, "flake-compat_3": { - "flake": false, "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", @@ -191,6 +190,22 @@ } }, "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, "locked": { "lastModified": 1673956053, @@ -260,6 +275,24 @@ } }, "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": { "systems": [ "stylix", @@ -825,7 +858,44 @@ "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": { + "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": { "lastModified": 1693833173, "narHash": "sha256-hlMABKrGbEiJD5dwUSfnw1CQ3bG7KKwDV+Nx3bEZd7U=", @@ -863,6 +933,27 @@ "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": { "locked": { "lastModified": 1730200266, @@ -960,6 +1051,22 @@ } }, "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": { "lastModified": 1730531603, "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", @@ -1023,7 +1130,8 @@ "hyprsunset": "hyprsunset", "hyprsysteminfo": "hyprsysteminfo", "lanzaboote": "lanzaboote", - "nixpkgs": "nixpkgs_6", + "nix-alien": "nix-alien", + "nixpkgs": "nixpkgs_7", "nur": "nur", "spicetify-nix": "spicetify-nix", "split-monitor-workspaces": "split-monitor-workspaces", @@ -1057,7 +1165,7 @@ }, "spicetify-nix": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_4", "nixpkgs": [ "nixpkgs" ] @@ -1081,7 +1189,7 @@ "hyprland": [ "hyprland" ], - "nix-filter": "nix-filter" + "nix-filter": "nix-filter_2" }, "locked": { "lastModified": 1729443896, @@ -1103,14 +1211,14 @@ "base16-fish": "base16-fish", "base16-helix": "base16-helix", "base16-vim": "base16-vim", - "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_2", + "flake-compat": "flake-compat_5", + "flake-utils": "flake-utils_3", "gnome-shell": "gnome-shell", "home-manager": "home-manager_3", "nixpkgs": [ "nixpkgs" ], - "systems": "systems_6", + "systems": "systems_7", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-tmux": "tinted-tmux" @@ -1219,6 +1327,21 @@ "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": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 30cfd88..124c506 100644 --- a/flake.nix +++ b/flake.nix @@ -5,6 +5,7 @@ nixpkgs.url = "nixpkgs/nixos-unstable"; chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; nur.url = "github:nix-community/NUR"; + nix-alien.url = "github:thiagokokada/nix-alien"; hyprsunset.url = "github:hyprwm/hyprsunset"; hyprsysteminfo.url = "github:/hyprwm/hyprsysteminfo"; diff --git a/home/configs/keys.nix b/home/configs/keys.nix new file mode 100644 index 0000000..4e646c5 --- /dev/null +++ b/home/configs/keys.nix @@ -0,0 +1,7 @@ +{ lib }: { + options.local.keys = lib.mkOption { }; + + config.local.keys = { + senpai = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINBehbdWBTyhs8Tqnc7w172XhWcPAcAM6BC9Gny3i8An"; + }; +} diff --git a/home/home.nix b/home/home.nix index 434ce62..364710c 100644 --- a/home/home.nix +++ b/home/home.nix @@ -19,6 +19,8 @@ # ./programs/yazi.nix # ./programs/zathura.nix + # ./configs/keys.nix + ./system/dunst.nix ./system/hyprland.nix ./system/rofi.nix diff --git a/home/programs/git.nix b/home/programs/git.nix index 310c9e2..ae4ba5d 100644 --- a/home/programs/git.nix +++ b/home/programs/git.nix @@ -1,4 +1,4 @@ -{ +{ pkgs, config, ... }: { programs.git = { enable = true; @@ -15,6 +15,17 @@ branch.sort = "-committerdate"; pull.rebase = "false"; 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"; }; }; + } diff --git a/home/programs/gpg.nix b/home/programs/gpg.nix index 6f20cc5..5e951f3 100644 --- a/home/programs/gpg.nix +++ b/home/programs/gpg.nix @@ -2,6 +2,16 @@ services.gpg-agent = { enable = true; defaultCacheTtl = 1800; - enableSshSupport = true; + # enableSshSupport = true; }; + + # programs.ssh = { + # startAgent = true; + # # agentTimeout = "1h"; + # extraConfig = '' + # AddKeysToAgent yes + # IdentityFile ~/.ssh/senpai_ed25519; + # ''; + # }; } + diff --git a/home/programs/packages.nix b/home/programs/packages.nix index abc08f7..32c61b7 100644 --- a/home/programs/packages.nix +++ b/home/programs/packages.nix @@ -77,5 +77,6 @@ vim nixfmt-rfc-style nemo + nix-direnv ]; } diff --git a/home/programs/vscodium.nix b/home/programs/vscodium.nix index efed0aa..ec198b7 100644 --- a/home/programs/vscodium.nix +++ b/home/programs/vscodium.nix @@ -1,15 +1,24 @@ { pkgs, ... }: { programs.vscode = { 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; [ ms-python.python ms-python.debugpy jnoortheen.nix-ide + mkhl.direnv + arrterian.nix-env-selector mvllow.rose-pine github.copilot - github.copilot-chat + # github.copilot-chat ms-vsliveshare.vsliveshare rust-lang.rust-analyzer ]; diff --git a/hosts/modules/packages.nix b/hosts/modules/packages.nix index 3536e91..db6299b 100644 --- a/hosts/modules/packages.nix +++ b/hosts/modules/packages.nix @@ -9,6 +9,8 @@ brightnessctl ]; + programs.nix-ld.enable = true; + services.zerotierone = { enable = true; }; @@ -42,7 +44,7 @@ programs.mtr.enable = true; programs.gnupg.agent = { enable = true; - enableSSHSupport = true; + enableSSHSupport = false; settings = { max-cache-ttl = 60480000; default-cache-ttl = 60480000; diff --git a/hosts/modules/ssh.nix b/hosts/modules/ssh.nix index 0763123..0d38e09 100644 --- a/hosts/modules/ssh.nix +++ b/hosts/modules/ssh.nix @@ -11,4 +11,5 @@ UseDns = true; }; }; + }