diff options
| Commit | 100a75c0c9d1856210bd4e0e69231e994ed3d652 (patch) | |
|---|---|---|
| Author | 2024-12-01 20:34:52 +0200 | |
| Committer | 2024-12-01 20:34:52 +0200 | |
| Files | b49d0c8863ce3758b32cbc0e95a41ee8a5b5b14d | |
| nix-100a75c0c9d1856210bd4e0e69231e994ed3d652.tar nix-100a75c0c9d1856210bd4e0e69231e994ed3d652.tar.gz nix-100a75c0c9d1856210bd4e0e69231e994ed3d652.zip | ||
| Parent | 44053d6d975edb981ae1fba05360619856bbf7f1 (diff) | |
chore!: Update to 24.11
7 files changed, 17 insertions, 19 deletions
| -rw-r--r-- | flake.lock | 14 | ||||
| -rw-r--r-- | flake.nix | 2 | ||||
| -rw-r--r-- | machines/ceres/hardware-configuration.nix | 5 | ||||
| -rw-r--r-- | modules/personal/dev-cli.nix | 2 | ||||
| -rw-r--r-- | modules/personal/fonts.nix | 2 | ||||
| -rw-r--r-- | modules/personal/hardware-general.nix | 3 | ||||
| -rw-r--r-- | modules/personal/openbox-de.nix | 8 |
@@ -2,16 +2,16 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1731797254, - "narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=", + "lastModified": 1732981179, + "narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59", + "rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } @@ -50,11 +50,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", + "lastModified": 1732837521, + "narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370", "type": "github" }, "original": { @@ -2,7 +2,7 @@ description = "System setup"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; nixpkgs-2305.url = "github:nixos/nixpkgs/nixos-23.05"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; diff --git a/machines/ceres/hardware-configuration.nix b/machines/ceres/hardware-configuration.nix index 15c6ae9..6d56aa2 100644 --- a/machines/ceres/hardware-configuration.nix +++ b/machines/ceres/hardware-configuration.nix @@ -54,7 +54,7 @@ # systemd.tmpfiles.rules = [ # "L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}" # ]; - hardware.opengl = { + hardware.graphics = { # Mesa enable = true; @@ -71,9 +71,8 @@ ]; # Vulkan - driSupport = true; # For 32 bit applications - driSupport32Bit = true; + enable32Bit = true; }; # system.replaceRuntimeDependencies = [ # ({ original = pkgs.mesa; replacement = (import /srv/nixpkgs-mesa { }).pkgs.mesa; }) diff --git a/modules/personal/dev-cli.nix b/modules/personal/dev-cli.nix index b882fda..c02231b 100644 --- a/modules/personal/dev-cli.nix +++ b/modules/personal/dev-cli.nix @@ -3,7 +3,7 @@ gnumake just lowdown wakatime cloc go php fontforge ruby csslint # C/C++ - clang clang-tools glibc gcc gdb valgrind pugixml cmake libusb libusb-compat-0_1 meson + clang clang-tools glibc gcc gdb valgrind pugixml cmake libusb1 libusb-compat-0_1 meson # .NET dotnet-sdk mono # Python diff --git a/modules/personal/fonts.nix b/modules/personal/fonts.nix index d39dd45..4469ad6 100644 --- a/modules/personal/fonts.nix +++ b/modules/personal/fonts.nix @@ -4,6 +4,6 @@ # Note to self: DO NOT INSTALL ADOBE FONTS! corefonts vistafonts liberation_ttf helvetica-neue-lt-std noto-fonts noto-fonts-emoji cm_unicode #symbola # CJK - noto-fonts-cjk arphic-ukai arphic-uming takao wqy_microhei wqy_zenhei + noto-fonts-cjk-sans arphic-ukai arphic-uming takao wqy_microhei wqy_zenhei ]; } diff --git a/modules/personal/hardware-general.nix b/modules/personal/hardware-general.nix index 3f6b681..83a5371 100644 --- a/modules/personal/hardware-general.nix +++ b/modules/personal/hardware-general.nix @@ -12,7 +12,7 @@ # # https://nixos.wiki/wiki/Accelerated_Video_Playback - hardware.opengl = { + hardware.graphics = { enable = true; extraPackages = with pkgs; [ vaapiVdpau @@ -24,7 +24,6 @@ # Sound # - sound.enable = false; # hardware.pulseaudio.enable = true; security.rtkit.enable = true; diff --git a/modules/personal/openbox-de.nix b/modules/personal/openbox-de.nix index aa9a16b..9168419 100644 --- a/modules/personal/openbox-de.nix +++ b/modules/personal/openbox-de.nix @@ -1,7 +1,7 @@ { pkgs, ... }: { environment.systemPackages = with pkgs; [ # Essential libs - dbus cairo libnotify gtk3 yad gnome.zenity gnome.gvfs gmtp at-spi2-atk + dbus cairo libnotify gtk3 yad zenity gnome.gvfs at-spi2-atk # Main apps and their config apps # window manager, compositor, taskbar, notifications, app menu, lockscreen, session manager openbox lxappearance obconf picom nixpkgs-2305.tint2 dunst jgmenu i3lock-color lightdm lightdm-gtk-greeter @@ -11,9 +11,9 @@ # Tray libappindicator networkmanagerapplet pnmixer # File openers - evince gnome.eog nixpkgs-2305.gnome.file-roller cinnamon.nemo-with-extensions gnome.seahorse + evince eog nixpkgs-2305.gnome.file-roller nemo-with-extensions seahorse # System - gnome.gnome-system-monitor udisks gnome.gnome-disk-utility baobab gnome.simple-scan + gnome-system-monitor udisks gnome-disk-utility baobab simple-scan # Theme nixpkgs-mint.cinnamon.mint-themes nixpkgs-mint.cinnamon.mint-y-icons oreo-black-bordered-cursor openbox-theme-collections openbox-blocks-dark @@ -39,7 +39,7 @@ services = { dbus.packages = with pkgs; [ gnome2.GConf ]; - udev.packages = with pkgs; [ gnome.gnome-settings-daemon ]; + udev.packages = with pkgs; [ gnome-settings-daemon ]; udisks2.enable = true; # gnome-disks disk access gnome.gnome-keyring.enable = true; |
