Switch to nixOS 23.05
This commit is contained in:
parent
c9c1835ac0
commit
7531f47709
42
flake.lock
42
flake.lock
|
@ -4,20 +4,19 @@
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
],
|
]
|
||||||
"utils": "utils"
|
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1681092193,
|
"lastModified": 1685599623,
|
||||||
"narHash": "sha256-JerCqqOqbT2tBnXQW4EqwFl0hHnuZp21rIQ6lu/N4rI=",
|
"narHash": "sha256-Tob4CMOVHue0D3RzguDBCtUmX5ji2PsdbQDbIOIKvsc=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "f9edbedaf015013eb35f8caacbe0c9666bbc16af",
|
"rev": "93db05480c0c0f30382d3e80779e8386dcb4f9dd",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"ref": "release-22.11",
|
"ref": "release-23.05",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
|
@ -39,27 +38,27 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1685468986,
|
"lastModified": 1685865905,
|
||||||
"narHash": "sha256-YSj3K71KjRZgeL0hS3sYLYHI0g8aIVIf9lcsRMCIW2A=",
|
"narHash": "sha256-XJZ/o17eOd2sEsGif+/MQBnfa2DKmndWgJyc7CWajFc=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "9af373a61647257d16ae6062cddaa9094d24920c",
|
"rev": "e7603eba51f2c7820c0a182c6bbb351181caa8e7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"ref": "nixos-22.11",
|
"ref": "nixos-23.05",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"nixpkgs-unstable": {
|
"nixpkgs-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1685383865,
|
"lastModified": 1685931219,
|
||||||
"narHash": "sha256-3uQytfnotO6QJv3r04ajSXbEFMII0dUtw0uqYlZ4dbk=",
|
"narHash": "sha256-8EWeOZ6LKQfgAjB/USffUSELPRjw88A+xTcXnOUvO5M=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "5e871d8aa6f57cc8e0dc087d1c5013f6e212b4ce",
|
"rev": "7409480d5c8584a1a83c422530419efe4afb0d19",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -101,7 +100,7 @@
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
],
|
],
|
||||||
"utils": "utils_2"
|
"utils": "utils"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1637380210,
|
"lastModified": 1637380210,
|
||||||
|
@ -118,21 +117,6 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"utils": {
|
"utils": {
|
||||||
"locked": {
|
|
||||||
"lastModified": 1667395993,
|
|
||||||
"narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"utils_2": {
|
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1637014545,
|
"lastModified": 1637014545,
|
||||||
"narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=",
|
"narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=",
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
{
|
{
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:nixos/nixpkgs/nixos-22.11";
|
nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05";
|
||||||
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
|
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||||
nixos-hardware.url = "github:nixos/nixos-hardware";
|
nixos-hardware.url = "github:nixos/nixos-hardware";
|
||||||
|
|
||||||
home-manager = {
|
home-manager = {
|
||||||
url = "github:nix-community/home-manager/release-22.11";
|
url = "github:nix-community/home-manager/release-23.05";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
{ pkgs, config, ... }:
|
{ pkgs, config, ... }:
|
||||||
let
|
let
|
||||||
ffmpeg = pkgs.ffmpeg-full;
|
ffmpeg_5 = pkgs.ffmpeg_5-full;
|
||||||
scripts = with pkgs.mpvScripts; [ sponsorblock ];
|
scripts = with pkgs.mpvScripts; [ sponsorblock ];
|
||||||
mpv = pkgs.wrapMpv (pkgs.mpv-unwrapped.override { inherit ffmpeg; }) { inherit scripts; };
|
mpv = pkgs.wrapMpv (pkgs.mpv-unwrapped.override { inherit ffmpeg_5; }) { inherit scripts; };
|
||||||
in
|
in
|
||||||
|
|
||||||
{
|
{
|
||||||
home.packages = [ ffmpeg ];
|
home.packages = [ ffmpeg_5 ];
|
||||||
programs.mpv = {
|
programs.mpv = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = mpv;
|
package = mpv;
|
||||||
|
|
|
@ -91,7 +91,7 @@
|
||||||
(pass.withExtensions (exts: [ exts.pass-otp ]))
|
(pass.withExtensions (exts: [ exts.pass-otp ]))
|
||||||
wireguard-tools
|
wireguard-tools
|
||||||
yubikey-manager
|
yubikey-manager
|
||||||
yubioath-desktop
|
yubioath-flutter
|
||||||
|
|
||||||
# GUI tools
|
# GUI tools
|
||||||
alacritty
|
alacritty
|
||||||
|
|
|
@ -3,20 +3,22 @@
|
||||||
{
|
{
|
||||||
services.openssh = {
|
services.openssh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
permitRootLogin = "no";
|
settings = {
|
||||||
passwordAuthentication = false;
|
PermitRootLogin = "no";
|
||||||
kbdInteractiveAuthentication = false;
|
PasswordAuthentication = false;
|
||||||
|
KbdInteractiveAuthentication = false;
|
||||||
|
|
||||||
kexAlgorithms = [
|
KexAlgorithms = [
|
||||||
"sntrup761x25519-sha512@openssh.com"
|
"sntrup761x25519-sha512@openssh.com"
|
||||||
"curve25519-sha256"
|
"curve25519-sha256"
|
||||||
"curve25519-sha256@libssh.org"
|
"curve25519-sha256@libssh.org"
|
||||||
];
|
];
|
||||||
macs = [
|
Macs = [
|
||||||
"hmac-sha2-512-etm@openssh.com"
|
"hmac-sha2-512-etm@openssh.com"
|
||||||
"hmac-sha2-256-etm@openssh.com"
|
"hmac-sha2-256-etm@openssh.com"
|
||||||
"umac-128-etm@openssh.com"
|
"umac-128-etm@openssh.com"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
};
|
||||||
# users.users.artemis.openssh.authorizedKeys.keys set in private
|
# users.users.artemis.openssh.authorizedKeys.keys set in private
|
||||||
}
|
}
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
boot = {
|
boot = {
|
||||||
kernel.sysctl."vm.swappiness" = 5;
|
kernel.sysctl."vm.swappiness" = 5;
|
||||||
kernelParams = [ "console=tty1" ];
|
kernelParams = [ "console=tty1" ];
|
||||||
cleanTmpDir = true;
|
tmp.cleanOnBoot = true;
|
||||||
loader.grub.enable = false;
|
loader.grub.enable = false;
|
||||||
loader.generic-extlinux-compatible.enable = true;
|
loader.generic-extlinux-compatible.enable = true;
|
||||||
initrd.luks.devices."${config.networking.hostName}" = {
|
initrd.luks.devices."${config.networking.hostName}" = {
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
boot = {
|
boot = {
|
||||||
kernelPackages = pkgs-unstable.linuxPackages_latest;
|
kernelPackages = pkgs-unstable.linuxPackages_latest;
|
||||||
kernel.sysctl."vm.swappiness" = 5;
|
kernel.sysctl."vm.swappiness" = 5;
|
||||||
cleanTmpDir = true;
|
tmp.cleanOnBoot = true;
|
||||||
blacklistedKernelModules = [ "psmouse" ];
|
blacklistedKernelModules = [ "psmouse" ];
|
||||||
|
|
||||||
initrd = {
|
initrd = {
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
kernelPackages = pkgs-unstable.linuxPackages_latest;
|
kernelPackages = pkgs-unstable.linuxPackages_latest;
|
||||||
kernelParams = [ "fbcon=rotate:1" ];
|
kernelParams = [ "fbcon=rotate:1" ];
|
||||||
kernel.sysctl."vm.swappiness" = 5;
|
kernel.sysctl."vm.swappiness" = 5;
|
||||||
cleanTmpDir = true;
|
tmp.cleanOnBoot = true;
|
||||||
|
|
||||||
loader = {
|
loader = {
|
||||||
systemd-boot.enable = true;
|
systemd-boot.enable = true;
|
||||||
|
|
|
@ -8,7 +8,7 @@ in
|
||||||
kernelPackages = pkgs-unstable.linuxPackages_latest;
|
kernelPackages = pkgs-unstable.linuxPackages_latest;
|
||||||
extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
|
extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
|
||||||
kernel.sysctl."vm.swappiness" = 5;
|
kernel.sysctl."vm.swappiness" = 5;
|
||||||
cleanTmpDir = true;
|
tmp.cleanOnBoot = true;
|
||||||
loader.systemd-boot-secure = {
|
loader.systemd-boot-secure = {
|
||||||
enable = true;
|
enable = true;
|
||||||
signed = true;
|
signed = true;
|
||||||
|
|
Loading…
Reference in a new issue