bertof/nix-dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WIP: upgrade to 24.11

Browse source
This commit is contained in:
Filippo Berto 2024-12-02 12:03:30 +01:00
parent d665d679bb
commit 90bbc2a03c
Signed by: bertof
GPG key ID: 9DBF7E6A1D2CE9ED
10 changed files with 56 additions and 181 deletions
Download patch file Download diff file Expand all files Collapse all files

16
flake.lock generated
View file

@ -298,16 +298,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726989464, "lastModified": 1733050161,
"narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", "narHash": "sha256-lYnT+EYE47f5yY3KS/Kd4pJ6CO9fhCqumkYYkQ3TK20=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", "rev": "62d536255879be574ebfe9b87c4ac194febf47c5",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-24.05", "ref": "release-24.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -539,16 +539,16 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1732817615, "lastModified": 1733129712,
"narHash": "sha256-OxBtFh60ooClrIZyKEJyUsPngfBunnZVY7LfsoZPm9M=", "narHash": "sha256-JTLTaLyfbLLRmHNLvjJD1Om2TBWQX9X/49bQobhQQok=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fa7db5bea155321f36140fcd11a514247cd0757d", "rev": "d93b83e0743720585203621e373bbb6cbcf3549b",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "release-24.05", "ref": "release-24.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

66
flake.nix
View file

@ -4,10 +4,10 @@
inputs = { inputs = {
flake-compat.url = "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"; flake-compat.url = "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz";
nixpkgs.url = "github:NixOS/nixpkgs/release-24.05"; nixpkgs.url = "github:NixOS/nixpkgs/release-24.11";
nixpkgs-u.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-u.url = "github:NixOS/nixpkgs/nixos-unstable";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-24.05"; url = "github:nix-community/home-manager/release-24.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
home-manager-u = { home-manager-u = {
@ -49,6 +49,10 @@
extraOptions = "experimental-features = nix-command flakes"; extraOptions = "experimental-features = nix-command flakes";
permittedInsecurePackages = [ permittedInsecurePackages = [
"electron-27.3.11" # LogSeq "electron-27.3.11" # LogSeq
"aspnetcore-runtime-6.0.36" # Sonarr
"aspnetcore-runtime-wrapped-6.0.36" # Sonarr
"dotnet-sdk-6.0.428" # Sonarr
"dotnet-sdk-wrapped-6.0.428" # Sonarr
]; ];
}; };
@ -118,6 +122,7 @@
}; };
} }
{ services.userborn.enable = true; }
./modules/nixos/users/bertof.nix ./modules/nixos/users/bertof.nix
# Some basic defaults # Some basic defaults
@ -171,6 +176,7 @@
}; };
devShells.default = pkgs.mkShell { devShells.default = pkgs.mkShell {
buildInputs = [ pkgs.deploy-rs ];
shellHook = '' shellHook = ''
${config.pre-commit.installationScript} ${config.pre-commit.installationScript}
LOCAL_KEY = "/etc/nix/key"; LOCAL_KEY = "/etc/nix/key";
@ -416,36 +422,36 @@
home-manager.users.tiziano = import ./instances/loki/hm_tiziano.nix; home-manager.users.tiziano = import ./instances/loki/hm_tiziano.nix;
}]; }];
}; };
};
# # Deploy-rs checks # # Deploy-rs checks
# checks = builtins.mapAttrs (_system: deployLib: deployLib.deployChecks inputs.self.deploy) inputs.deploy-rs.lib; # checks = builtins.mapAttrs (_system: deployLib: deployLib.deployChecks inputs.self.deploy) inputs.deploy-rs.lib;
# Map nodes to Deploy-rs deployments # Map nodes to Deploy-rs deployments
deploy.nodes = { deploy.nodes = {
baldur = { baldur = {
hostname = "baldur.bertof.net"; hostname = "baldur.bertof.net";
profiles.system = { user = "root"; path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos inputs.self.nixosConfigurations.baldur; }; profiles.system = { user = "root"; path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos inputs.self.nixosConfigurations.baldur; };
}; };
freya = { freya = {
hostname = "freya.tsn"; hostname = "freya.tsn";
profiles.system = { user = "root"; path = inputs.deploy-rs.lib.aarch64-linux.activate.nixos inputs.self.nixosConfigurations.freya; }; profiles.system = { user = "root"; path = inputs.deploy-rs.lib.aarch64-linux.activate.nixos inputs.self.nixosConfigurations.freya; };
}; };
heimdall = { heimdall = {
hostname = "heimdall.tsn"; hostname = "heimdall.tsn";
profiles.system = { user = "root"; path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos inputs.self.nixosConfigurations.heimdall; }; profiles.system = { user = "root"; path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos inputs.self.nixosConfigurations.heimdall; };
}; };
loki = { loki = {
hostname = "loki.tsn"; hostname = "loki.tsn";
profiles.system = { user = "root"; path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos inputs.self.nixosConfigurations.loki; }; profiles.system = { user = "root"; path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos inputs.self.nixosConfigurations.loki; };
}; };
odin = { odin = {
hostname = "odin.tsn"; hostname = "odin.tsn";
profiles.system = { user = "root"; path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos inputs.self.nixosConfigurations.odin; }; profiles.system = { user = "root"; path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos inputs.self.nixosConfigurations.odin; };
}; };
thor = { thor = {
hostname = "thor.tsn"; hostname = "thor.tsn";
profiles.system = { user = "root"; path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos inputs.self.nixosConfigurations.thor; }; profiles.system = { user = "root"; path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos inputs.self.nixosConfigurations.thor; };
};
}; };
}; };
}; };

