24.05 -> 24.11 beta

- switching to NixOS 24.11 family of inputs
- after th branchoff, no channel bump or home-manager release has been
made yet, thus pointing towards some preliminary branches so far
- had to disable a few packages for now
This commit is contained in:
Trolli Schmittlauch 2024-11-15 00:57:05 +01:00
parent 81eaea946c
commit 1d4666739c
5 changed files with 32 additions and 31 deletions

View file

@ -42,7 +42,7 @@ in
# Some programs need SUID wrappers, can be configured further or are # Some programs need SUID wrappers, can be configured further or are
# started in user sessions. # started in user sessions.
programs.bash.enableCompletion = true; programs.bash.completion.enable = true;
programs.wireshark = { programs.wireshark = {
enable = true; enable = true;
package = pkgs.wireshark; package = pkgs.wireshark;

View file

@ -117,16 +117,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726989464, "lastModified": 1731604581,
"narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", "narHash": "sha256-Qq2YZZaDTB3FZLWU/Hgh1uuWlUBl3cMLGB99bm7rFUM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", "rev": "1d0862ee2d7c6f6cd720d6f32213fa425004be10",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-24.05", "ref": "master",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -194,11 +194,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1731332224, "lastModified": 1731403644,
"narHash": "sha256-0ctfVp27ingWtY7dbP5+QpSQ98HaOZleU0teyHQUAw0=", "narHash": "sha256-T9V7CTucjRZ4Qc6pUEV/kpgNGzQbHWfGcfK6JJLfUeI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "184687ae1a3139faa4746168baf071f60d0310c8", "rev": "f6581f1c3b137086e42a08a906bdada63045f991",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -258,27 +258,27 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1731386116, "lastModified": 1731613620,
"narHash": "sha256-lKA770aUmjPHdTaJWnP3yQ9OI1TigenUqVC3wweqZuI=", "narHash": "sha256-Qb4cpVp1pr29mvbqMROn7BcYt60GJ948RSM4UKU2DV4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "689fed12a013f56d4c4d3f612489634267d86529", "rev": "f4a0fbc120cd775346111246b453f8af94afc1d1",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-24.05", "ref": "release-24.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1731350327, "lastModified": 1731623759,
"narHash": "sha256-FQg83gsyB++oVNPg6QP9enTlYxG9d5K5wcdc8jE5tTk=", "narHash": "sha256-v7ow++vH4cgaWeKnMdt/HGmvFPqCTyzkghyY/JdkMGE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "4d77b647a89d6405bfd2a6a2fecf613a3520683b", "rev": "b53bdb77031c86c9525329368fdd87b28792b1db",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -394,11 +394,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729613947, "lastModified": 1730321837,
"narHash": "sha256-XGOvuIPW1XRfPgHtGYXd5MAmJzZtOuwlfKDgxX5KT3s=", "narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "aac86347fb5063960eccb19493e0cadcdb4205ca", "rev": "746901bb8dba96d154b66492a29f5db0693dbfcc",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -412,11 +412,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1726560853, "lastModified": 1731533236,
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -2,11 +2,13 @@
description = "NixOS system flake"; description = "NixOS system flake";
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; nixpkgs.url = "github:NixOS/nixpkgs/release-24.11";
#nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
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-24.05"; url = "github:nix-community/home-manager/master";
#url = "github:nix-community/home-manager/release-24.11";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
lanzaboote = { lanzaboote = {

View file

@ -41,7 +41,7 @@ let
musescore musescore
tenacity tenacity
soundkonverter soundkonverter
config.nur.repos.fooker.studio-link #config.nur.repos.fooker.studio-link
]; ];
cliApps = cliApps =
@ -150,7 +150,7 @@ let
chromium chromium
falkon falkon
thunderbird thunderbird
calibre #calibre # FIXME: using bin due to failing tests
dino dino
zotero zotero
ding ding
@ -179,7 +179,7 @@ let
yate yate
# split and merge PDFs in a GUI # split and merge PDFs in a GUI
pdfarranger pdfarranger
#qbittorrent # currently insecure qbittorrent
#(pkgs.pidgin-with-plugins.override { #(pkgs.pidgin-with-plugins.override {
# plugins = [ pkgs.pidginotr ];}) # plugins = [ pkgs.pidginotr ];})
@ -193,12 +193,14 @@ let
]; ];
kdeTools = kdeTools =
[ okteta ] [
okteta
plasma5Packages.kdeconnect-kde
]
++ (with kdePackages; [ ++ (with kdePackages; [
okular okular
gwenview gwenview
yakuake yakuake
kdeconnect
dolphin dolphin
spectacle spectacle
kate kate

View file

@ -20,9 +20,6 @@ in
networking.hostName = "framenix"; # Define your hostname. networking.hostName = "framenix"; # Define your hostname.
# use newer linux-firmware from unstable
hardware.firmware = lib.mkBefore [ unstable.linux-firmware ];
# override tmpdir for daemon # override tmpdir for daemon
systemd.services.nix-daemon.environment.TMPDIR = "/var/tmp"; systemd.services.nix-daemon.environment.TMPDIR = "/var/tmp";