mirror of
https://github.com/nickolaj-jepsen/nixos.git
synced 2026-01-22 08:06:50 +01:00
chore: fix deprecation warnings
This commit is contained in:
parent
e03f3af01d
commit
595d2b23e0
7 changed files with 20 additions and 21 deletions
2
justfile
2
justfile
|
|
@ -41,7 +41,7 @@ switch hostname=`hostname -s` target='':
|
||||||
{{ nixcmd }} run nixpkgs#nixos-rebuild -- switch \
|
{{ nixcmd }} run nixpkgs#nixos-rebuild -- switch \
|
||||||
--flake .#{{ hostname }} \
|
--flake .#{{ hostname }} \
|
||||||
--target-host {{ target }} \
|
--target-host {{ target }} \
|
||||||
--use-remote-sudo {{ nix_output_monitor }}
|
--sudo {{ nix_output_monitor }}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
[doc('Use nixos-anywhere to deploy to a remote host')]
|
[doc('Use nixos-anywhere to deploy to a remote host')]
|
||||||
|
|
|
||||||
|
|
@ -109,7 +109,7 @@ in {
|
||||||
};
|
};
|
||||||
programs.niri = {
|
programs.niri = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = inputs.niri.packages."${pkgs.system}".niri-unstable;
|
package = inputs.niri.packages."${pkgs.stdenv.hostPlatform.system}".niri-unstable;
|
||||||
};
|
};
|
||||||
fireproof.home-manager.programs.niri.settings = {
|
fireproof.home-manager.programs.niri.settings = {
|
||||||
prefer-no-csd = true;
|
prefer-no-csd = true;
|
||||||
|
|
@ -122,7 +122,7 @@ in {
|
||||||
];
|
];
|
||||||
xwayland-satellite = {
|
xwayland-satellite = {
|
||||||
enable = true;
|
enable = true;
|
||||||
path = lib.getExe inputs.niri.packages."${pkgs.system}".xwayland-satellite-unstable;
|
path = lib.getExe inputs.niri.packages."${pkgs.stdenv.hostPlatform.system}".xwayland-satellite-unstable;
|
||||||
};
|
};
|
||||||
environment = {
|
environment = {
|
||||||
NIXOS_OZONE_WL = "1";
|
NIXOS_OZONE_WL = "1";
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@ lib.mkIf config.fireproof.homelab.enable {
|
||||||
};
|
};
|
||||||
|
|
||||||
nextcloud = {
|
nextcloud = {
|
||||||
package = pkgs.nextcloud31;
|
package = pkgs.nextcloud32;
|
||||||
enable = true;
|
enable = true;
|
||||||
https = true;
|
https = true;
|
||||||
database.createLocally = true;
|
database.createLocally = true;
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
nur = inputs.nur.legacyPackages.${pkgs.system};
|
nur = inputs.nur.legacyPackages.${pkgs.stdenv.hostPlatform.system};
|
||||||
extensions = nur.repos.rycee.firefox-addons;
|
extensions = nur.repos.rycee.firefox-addons;
|
||||||
in {
|
in {
|
||||||
config = lib.mkIf config.fireproof.desktop.enable {
|
config = lib.mkIf config.fireproof.desktop.enable {
|
||||||
|
|
|
||||||
|
|
@ -9,13 +9,17 @@
|
||||||
pre-commit
|
pre-commit
|
||||||
];
|
];
|
||||||
|
|
||||||
|
fireproof.home-manager.programs.delta = {
|
||||||
|
enable = true;
|
||||||
|
enableGitIntegration = true;
|
||||||
|
};
|
||||||
|
|
||||||
fireproof.home-manager.programs.git = {
|
fireproof.home-manager.programs.git = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
||||||
userEmail = "nickolaj@fireproof.website";
|
settings = {
|
||||||
userName = "Nickolaj Jepsen";
|
user.email = "nickolaj@fireproof.website";
|
||||||
|
user.name = "Nickolaj Jepsen";
|
||||||
extraConfig = {
|
|
||||||
gpg.format = "ssh";
|
gpg.format = "ssh";
|
||||||
gpg.ssh.program = "op-ssh-sign";
|
gpg.ssh.program = "op-ssh-sign";
|
||||||
push.autosetupremote = "true";
|
push.autosetupremote = "true";
|
||||||
|
|
@ -24,14 +28,8 @@
|
||||||
rebase.autoStash = "true";
|
rebase.autoStash = "true";
|
||||||
rerere.enabled = true;
|
rerere.enabled = true;
|
||||||
init.defaultBranch = "main";
|
init.defaultBranch = "main";
|
||||||
|
alias.fixup = "!git log -n 50 --pretty=format:'%h %s' --no-merges | ${lib.getExe pkgs.fzf} | cut -c -7 | xargs -o git commit --fixup";
|
||||||
};
|
};
|
||||||
|
|
||||||
delta.enable = true;
|
|
||||||
|
|
||||||
aliases = {
|
|
||||||
"fixup" = "!git log -n 50 --pretty=format:'%h %s' --no-merges | ${lib.getExe pkgs.fzf} | cut -c -7 | xargs -o git commit --fixup";
|
|
||||||
};
|
|
||||||
|
|
||||||
includes = [
|
includes = [
|
||||||
{
|
{
|
||||||
condition = "hasconfig:remote.*.url:git@github.com:Digital-Udvikling/**";
|
condition = "hasconfig:remote.*.url:git@github.com:Digital-Udvikling/**";
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@
|
||||||
}: let
|
}: let
|
||||||
vscodePackage = pkgsUnstable.vscode;
|
vscodePackage = pkgsUnstable.vscode;
|
||||||
|
|
||||||
vscode-extensions = inputs.nix-vscode-extensions.extensions.${pkgs.system};
|
vscode-extensions = inputs.nix-vscode-extensions.extensions.${pkgs.stdenv.hostPlatform.system};
|
||||||
vscodePkgs = vscode-extensions.vscode-marketplace // vscode-extensions.vscode-marketplace-release; # Prefer release over pre-release
|
vscodePkgs = vscode-extensions.vscode-marketplace // vscode-extensions.vscode-marketplace-release; # Prefer release over pre-release
|
||||||
|
|
||||||
mkFormatter = formatter: languages: {
|
mkFormatter = formatter: languages: {
|
||||||
|
|
|
||||||
|
|
@ -27,13 +27,14 @@ in {
|
||||||
home.file.".ssh/id_ed25519.pub".source = ../../secrets/hosts + ("/" + hostname) + "/id_ed25519.pub";
|
home.file.".ssh/id_ed25519.pub".source = ../../secrets/hosts + ("/" + hostname) + "/id_ed25519.pub";
|
||||||
programs.ssh = {
|
programs.ssh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
forwardAgent = true;
|
enableDefaultConfig = false;
|
||||||
serverAliveInterval = 60;
|
|
||||||
serverAliveCountMax = 10;
|
|
||||||
matchBlocks =
|
matchBlocks =
|
||||||
{
|
{
|
||||||
"*" = {
|
"*" = {
|
||||||
identityFile = "${config.age.secrets.ssh-key.path}";
|
identityFile = "${config.age.secrets.ssh-key.path}";
|
||||||
|
forwardAgent = true;
|
||||||
|
serverAliveInterval = 60;
|
||||||
|
serverAliveCountMax = 10;
|
||||||
};
|
};
|
||||||
homelab = {
|
homelab = {
|
||||||
hostname = "x.nickolaj.com";
|
hostname = "x.nickolaj.com";
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue