diff --git a/system/programs.nix b/system/programs.nix index a4a77b2..10c9ddd 100644 --- a/system/programs.nix +++ b/system/programs.nix @@ -13,6 +13,7 @@ environment.systemPackages = with pkgs; [ steam-run xdg-utils + pass xdg-desktop-portal xdg-desktop-portal-gtk unstable.zoom-us diff --git a/user/default.nix b/user/default.nix index 5433a34..88daf15 100644 --- a/user/default.nix +++ b/user/default.nix @@ -20,6 +20,7 @@ ./packages ./ssh ./services/ssh-office.nix + ./services/gnome-keyring.nix ]; firefox.enable = true; tmux.enable = true; diff --git a/user/packages/default.nix b/user/packages/default.nix index b845eca..14aa23b 100644 --- a/user/packages/default.nix +++ b/user/packages/default.nix @@ -69,6 +69,9 @@ # Py stuff (unstable.python312.withPackages (p: with p; [ requests + mypy + pydantic + typer ])) poetry ruff @@ -76,9 +79,6 @@ # Rust rustup - # homemade - sshotp - ssh-dresden ]; } diff --git a/user/programs/vscode/default.nix b/user/programs/vscode/default.nix index 276d916..3019ffa 100644 --- a/user/programs/vscode/default.nix +++ b/user/programs/vscode/default.nix @@ -3,6 +3,7 @@ enable = true; enableUpdateCheck = true; enableExtensionUpdateCheck = true; + mutableExtensionsDir = true; extensions = with pkgs.vscode-extensions; [ catppuccin.catppuccin-vsc catppuccin.catppuccin-vsc-icons @@ -11,6 +12,8 @@ ms-python.python ms-vscode-remote.remote-ssh bbenoist.nix + github.copilot + github.copilot-chat ]; userSettings = { "window.titleBarStyle" = "custom"; diff --git a/user/services/gnome-keyring.nix b/user/services/gnome-keyring.nix new file mode 100644 index 0000000..2a7084e --- /dev/null +++ b/user/services/gnome-keyring.nix @@ -0,0 +1,6 @@ +{pkgs, config, ...}:{ + services.gnome-keyring = { + enable = true; + components = [pkcs11 secrets ssh]; + }; +} \ No newline at end of file diff --git a/user/services/ssh-office.nix b/user/services/ssh-office.nix index 750af3b..52f10c8 100644 --- a/user/services/ssh-office.nix +++ b/user/services/ssh-office.nix @@ -37,6 +37,7 @@ in Service = { Type = "simple"; ExecStart = "${ssh-dresden}/bin/ssh-dresden"; + Restart = "always"; }; Install = { WantedBy = [ "default.target" ]; diff --git a/user/ssh/zedd.nix b/user/ssh/zedd.nix index 847b0da..031db59 100644 --- a/user/ssh/zedd.nix +++ b/user/ssh/zedd.nix @@ -3,7 +3,7 @@ enable = true; controlMaster = "auto"; - matchBlocks."dresden.uio.no" = { + matchBlocks."d dresden dresden.uio.no" = { setEnv = { TERM = "xterm-256color"; };