daniel/dotfiles
1
0
Fork 0
Code Activity Actions

Compare commits

base: daniel:34998b908c85cf2b3c0f44587b7eb8a395579316
Branches Tags
daniel:master
...
compare: daniel:5392f70be1e1b8767c63781ec1a23396db928465
Branches Tags
daniel:master

3 commits
34998b908c ... 5392f70be1

Author SHA1 Message Date
Daniel Kempkens
5392f70be1
Update deps
All checks were successful
Build / build-arm64-linux (push) Successful in 8m44s
Details
Build / build-amd64-linux (push) Successful in 27m6s
Details
2023-09-24 18:18:14 +02:00
Daniel Kempkens
a43ca33bee
Styx: Use agenix 2023-09-24 18:10:08 +02:00
Daniel Kempkens
3b991b7563
Update deps 2023-09-24 13:23:03 +02:00
12 changed files with 65 additions and 59 deletions
Show stats Expand all files Collapse all files

13
agenix/hosts/Styx/config.nix Normal file
View file

@ -0,0 +1,13 @@
{
age = {
identityPaths = [ "/Users/daniel/.ssh/agenix" ];
secrets = {
nix-netrc = {
file = ../all/nix/netrc.age;
path = "/etc/nix/netrc";
mode = "444";
};
};
};
}

BIN
agenix/hosts/all/nix/netrc.age Normal file
View file

Binary file not shown.

6
agenix/hosts/tanker/config.nix
View file