16
instances/baldur/configuration.nix
View file

@ -190,22 +190,6 @@
defaults.email = "filippo.berto95@gmail.com"; defaults.email = "filippo.berto95@gmail.com";
}; };
users.users.bertof = {
isNormalUser = true;
extraGroups = [
"audio"
"input"
"docker"
"libvirtd"
"network"
"networkmanager"
"usb"
"video"
"wheel"
];
shell = pkgs.zsh;
};
boot.kernel.sysctl = { boot.kernel.sysctl = {
"net.ipv4.conf.all.forwarding" = true; "net.ipv4.conf.all.forwarding" = true;
"net.ipv4.conf.default.forwarding" = true; "net.ipv4.conf.default.forwarding" = true;

18
instances/freya/configuration.nix
View file

@ -434,24 +434,6 @@ in
time.timeZone = "Europe/Rome"; time.timeZone = "Europe/Rome";
users.users = {
bertof = {
isNormalUser = true;
extraGroups = [
"audio"
"input"
"docker"
"libvirtd"
"network"
"networkmanager"
"usb"
"video"
"wheel"
];
shell = pkgs.zsh;
};
};
zramSwap.enable = true; zramSwap.enable = true;
system.stateVersion = "22.11"; system.stateVersion = "22.11";

24
instances/heimdall/configuration.nix
View file

@ -31,10 +31,8 @@ in
enable = true; enable = true;
# package = pkgs.bluezFull; # package = pkgs.bluezFull;
}; };
opengl = { graphics.enable = true;
enable = true; amdgpu.amdvlk.enable = true;
driSupport = true;
};
}; };
i18n.defaultLocale = "it_IT.UTF-8"; i18n.defaultLocale = "it_IT.UTF-8";
@ -444,24 +442,6 @@ in
time.timeZone = "Europe/Rome"; time.timeZone = "Europe/Rome";
users.users = {
bertof = {
isNormalUser = true;
extraGroups = [
"audio"
"input"
"docker"
"libvirtd"
"network"
"networkmanager"
"usb"
"video"
"wheel"
];
shell = pkgs.zsh;
};
};
zramSwap.enable = true; zramSwap.enable = true;
system.stateVersion = "24.05"; system.stateVersion = "24.05";

31
instances/loki/configuration.nix
View file

@ -213,37 +213,6 @@ in
# }; # };
}; };
users.users = {
bertof = {
isNormalUser = true;
extraGroups = [
"audio"
"input"
# "docker"
"libvirtd"
"network"
"networkmanager"
"usb"
"video"
"wheel"
];
shell = pkgs.zsh;
};
tiziano = {
isNormalUser = true;
extraGroups = [
"audio"
"input"
"video"
];
openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMExwtJFk6HjySrTZwJH67SOHC3hlL28NO4oe2GXsv6k"
];
shell = pkgs.zsh;
};
# jellyfin.extraGroups = [ "video" ];
};
# services.snapper = { # services.snapper = {
# configs = # configs =
# let # let

18
instances/odin/common_configuration.nix
View file

@ -192,24 +192,6 @@
}; };
}; };
# Define a user account. Don't forget to set a password with ‘passwd’.
users.users.bertof = {
isNormalUser = true;
extraGroups = [
"audio"
"input"
"docker"
"flashrom"
"libvirtd"
"network"
"networkmanager"
"usb"
"video"
"wheel"
];
shell = pkgs.zsh;
};
programs = { programs = {
dconf.enable = true; dconf.enable = true;
flashrom.enable = true; flashrom.enable = true;

18
instances/sif/configuration.nix
View file

@ -199,24 +199,6 @@
}; };
}; };
# Define a user account. Don't forget to set a password with ‘passwd’.
users.users.bertof = {
isNormalUser = true;
extraGroups = [
"audio"
"input"
"docker"
"flashrom"
"libvirtd"
"network"
"networkmanager"
"usb"
"video"
"wheel"
];
shell = pkgs.zsh;
};
programs = { programs = {
dconf.enable = true; dconf.enable = true;
flashrom.enable = true; flashrom.enable = true;

17
instances/thor/configuration.nix
View file

@ -286,23 +286,6 @@
''; '';
}; };
users.users.bertof = {
isNormalUser = true;
extraGroups = [
"audio"
"input"
"docker"
"flashrom"
"libvirtd"
"network"
"networkmanager"
"usb"
"video"
"wheel"
];
shell = pkgs.zsh;
};
virtualisation = { virtualisation = {
docker.enable = true; docker.enable = true;
kvmgt.enable = true; kvmgt.enable = true;

13
modules/nixos/users/bertof.nix
View file

@ -1,13 +1,20 @@
{ { pkgs, ... }: {
users.users.bertof = { users.users.bertof = {
isNormalUser = true; isNormalUser = true;
shell = pkgs.zsh;
extraGroups = [ extraGroups = [
"libvirtd" "audio"
"docker"
"flashrom"
"input"
"kvm" "kvm"
"libvirtd"
"network" "network"
"networkmanager" "networkmanager"
"wheel"
"tss" "tss"
"usb"
"video"
"wheel"
]; ];
openssh.authorizedKeys.keys = [ openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC3W3Btk1qtLHU69aFwseDuKU6PJMA+NxVXJXiRNhDce bertof@odin" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC3W3Btk1qtLHU69aFwseDuKU6PJMA+NxVXJXiRNhDce bertof@odin"