ghoscht/nix-config
ghoscht/nix-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

NixOS: Upgrade to 24.11

Browse source
This commit is contained in:
GHOSCHT 2024-12-02 14:20:49 +01:00
parent 7aa65ef8f4
commit 8761dae20c
Signed by: ghoscht
GPG key ID: 2C2C1C62A5388E82
9 changed files with 35 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
flake.lock
View file

@ -458,16 +458,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"
} }
@ -938,16 +938,16 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1732749044, "lastModified": 1732981179,
"narHash": "sha256-T38FQOg0BV5M8FN1712fovzNakSOENEYs+CSkg31C9Y=", "narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "0c5b4ecbed5b155b705336aa96d878e55acd8685", "rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-24.05", "ref": "nixos-24.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }

4
flake.nix
View file

@ -3,14 +3,14 @@
inputs = { inputs = {
# Nixpkgs # Nixpkgs
nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
# You can access packages and modules from different nixpkgs revs # You can access packages and modules from different nixpkgs revs
# at the same time. Here's an working example: # at the same time. Here's an working example:
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
# Also see the 'unstable-packages' overlay at 'overlays/default.nix'. # Also see the 'unstable-packages' overlay at 'overlays/default.nix'.
# Home manager # Home manager
home-manager.url = "github:nix-community/home-manager/release-24.05"; home-manager.url = "github:nix-community/home-manager/release-24.11";
home-manager.inputs.nixpkgs.follows = "nixpkgs"; home-manager.inputs.nixpkgs.follows = "nixpkgs";
hardware.url = "github:nixos/nixos-hardware"; hardware.url = "github:nixos/nixos-hardware";

2
home/features/cli/gpg.nix
View file

@ -19,7 +19,7 @@
# Disable gnome-keyring ssh-agent # Disable gnome-keyring ssh-agent
xdg.configFile."autostart/gnome-keyring-ssh.desktop".text = '' xdg.configFile."autostart/gnome-keyring-ssh.desktop".text = ''
${lib.fileContents "${pkgs.gnome3.gnome-keyring}/etc/xdg/autostart/gnome-keyring-ssh.desktop"} ${lib.fileContents "${pkgs.gnome-keyring}/etc/xdg/autostart/gnome-keyring-ssh.desktop"}
Hidden=true Hidden=true
''; '';
} }

2
home/global/default.nix
View file

@ -59,7 +59,7 @@
nix = { nix = {
package = lib.mkDefault pkgs.nix; package = lib.mkDefault pkgs.nix;
settings = { settings = {
experimental-features = ["nix-command" "flakes" "repl-flake"]; experimental-features = ["nix-command" "flakes"];
warn-dirty = false; warn-dirty = false;
}; };
}; };

2
hosts/adalbert/default.nix
View file

@ -61,7 +61,7 @@
allowUnfree = true; allowUnfree = true;
firefox.enablePlasmaBrowserIntegration = true; firefox.enablePlasmaBrowserIntegration = true;
segger-jlink.acceptLicense = true; segger-jlink.acceptLicense = true;
permittedInsecurePackages = ["segger-jlink-qt4-794l"]; permittedInsecurePackages = ["segger-jlink-qt4-796s"];
}; };
}; };

2
hosts/common/global/nix.nix
View file

@ -6,7 +6,7 @@
nix = { nix = {
settings = { settings = {
auto-optimise-store = lib.mkDefault true; auto-optimise-store = lib.mkDefault true;
experimental-features = ["nix-command" "flakes" "repl-flake"]; experimental-features = ["nix-command" "flakes"];
warn-dirty = false; warn-dirty = false;
system-features = ["kvm" "big-parallel" "nixos-test"]; system-features = ["kvm" "big-parallel" "nixos-test"];
}; };

16
hosts/common/optional/desktop/gnome.nix
View file

@ -16,27 +16,23 @@
wacom.enable = true; wacom.enable = true;
}; };
udev.packages = with pkgs; [ udev.packages = with pkgs; [
gnome.gnome-settings-daemon gnome-settings-daemon
]; ];
}; };
environment = { environment = {
systemPackages = with pkgs; [ systemPackages = with pkgs; [
# System-Wide Packages # System-Wide Packages
gnome.adwaita-icon-theme adwaita-icon-theme
gnome.dconf-editor dconf-editor
gnome.gnome-tweaks gnome-tweaks
gnomeExtensions.kimpanel gnomeExtensions.kimpanel
gnomeExtensions.vitals gnomeExtensions.vitals
gnomeExtensions.tray-icons-reloaded gnomeExtensions.tray-icons-reloaded
]; ];
gnome.excludePackages = gnome.excludePackages = with pkgs; [
(with pkgs; [
# Ignored Packages
gnome-tour gnome-tour
gedit gedit
])
++ (with pkgs.gnome; [
atomix atomix
epiphany epiphany
geary geary
@ -46,6 +42,6 @@
hitori hitori
iagno iagno
tali tali
]); ];
}; };
} }

3
hosts/common/optional/desktop/japanese.nix
View file

@ -1,6 +1,7 @@
{pkgs, ...}: { {pkgs, ...}: {
i18n.inputMethod = { i18n.inputMethod = {
enabled = "fcitx5"; enable = true;
type = "fcitx5";
fcitx5.addons = with pkgs; [ fcitx5.addons = with pkgs; [
fcitx5-mozc fcitx5-mozc
fcitx5-gtk fcitx5-gtk

4
hosts/ludwig/default.nix
View file

@ -60,7 +60,7 @@
# Disable if you don't want unfree packages # Disable if you don't want unfree packages
allowUnfree = true; allowUnfree = true;
segger-jlink.acceptLicense = true; segger-jlink.acceptLicense = true;
permittedInsecurePackages = ["segger-jlink-qt4-794l"]; permittedInsecurePackages = ["segger-jlink-qt4-796s"];
}; };
}; };
@ -78,7 +78,7 @@
}; };
hardware = { hardware = {
opengl = { graphics = {
enable = true; enable = true;
extraPackages = with pkgs; [ extraPackages = with pkgs; [
intel-media-driver # LIBVA_DRIVER_NAME=iHD intel-media-driver # LIBVA_DRIVER_NAME=iHD