@ -1,5 +1,11 @@
{ {
age.secrets = { age.secrets = {
nix-netrc = {
file = ../all/nix/netrc.age;
path = "/etc/nix/netrc";
mode = "444";
};
user-daniel-password = { user-daniel-password = {
file = ./user/danielPassword.age; file = ./user/danielPassword.age;
}; };

49
flake.lock
View file

@ -300,11 +300,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1695495225, "lastModified": 1695550077,
"narHash": "sha256-4i4XCjN60llr7U6/03bhPKsFoeKecLnW4WScQEc4n+A=", "narHash": "sha256-xoxR/iY69/3lTnnZDP6gf3J46DUKPcf+Y1jH03tfZXE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "e0c70942c0e7178a56289adea20c056a3cda7c5e", "rev": "a88df2fb101778bfd98a17556b3a2618c6c66091",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -323,11 +323,11 @@
}, },
"locked": { "locked": {
"dir": "contrib", "dir": "contrib",
"lastModified": 1695496686, "lastModified": 1695544147,
"narHash": "sha256-y4Zcf+3L/52uarOpIrqskl/AczeeILxep4/RG/zS4f0=", "narHash": "sha256-Pd05aLI+sK8w3mh6bUlKimRK7NprkkQKzOOs5jRG8BI=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "01be28b370987447c78f313a65fdc289d79d4d8a", "rev": "9637b7dae417f336ca72cfcb201cb37247d794a8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -346,11 +346,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1695497276, "lastModified": 1695554778,
"narHash": "sha256-NeZxC1mXzim4cEe770CXU1vKwKRvzEaZJhQnPG8qZIE=", "narHash": "sha256-J3peBxSA7I2qrV+vXyfBF0l4k7+0tSN8MuJVO5ykdCU=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "78e441402fe085f2fa5ea4e210e08a76cdf7e55a", "rev": "f7c50f4fb46d644d6a85cdb181d29451024108b5",
"revCount": 499, "revCount": 500,
"type": "git", "type": "git",
"url": "https://git.kempkens.io/daniel/nix-overlay" "url": "https://git.kempkens.io/daniel/nix-overlay"
}, },
@ -381,11 +381,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1695109627, "lastModified": 1695541019,
"narHash": "sha256-4rpyoVzmunIG6xWA/EonnSSqC69bDBzciFi6SjBze/0=", "narHash": "sha256-rs++zfk41K9ArWkDAlmBDlGlKO8qeRIRzdjo+9SmNFI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "cb4dc98f776ddb6af165e6f06b2902efe31ca67a", "rev": "61283b30d11f27d5b76439d43f20d0c0c8ff5296",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -397,11 +397,11 @@
}, },
"nixos-unstable": { "nixos-unstable": {
"locked": { "locked": {
"lastModified": 1695145219, "lastModified": 1695360818,
"narHash": "sha256-Eoe9IHbvmo5wEDeJXKFOpKUwxYJIOxKUesounVccNYk=", "narHash": "sha256-JlkN3R/SSoMTa+CasbxS1gq+GpGxXQlNZRUh9+LIy/0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5ba549eafcf3e33405e5f66decd1a72356632b96", "rev": "e35dcc04a3853da485a396bdd332217d0ac9054f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -463,22 +463,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-master": {
"locked": {
"lastModified": 1695495354,
"narHash": "sha256-kY1ZKz1KLBWwasaxp87Q0Oa4nD94lmmIvXXUdLVCKQM=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "1ff350f7b806e02c65c1bbc78b905b80244df5d6",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "master",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1685004253, "lastModified": 1685004253,
@ -549,7 +533,6 @@
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixos-unstable": "nixos-unstable", "nixos-unstable": "nixos-unstable",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-master": "nixpkgs-master",
"pre-commit-hooks-nix": "pre-commit-hooks-nix", "pre-commit-hooks-nix": "pre-commit-hooks-nix",
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
} }

6
flake.nix
View file

@ -2,7 +2,7 @@
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
nixos-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixos-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
nixpkgs-master.url = "github:nixos/nixpkgs/master"; # nixpkgs-master.url = "github:nixos/nixpkgs/master";
# Tools # Tools
@ -69,14 +69,14 @@
flake = flake =
let let
Styx = import ./system/flakes/Styx.nix { Styx = import ./system/flakes/Styx.nix {
inherit (inputs) nixpkgs home-manager nix-darwin; inherit (inputs) nixpkgs home-manager nix-darwin agenix;
inherit inputs; inherit inputs;
}; };
tanker = import ./system/flakes/tanker.nix { tanker = import ./system/flakes/tanker.nix {
nixpkgs = inputs.nixos-unstable; nixpkgs = inputs.nixos-unstable;
inherit (inputs) nixpkgs-master disko deploy-rs home-manager agenix attic; inherit (inputs) disko deploy-rs home-manager agenix attic;
inherit inputs; inherit inputs;
}; };

30
home/programs/nvim/plugins.nix
View file

@ -30,12 +30,12 @@ in
}; };
nvim-web-devicons = buildVimPluginFrom2Nix { nvim-web-devicons = buildVimPluginFrom2Nix {
pname = "nvim-web-devicons"; pname = "nvim-web-devicons";
version = "2023-09-23"; version = "2023-09-24";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kyazdani42"; owner = "kyazdani42";
repo = "nvim-web-devicons"; repo = "nvim-web-devicons";
rev = "b844d3da4affb77fb2ba56ed235946f0ba0ab200"; rev = "480a756df82a0c231622c9bf2173bb6634713716";
sha256 = "0xr5i7rvfb7b74rl88wnrgkam20sa1b98zcd6kiqx777mmadym41"; sha256 = "05b1gflnk4252x8m5w9v3dmahg3sncdx3z1lhgw0z7425ascxnyw";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -118,12 +118,12 @@ in
}; };
nvim-treesitter = buildVimPluginFrom2Nix { nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter"; pname = "nvim-treesitter";
version = "2023-09-23"; version = "2023-09-24";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nvim-treesitter"; owner = "nvim-treesitter";
repo = "nvim-treesitter"; repo = "nvim-treesitter";
rev = "af6b3ecea9b3cff18b9244027e23e7f2c34ebdd5"; rev = "0960322686bfa38afd4f1e0b9660473cf77e24b6";
sha256 = "1swad6y06a5xnib92ksqxqy794yvp5y1dgkbvbw5zsmxa844rigm"; sha256 = "0gzj6k34h0847sf382dfc0q2cjs7qd2v2192rniijiy4hy1scv6m";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -162,12 +162,12 @@ in
}; };
telescope-nvim = buildVimPluginFrom2Nix { telescope-nvim = buildVimPluginFrom2Nix {
pname = "telescope.nvim"; pname = "telescope.nvim";
version = "2023-09-20"; version = "2023-09-23";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nvim-telescope"; owner = "nvim-telescope";
repo = "telescope.nvim"; repo = "telescope.nvim";
rev = "40c8d2fc2b729dd442eda093cf8c9496d6e23732"; rev = "ed9574dd6dde143d009b2528ea6d79bd34bbe6c8";
sha256 = "08nxnnglli2j07k70xxfjnd02iysr3zbac26xqjv0b1rdn24w9gx"; sha256 = "0w7hbzcw5bckgyp0hacg1v6aw064mixhl97mycix47gxa86iqbjb";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -319,12 +319,12 @@ in
}; };
LuaSnip = buildVimPluginFrom2Nix { LuaSnip = buildVimPluginFrom2Nix {
pname = "LuaSnip"; pname = "LuaSnip";
version = "2023-09-21"; version = "2023-09-24";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "L3MON4D3"; owner = "L3MON4D3";
repo = "LuaSnip"; repo = "LuaSnip";
rev = "c5fb16a934892086d4ba01bac48b77c65435025e"; rev = "1fd22fa96c11573248f9fdd09f25e724c7bb3dd4";
sha256 = "08gqbwpsqnlvrn11g51h44npfhh1gbxkw55sl7qpa5q3bvh8q5q1"; sha256 = "1lxw6l6rw07p50phmynnwid60gwz6pgq7p3z9j2yyp8alchxx7z5";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -572,12 +572,12 @@ in
}; };
gitsigns-nvim = buildVimPluginFrom2Nix { gitsigns-nvim = buildVimPluginFrom2Nix {
pname = "gitsigns.nvim"; pname = "gitsigns.nvim";
version = "2023-09-23"; version = "2023-09-24";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lewis6991"; owner = "lewis6991";
repo = "gitsigns.nvim"; repo = "gitsigns.nvim";
rev = "9bec6e1ef5542e33974e5b4f982c8c063b981974"; rev = "bdeba1cec3faddd89146690c10b9a87949c0ee66";
sha256 = "0pm9nw0mrqmgyx3accy89x83rykaqy65syiwlfip8vadb89kifk1"; sha256 = "0amphagvmvdjrp13nxzl8jjs38dy1qicv71g91h998yjfc7av42l";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };

4
secrets.nix
View file

@ -10,8 +10,12 @@ let
mediaserver = [ user-daniel system-mediaserver ]; mediaserver = [ user-daniel system-mediaserver ];
argon = [ user-daniel system-argon ]; argon = [ user-daniel system-argon ];
weather-sdr = [ user-daniel system-weather-sdr ]; weather-sdr = [ user-daniel system-weather-sdr ];
all-systems = [ user-daniel system-tanker system-mediaserver system-argon system-weather-sdr ];
in in
{ {
# all
"agenix/hosts/all/nix/netrc.age".publicKeys = all-systems;
# tanker # tanker
"agenix/hosts/tanker/user/danielPassword.age".publicKeys = tanker; "agenix/hosts/tanker/user/danielPassword.age".publicKeys = tanker;

4
system/flakes/Styx.nix
View file

@ -1,4 +1,4 @@
{ nixpkgs, home-manager, nix-darwin, inputs, ... }: { nixpkgs, home-manager, nix-darwin, agenix, inputs, ... }:
let let
default-system = "aarch64-darwin"; default-system = "aarch64-darwin";
@ -30,6 +30,8 @@ in
home-manager.darwinModules.home-manager home-manager.darwinModules.home-manager
agenix.darwinModules.default
{ {
nixpkgs = nixpkgsConfig; nixpkgs = nixpkgsConfig;
nix = { nix = {

6
system/flakes/tanker.nix
View file

@ -1,15 +1,15 @@
{ nixpkgs, nixpkgs-master, disko, deploy-rs, home-manager, agenix, attic, inputs, ... }: { nixpkgs, disko, deploy-rs, home-manager, agenix, attic, inputs, ... }:
let let
default-system = "x86_64-linux"; default-system = "x86_64-linux";
overlay-master = _: _: { pkgs-master = import inputs.nixpkgs-master { system = default-system; }; }; # overlay-master = _: _: { pkgs-master = import inputs.nixpkgs-master { system = default-system; }; };
overlay-deploy-rs = _: _: { inherit (inputs.deploy-rs.packages.${default-system}) deploy-rs; }; overlay-deploy-rs = _: _: { inherit (inputs.deploy-rs.packages.${default-system}) deploy-rs; };
overlay-nifoc = inputs.nifoc-overlay.overlay; overlay-nifoc = inputs.nifoc-overlay.overlay;
nixpkgsConfig = { nixpkgsConfig = {
overlays = [ overlays = [
overlay-master # overlay-master
overlay-deploy-rs overlay-deploy-rs
overlay-nifoc overlay-nifoc
]; ];

2
system/hosts/Styx.nix
View file

@ -1,5 +1,6 @@
{ {
imports = [ imports = [
../../agenix/hosts/Styx/config.nix
../shared/show-update-changelog.nix ../shared/show-update-changelog.nix
../darwin/defaults.nix ../darwin/defaults.nix
@ -86,7 +87,6 @@
environment = { environment = {
darwinConfig = "$HOME/.config/nixpkgs/system/hosts/Styx.nix"; darwinConfig = "$HOME/.config/nixpkgs/system/hosts/Styx.nix";
etc."nix/netrc".source = ../../secret/shared/nix-netrc;
}; };
services = { services = {

2
system/hosts/tanker.nix
View file

@ -102,8 +102,6 @@ in
''; '';
}; };
environment.etc."nix/netrc".source = ../../secret/shared/nix-netrc;
boot = { boot = {
tmp.cleanOnBoot = true; tmp.cleanOnBoot = true;

2
system/nixos/mastodon.nix
View file

@ -7,7 +7,7 @@ in
services.mastodon = { services.mastodon = {
enable = true; enable = true;
package = pkgs.pkgs-master.mastodon; # package = pkgs.pkgs-master.mastodon;
configureNginx = false; configureNginx = false;