Compare commits

..

6 commits

5 changed files with 106 additions and 24 deletions

View file

@ -1,8 +1,30 @@
{
"nodes": {
"deploy-rs": {
"atuin": {
"inputs": {
"flake-compat": "flake-compat",
"flake-utils": "flake-utils",
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1709726153,
"narHash": "sha256-JTsuzFGHpyg/g8zqBx0tGeG4H4pdBe5j96EKzPEekWY=",
"owner": "atuinsh",
"repo": "atuin",
"rev": "da24f734e532a5725b759ceee5b331255cb5f424",
"type": "github"
},
"original": {
"owner": "atuinsh",
"repo": "atuin",
"type": "github"
}
},
"deploy-rs": {
"inputs": {
"flake-compat": "flake-compat_2",
"nixpkgs": [
"nixpkgs"
],
@ -38,6 +60,22 @@
"type": "github"
}
},
"flake-compat_2": {
"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-parts": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib"
@ -56,6 +94,24 @@
"type": "github"
}
},
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1709126324,
"narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "d465f4819400de7c8d874d50b982301f28a84605",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"home-manager": {
"inputs": {
"nixpkgs": [
@ -86,11 +142,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1703607026,
"narHash": "sha256-Emh0BPoqlS4ntp2UJrwydXfIP4qIMF0VBB2FUE3/M/E=",
"lastModified": 1709560848,
"narHash": "sha256-rRapK+t6KC9vkAsvVU9QiXi94yBFMz0V0qdK8mUYNKw=",
"owner": "Mic92",
"repo": "nix-fast-build",
"rev": "4376b8a33b217ee2f78ba3dcff01a3e464d13a46",
"rev": "ef8f59a0fdec1801ddc86a8c834f5802d1947b7f",
"type": "github"
},
"original": {
@ -101,11 +157,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1709128929,
"narHash": "sha256-GWrv9a+AgGhG4/eI/CyVVIIygia7cEy68Huv3P8oyaw=",
"lastModified": 1709569716,
"narHash": "sha256-iOR44RU4jQ+YPGrn+uQeYAp7Xo7Z/+gT+wXJoGxxLTY=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "c8e74c2f83fe12b4e5a8bd1abbc090575b0f7611",
"rev": "617579a787259b9a6419492eaac670a5f7663917",
"type": "github"
},
"original": {
@ -135,11 +191,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1708819810,
"narHash": "sha256-1KosU+ZFXf31GPeCBNxobZWMgHsSOJcrSFA6F2jhzdE=",
"lastModified": 1709428628,
"narHash": "sha256-//ZCCnpVai/ShtO2vPjh3AWgo8riXCaret6V9s7Hew4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "89a2a12e6c8c6a56c72eb3589982c8e2f89c70ea",
"rev": "66d65cb00b82ffa04ee03347595aa20e41fe3555",
"type": "github"
},
"original": {
@ -151,6 +207,7 @@
},
"root": {
"inputs": {
"atuin": "atuin",
"deploy-rs": "deploy-rs",
"home-manager": "home-manager",
"nix-fast-build": "nix-fast-build",
@ -166,11 +223,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1708987867,
"narHash": "sha256-k2lDaDWNTU5sBVHanYzjDKVDmk29RHIgdbbXu5sdzBA=",
"lastModified": 1709711091,
"narHash": "sha256-L0rSIU9IguTG4YqSj4B/02SyTEz55ACq5t8gXpzteYc=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "a1c8de14f60924fafe13aea66b46157f0150f4cf",
"rev": "25dd60fdd08fcacee2567a26ba6b91fe098941dc",
"type": "github"
},
"original": {
@ -194,6 +251,21 @@
"type": "github"
}
},
"systems_2": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"treefmt-nix": {
"inputs": {
"nixpkgs": [
@ -217,7 +289,7 @@
},
"utils": {
"inputs": {
"systems": "systems"
"systems": "systems_2"
},
"locked": {
"lastModified": 1701680307,

View file

@ -35,6 +35,12 @@
url = "github:serokell/deploy-rs";
inputs.nixpkgs.follows = "nixpkgs";
};
# atuin
atuin = {
url = "github:atuinsh/atuin";
inputs.nixpkgs.follows = "nixpkgs";
};
};
# The `@` syntax here is used to alias the attribute set of the
@ -68,6 +74,7 @@
# Note: configuration.nix itself is also a Nixpkgs Module,
./nixos/durincore/configuration.nix
./nixos/common.nix
# { nixpkgs.overlays = [ (self: super: { atuin = atuin.packages.${self.pkgs.system}.atuin; }) ]; }
home-manager.nixosModules.home-manager
{
home-manager.useGlobalPkgs = true;

View file

@ -1,4 +1,4 @@
{ config, pkgs, talhelper, ... }:
{ config, pkgs, ... }:
{
# TODO please change the username & home direcotry to your own
@ -16,6 +16,12 @@
enable = true;
userName = "Joseph Hanson";
userEmail = "joe@veri.dev";
extraConfig = {
user = { signingkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIDSAmssproxG+KsVn2DfuteBAemHrmmAFzCtldpKl4J"; };
gpg = { format = "ssh"; };
"gpg \"ssh\"" = { program = "/etc/profiles/per-user/jahanson/bin/op-ssh-sign"; };
commit = { gpgsign = true; };
};
};
# exa replacement, ls replacement.
@ -38,6 +44,7 @@
# rtx activate fish | source
shellInit = ''
direnv hook fish | source
atuin init fish | source
set -gx PATH $PATH $HOME/.krew/bin
'';
functions = {
@ -79,6 +86,8 @@
shellcheck
envsubst
kustomize
_1password-gui
_1password
# networking tools
iperf3

View file

@ -9,13 +9,6 @@
homeDirectory = "/home/jahanson";
};
imports = [
"${fetchTarball "https://github.com/msteen/nixos-vscode-server/tarball/master"}/modules/vscode-server/home.nix"
];
services.vscode-server.enable = true;
# basic configuration of git, please change to your own
programs.git = {
enable = true;
@ -23,7 +16,6 @@
userEmail = "joe@veri.dev";
};
# exa replacement, ls replacement.
programs.lsd.enable = true;

View file

@ -86,6 +86,8 @@
ansible
smartmontools
nfs-utils
borgbackup
borgmatic
];
programs.mtr.enable = true;