upgrade to NixOS 23.05

This commit is contained in:
Trolli Schmittlauch 2023-06-04 21:24:31 +02:00
parent 7059bc55be
commit 277b1dbe54
4 changed files with 120 additions and 9 deletions

116
flake.lock Normal file
View file

@ -0,0 +1,116 @@
{
"nodes": {
"home-manager": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1685599623,
"narHash": "sha256-Tob4CMOVHue0D3RzguDBCtUmX5ji2PsdbQDbIOIKvsc=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "93db05480c0c0f30382d3e80779e8386dcb4f9dd",
"type": "github"
},
"original": {
"owner": "nix-community",
"ref": "release-23.05",
"repo": "home-manager",
"type": "github"
}
},
"mysecrets": {
"flake": false,
"locked": {
"lastModified": 1618507998,
"narHash": "sha256-i5ph7JlFh8eFEnQehQaKj2SGG7WLE0DPO8R81ERGCZ0=",
"ref": "refs/heads/master",
"rev": "068a4759e72948284c3de85d20a780723278f8b8",
"revCount": 2,
"type": "git",
"url": "ssh://gitea@git.orlives.de:2342/schmittlauch/home-manager_secrets.git"
},
"original": {
"type": "git",
"url": "ssh://gitea@git.orlives.de:2342/schmittlauch/home-manager_secrets.git"
}
},
"nixos-hardware": {
"locked": {
"lastModified": 1684899633,
"narHash": "sha256-NtwerXX8UFsoNy6k+DukJMriWtEjQtMU/Urbff2O2Dg=",
"owner": "NixOS",
"repo": "nixos-hardware",
"rev": "4cc688ee711159b9bcb5a367be44007934e1a49d",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "master",
"repo": "nixos-hardware",
"type": "github"
}
},
"nixos-unstable": {
"locked": {
"lastModified": 1686020360,
"narHash": "sha256-Wee7lIlZ6DIZHHLiNxU5KdYZQl0iprENXa/czzI6Cj4=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "4729ffac6fd12e26e5a8de002781ffc49b0e94b7",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs": {
"locked": {
"lastModified": 1686059680,
"narHash": "sha256-sp0WlCIeVczzB0G8f8iyRg3IYW7KG31mI66z7HIZwrI=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a558f7ac29f50c4b937fb5c102f587678ae1c9fb",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-23.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nur": {
"locked": {
"lastModified": 1686184911,
"narHash": "sha256-VRKkSj9bT/roV++WmCz3iunSHEje3Nuf0TWf3myG6yI=",
"owner": "nix-community",
"repo": "NUR",
"rev": "9077ae2c81459f495156cfd0cd8df2b4e2a23265",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "NUR",
"type": "github"
}
},
"root": {
"inputs": {
"home-manager": "home-manager",
"mysecrets": "mysecrets",
"nixos-hardware": "nixos-hardware",
"nixos-unstable": "nixos-unstable",
"nixpkgs": "nixpkgs",
"nur": "nur"
}
}
},
"root": "root",
"version": 7
}

View file

@ -2,11 +2,11 @@
description = "NixOS system flake"; description = "NixOS system flake";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.05";
nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixos-hardware.url = "github:NixOS/nixos-hardware/master";
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";
}; };
nur.url = "github:nix-community/NUR"; nur.url = "github:nix-community/NUR";

View file

@ -2,7 +2,6 @@
with pkgs; with pkgs;
let let
# nix-channel --add https://nixos.org/channels/nixos-unstable nixos-unstable
unstable = inputs.nixos-unstable.legacyPackages.${system}; unstable = inputs.nixos-unstable.legacyPackages.${system};
desktopApps = [ desktopApps = [
@ -67,7 +66,6 @@ let
] ]
++ ( ++ (
with gimpPlugins; [ with gimpPlugins; [
resynthesizer
fourier fourier
lqrPlugin lqrPlugin
] ]
@ -162,8 +160,6 @@ let
networkmanager-qt networkmanager-qt
kcrash kcrash
breeze-gtk breeze-gtk
phonon-backend-vlc
#(phonon-backend-vlc.override {qtbase=qt5.qtbase; qtx11extras=qt5.qtx11extras;})
] ]
); );
@ -285,7 +281,6 @@ in
; ;
programs.home-manager.enable = true; programs.home-manager.enable = true;
programs.home-manager.path = "$HOME/.nix-defexpr/channels/home-manager";
home.stateVersion = "22.11"; home.stateVersion = "22.11";
programs.direnv = programs.direnv =
@ -303,7 +298,7 @@ in
services.gpg-agent = services.gpg-agent =
{ {
enable = true; enable = true;
enableSshSupport = true; #enableSshSupport = true;
pinentryFlavor = "qt"; pinentryFlavor = "qt";
}; };

View file

@ -71,7 +71,7 @@ in
options = fsOptions ++ [ "subvol=varcache" ]; options = fsOptions ++ [ "subvol=varcache" ];
}; };
boot.tmpOnTmpfs = true; boot.tmp.useTmpfs = true;
fileSystems."/tmp".fsType = "tmpfs"; fileSystems."/tmp".fsType = "tmpfs";
swapDevices = swapDevices =