diff --git a/flake.lock b/flake.lock index a386be3..ab73217 100644 --- a/flake.lock +++ b/flake.lock @@ -201,11 +201,11 @@ ] }, "locked": { - "lastModified": 1706473109, - "narHash": "sha256-iyuAvpKTsq2u23Cr07RcV5XlfKExrG8gRpF75hf1uVc=", + "lastModified": 1707114923, + "narHash": "sha256-LDYPWa+BgxHSNEye93SyIPgz5u3RAfh78P9KyO+rQzI=", "owner": "nix-community", "repo": "home-manager", - "rev": "d634c3abafa454551f2083b054cd95c3f287be61", + "rev": "afcedcf2c8e424d0465e823cf833eb3adebe1db7", "type": "github" }, "original": { @@ -225,11 +225,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1706722456, - "narHash": "sha256-oZkX+r/dA63f09vXLk1HrCprIKtdw0LXhqG2cAw6MjA=", + "lastModified": 1707098342, + "narHash": "sha256-dU5m6Cd4+WQZal2ICDVf1kww/dNzo1YUWRxWeCctEig=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "4f804d5f962070c531dea5025e61be8a0da8129e", + "rev": "84ab8d11e8951a6551d1e1bf87796a8589da6d47", "type": "github" }, "original": { @@ -306,24 +306,6 @@ "type": "github" } }, - "musnix": { - "inputs": { - "nixpkgs": "nixpkgs_3" - }, - "locked": { - "lastModified": 1702456985, - "narHash": "sha256-mnjCk8mINY4t5uIwP2eR19FOQXHTCO68+KsgKFTv1NI=", - "owner": "musnix", - "repo": "musnix", - "rev": "cf93a72da8ad677864045e9a5dd32170378d9a62", - "type": "github" - }, - "original": { - "owner": "musnix", - "repo": "musnix", - "type": "github" - } - }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -413,27 +395,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1690272529, - "narHash": "sha256-MakzcKXEdv/I4qJUtq/k/eG+rVmyOZLnYNC2w1mB59Y=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "ef99fa5c5ed624460217c31ac4271cfb5cb2502c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1706550542, - "narHash": "sha256-UcsnCG6wx++23yeER4Hg18CXWbgNpqNXcHIo5/1Y+hc=", + "lastModified": 1706913249, + "narHash": "sha256-x3M7iV++CsvRXI1fpyFPduGELUckZEhSv0XWnUopAG8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "97b17f32362e475016f942bbdfda4a4a72a8a652", + "rev": "e92b6015881907e698782c77641aa49298330223", "type": "github" }, "original": { @@ -517,8 +483,7 @@ "home-manager": "home-manager_2", "hyprland": "hyprland", "hyprland-hyprfocus": "hyprland-hyprfocus", - "musnix": "musnix", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_3" } }, "rustaceanvim": { diff --git a/flake.nix b/flake.nix index ab028a9..b0a06c7 100644 --- a/flake.nix +++ b/flake.nix @@ -21,9 +21,6 @@ # My neovim configuration using nixvim. custom-neovim.url = "github:wizardlink/neovim"; - - # Real time scheduling for audio work. - musnix.url = "github:musnix/musnix"; }; outputs = @@ -31,7 +28,6 @@ , home-manager , hyprland , nixpkgs - , musnix , ... }@inputs: { nixosConfigurations.nixos = @@ -40,8 +36,6 @@ modules = [ ./nixos.nix - musnix.nixosModules.musnix - hyprland.nixosModules.default { programs.hyprland.enable = true; diff --git a/nixos.nix b/nixos.nix index a7801d9..6e38ff4 100644 --- a/nixos.nix +++ b/nixos.nix @@ -44,14 +44,7 @@ ## # Kernel - musnix = { - enable = true; - - kernel = { - realtime = true; - packages = pkgs.linuxPackages_latest_rt; - }; - }; + boot.kernelPackages = pkgs.linuxPackages_xanmod_latest; # Add AMD drivers. boot.initrd.kernelModules = [ "amdgpu" ]; @@ -212,8 +205,10 @@ # Configure keymap in X11 services.xserver = { - layout = "us"; - xkbVariant = ""; + xkb = { + layout = "us"; + variant = ""; + }; }; ##