felschr/nixos-config
1
1
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

chore: upgrade to NixOS 23.11

Browse source
This commit is contained in:
Felix Schröter 2023-11-28 00:08:27 +01:00
parent d28a89f32a
commit 531a407c08
Signed by: felschr
GPG key ID: 671E39E6744C807D
10 changed files with 38 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
flake.lock
View file

@ -378,18 +378,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1700392168, "lastModified": 1700814205,
"narHash": "sha256-v5LprEFx3u4+1vmds9K0/i7sHjT0IYGs7u9v54iz/OA=", "narHash": "sha256-lWqDPKHRbQfi+zNIivf031BUeyciVOtwCwTjyrhDB5g=",
"owner": "nix-community", "rev": "aeb2232d7a32530d3448318790534d196bf9427a",
"repo": "home-manager", "revCount": 3137,
"rev": "28535c3a34d79071f2ccb68671971ce0c0984d7e", "type": "tarball",
"type": "github" "url": "https://api.flakehub.com/f/pinned/nix-community/home-manager/0.2311.3137+rev-aeb2232d7a32530d3448318790534d196bf9427a/018c0081-bcd9-7796-8a7f-2e553d22218f/source.tar.gz"
}, },
"original": { "original": {
"owner": "nix-community", "type": "tarball",
"ref": "release-23.05", "url": "https://flakehub.com/f/nix-community/home-manager/0.2311.tar.gz"
"repo": "home-manager",
"type": "github"
} }
}, },
"matrix-appservices": { "matrix-appservices": {
@ -465,16 +463,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1700989516, "lastModified": 1701058557,
"narHash": "sha256-oKbmPa2wpTHh9XB3+zIx97uMZGNnp97GPliKKG2/plo=", "narHash": "sha256-fux7HlrnoNs93MN0kET4AfiYwg/expoasndRCFeDRyk=",
"rev": "d2e4de209881b38392933fabf303cde3454b0b4c", "rev": "070b5cf9f70bc7ef2dfd739a1f7d6c563fe64bd1",
"revCount": 492338, "revCount": 552032,
"type": "tarball", "type": "tarball",
"url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2305.492338+rev-d2e4de209881b38392933fabf303cde3454b0b4c/018c0eb5-77e1-70b1-a6aa-d06693084d57/source.tar.gz" "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2311.552032+rev-070b5cf9f70bc7ef2dfd739a1f7d6c563fe64bd1/018c11de-19c2-7d91-9286-6403488ba221/source.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
"url": "https://flakehub.com/f/NixOS/nixpkgs/0.2305.tar.gz" "url": "https://flakehub.com/f/NixOS/nixpkgs/0.2311.tar.gz"
} }
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {

4
flake.nix
View file

@ -15,7 +15,7 @@ rec {
}; };
inputs = { inputs = {
nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/0.2305.tar.gz"; nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/0.2311.tar.gz";
nixpkgs-unstable.url = "https://flakehub.com/f/NixOS/nixpkgs/0.1.tar.gz"; nixpkgs-unstable.url = "https://flakehub.com/f/NixOS/nixpkgs/0.1.tar.gz";
@ -35,7 +35,7 @@ rec {
flake-utils.url = "https://flakehub.com/f/numtide/flake-utils/0.1.tar.gz"; flake-utils.url = "https://flakehub.com/f/numtide/flake-utils/0.1.tar.gz";
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-23.05"; url = "https://flakehub.com/f/nix-community/home-manager/0.2311.tar.gz";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };

10
hardware/gpu-amd.nix
View file

@ -1,4 +1,4 @@
{ config, pkgs, ... }: { pkgs, ... }:
{ {
boot.initrd.kernelModules = [ "amdgpu" ]; boot.initrd.kernelModules = [ "amdgpu" ];
@ -6,12 +6,8 @@
hardware.opengl = { hardware.opengl = {
driSupport = true; driSupport = true;
driSupport32Bit = true; driSupport32Bit = true;
extraPackages = with pkgs; [ vaapiIntel libvdpau-va-gl vaapiVdpau ]; extraPackages = with pkgs; [ libvdpau-va-gl vaapiVdpau ];
extraPackages32 = with pkgs.driversi686Linux; [ extraPackages32 = with pkgs.driversi686Linux; [ libvdpau-va-gl vaapiVdpau ];
vaapiIntel
libvdpau-va-gl
vaapiVdpau
];
}; };
environment.systemPackages = with pkgs; [ glxinfo vulkan-tools ]; environment.systemPackages = with pkgs; [ glxinfo vulkan-tools ];

19
hardware/gpu-intel.nix
View file

@ -11,10 +11,17 @@
lib.mkIf config.hardware.opengl.enable (lib.mkDefault "va_gl"); lib.mkIf config.hardware.opengl.enable (lib.mkDefault "va_gl");
}; };
hardware.opengl.extraPackages = with pkgs; [ hardware.opengl = {
vaapiIntel extraPackages = with pkgs; [
libvdpau-va-gl intel-vaapi-driver
intel-media-driver intel-media-driver
intel-compute-runtime intel-compute-runtime
]; libvdpau-va-gl
];
extraPackages32 = with pkgs.driversi686Linux; [
intel-vaapi-driver
intel-media-driver
libvdpau-va-gl
];
};
} }

1
home/felschr-work.nix
View file

@ -55,7 +55,6 @@ with pkgs; {
# development # development
unzip unzip
postman
jq jq
dos2unix dos2unix
]; ];

