daniel/dotfiles
1
0
Fork 0
Code Activity Actions

Update deps

Browse source
This commit is contained in:
Daniel Kempkens 2023-07-08 11:51:45 +02:00
parent cde3cc1571
commit e69d269016
Signed by: daniel
SSH key fingerprint: SHA256:Ks/MyhQYcPRQiwMKLAKquWCdCPe3JXlb1WttgnAoSeM
7 changed files with 58 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
flake.lock
View file

@ -276,11 +276,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1688731042, "lastModified": 1688808381,
"narHash": "sha256-D1p/LLP1SpDYjutt9W+O5Ek+XGdszsjYjvL30ad++OY=", "narHash": "sha256-x+/VRUAX6FTTmXvDQ49cky8OGAKtj5Kckdth6TSd35Q=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "34db2f05219bcb0e41cc85490e4c338e2405546c", "rev": "069d450b6d2da9369ee5a8ddb2dbf909d3535471",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -299,11 +299,11 @@
}, },
"locked": { "locked": {
"dir": "contrib", "dir": "contrib",
"lastModified": 1688694598, "lastModified": 1688800492,
"narHash": "sha256-AI3k+PwEp/1TCunUNg4mKhbkKEgkA9i0QYEjQlTih3I=", "narHash": "sha256-dhhvnB+iFfZfgEfmkMIgO5wnDlqHZiSh+0zkJ1Jfq+s=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "811140e276a6312775bfcf9b368de25386f7a356", "rev": "21fa19f3e8c1d7b427c6d7c0dbcd6702d1e4e397",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -324,11 +324,11 @@
"weewx-proxy-flake": "weewx-proxy-flake" "weewx-proxy-flake": "weewx-proxy-flake"
}, },
"locked": { "locked": {
"lastModified": 1688718161, "lastModified": 1688804443,
"narHash": "sha256-O3s5asl7M7cm9zOz5p4ImyOFTx01sSzdf+6EQWswnsE=", "narHash": "sha256-eQbQI0YnLXGDVTdnxaO0U9WVQ76Y2lFwUCQ2Zx8RhMs=",
"owner": "nifoc", "owner": "nifoc",
"repo": "nix-overlay", "repo": "nix-overlay",
"rev": "d7dd851508f52577ca1962e98fc7b389c90f591f", "rev": "2ef1d7c9ca15872b3ac744fdb56c0a56091f51b2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -339,11 +339,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1686838567, "lastModified": 1688798314,
"narHash": "sha256-aqKCUD126dRlVSKV6vWuDCitfjFrZlkwNuvj5LtjRRU=", "narHash": "sha256-MFG5rx7L756rtrPHsL662m64AZ4sKqUcApaiYgSKfNM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "429f232fe1dc398c5afea19a51aad6931ee0fb89", "rev": "47dca15d86fdd2eabcf434d7cc0b5baa8d1a463c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -355,11 +355,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1688646010, "lastModified": 1688738153,
"narHash": "sha256-kCeza5eKI2NEi8k0EoeZfv3lN1r1Vwx+L/VA6I8tmG4=", "narHash": "sha256-FHVW6kzWIlhRjpdNq/327kC6J7oQmVGvzkSIjzZbSdw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5daaa32204e9c46b05cd709218b7ba733d07e80c", "rev": "73d174c62ba412c79358895282b6ecee9497469a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -387,22 +387,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-master": {
"locked": {
"lastModified": 1688749462,
"narHash": "sha256-/rC/KqMMUyVEcEkvQp9Y20rscU3RbrWtzUrK2RcqsoA=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "93d6f73da121e49bafe04dc1be5e6cf04b18a8d5",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "master",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1685004253, "lastModified": 1685004253,
@ -429,8 +413,7 @@
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"nifoc-overlay": "nifoc-overlay", "nifoc-overlay": "nifoc-overlay",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs"
"nixpkgs-master": "nixpkgs-master"
} }
}, },
"rust-overlay": { "rust-overlay": {

2
flake.nix
View file

@ -2,7 +2,7 @@
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
nixpkgs-master.url = "github:nixos/nixpkgs/master"; # nixpkgs-master.url = "github:nixos/nixpkgs/master";
disko = { disko = {
url = "github:nix-community/disko"; url = "github:nix-community/disko";

2
home/hosts/mediaserver.nix
View file

@ -22,6 +22,8 @@ args@{ pkgs, ... }:
../programs/jq.nix ../programs/jq.nix
../programs/scripts.nix ../programs/scripts.nix
../programs/ssh/mediaserver.nix
]; ];
home = { home = {

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

@ -107,12 +107,12 @@ in
}; };
nvim-treesitter = buildVimPluginFrom2Nix { nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter"; pname = "nvim-treesitter";
version = "2023-07-07"; version = "2023-07-08";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nvim-treesitter"; owner = "nvim-treesitter";
repo = "nvim-treesitter"; repo = "nvim-treesitter";
rev = "1ef286e5b0cfd17f56586a8445cd83d61647f851"; rev = "d9104a1d10023ed9e7eacf68639ad887425246eb";
sha256 = "0ani5vi127zyhznqzjs0ghr5x1xnlpv53443mcry1nj30wslgdia"; sha256 = "1ffkc08aflpvahgf9z1szvy91xzcvbaxr9xq4lj67yi3rc1djc7n";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -220,12 +220,12 @@ in
}; };
nvim-lspconfig = buildVimPluginFrom2Nix { nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig"; pname = "nvim-lspconfig";
version = "2023-07-07"; version = "2023-07-08";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "neovim"; owner = "neovim";
repo = "nvim-lspconfig"; repo = "nvim-lspconfig";
rev = "51739a8bc531542079698c58512feb68469f5d27"; rev = "deade69789089c3da15237697156334fb3e943f0";
sha256 = "05xpc6zysb9ydkvsxjz3s7k0d5fq4ryg6fdgshfx81ns8mdrjqmh"; sha256 = "09m1ix3wv3n7r5i5sakh3c7gh3zlvsnckjy4gkxhhpx5sdckw1h6";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };
@ -308,12 +308,12 @@ in
}; };
friendly-snippets = buildVimPluginFrom2Nix { friendly-snippets = buildVimPluginFrom2Nix {
pname = "friendly-snippets"; pname = "friendly-snippets";
version = "2023-07-06"; version = "2023-07-08";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rafamadriz"; owner = "rafamadriz";
repo = "friendly-snippets"; repo = "friendly-snippets";
rev = "a94db1ee6ddfd238e725b0f90163fdd65d382464"; rev = "7f6681b7d1eebba024f0caf6576fc1e94578b9cc";
sha256 = "0y8lrwnrm3xza6mh329fd3xcnwmiqlvsycksiqr3am8gjmd3ir4z"; sha256 = "041yhvmiqkgdx7wajrpr3hiqhpjrmharqrdjv3w38y2iyzir0imh";
fetchSubmodules = false; fetchSubmodules = false;
}; };
}; };

27
home/programs/ssh/mediaserver.nix Normal file
View file

@ -0,0 +1,27 @@
{ pkgs, config, ... }:
let
ssh-directory = "${config.home.homeDirectory}/.ssh";
ssh-keys = import ../../../system/shared/ssh-keys.nix;
in
{
home.packages = [ pkgs.openssh ];
programs.ssh = {
enable = true;
forwardAgent = false;
compression = false;
hashKnownHosts = true;
serverAliveInterval = 60;
extraConfig = ''
UpdateHostKeys ask
# VerifyHostKeyDNS yes
'';
};
home.file = {
"${ssh-directory}/GitHub.pub".text = ssh-keys.GitHub;
};
}

4
system/flakes/tanker.nix
View file

@ -3,13 +3,13 @@
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 (deploy-rs.packages.${default-system}) deploy-rs; }; overlay-deploy-rs = _: _: { inherit (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/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;