3
home/felschr.nix
View file

@ -60,9 +60,6 @@
# work # work
teams-for-linux teams-for-linux
# dev
postman
# game dev # game dev
ldtk ldtk
pixelorama pixelorama

2
pkgs/vim-plugins/nvim-kitty-navigator/default.nix
View file

@ -1,6 +1,6 @@
{ inputs, pkgs, ... }: { inputs, pkgs, ... }:
pkgs.vimUtils.buildVimPluginFrom2Nix { pkgs.vimUtils.buildVimPlugin {
pname = "nvim-kitty-navigator"; pname = "nvim-kitty-navigator";
version = inputs.nvim-kitty-navigator.rev; version = inputs.nvim-kitty-navigator.rev;
versionSuffix = "-git"; versionSuffix = "-git";

13
services/home-assistant/wyoming.nix
View file

@ -1,17 +1,6 @@
{ pkgs, lib, inputs, ... }: { lib, ... }:
{ {
imports = [
"${inputs.nixpkgs-unstable}/nixos/modules/services/audio/wyoming/piper.nix"
"${inputs.nixpkgs-unstable}/nixos/modules/services/audio/wyoming/faster-whisper.nix"
];
nixpkgs.overlays = [
(final: prev: {
inherit (pkgs.unstable) wyoming-piper wyoming-faster-whisper piper-tts;
})
];
services.wyoming.piper = { services.wyoming.piper = {
servers = { servers = {
"en" = { "en" = {

4
system/fonts.nix
View file

@ -1,7 +1,7 @@
{ config, pkgs, ... }: { pkgs, ... }:
{ {
fonts.fonts = with pkgs; [ fonts.packages = with pkgs; [
noto-fonts noto-fonts
noto-fonts-extra noto-fonts-extra
noto-fonts-cjk noto-fonts-cjk

4
system/vpn.nix
View file

@ -19,8 +19,8 @@
${pkgs.mullvad}/bin/mullvad auto-connect set on ${pkgs.mullvad}/bin/mullvad auto-connect set on
${pkgs.mullvad}/bin/mullvad dns set default ${pkgs.mullvad}/bin/mullvad dns set default
${pkgs.mullvad}/bin/mullvad lan set allow ${pkgs.mullvad}/bin/mullvad lan set allow
${pkgs.mullvad}/bin/mullvad tunnel ipv6 set on ${pkgs.mullvad}/bin/mullvad tunnel set ipv6 on
${pkgs.mullvad}/bin/mullvad tunnel wireguard quantum-resistant-tunnel set on ${pkgs.mullvad}/bin/mullvad tunnel set wireguard --quantum-resistant=on
${pkgs.mullvad}/bin/mullvad relay set tunnel-protocol wireguard ${pkgs.mullvad}/bin/mullvad relay set tunnel-protocol wireguard
${pkgs.mullvad}/bin/mullvad relay set location de ber ${pkgs.mullvad}/bin/mullvad relay set location de ber