From 3fa2999834222a94cd3cf8783c27ff9f667cd177 Mon Sep 17 00:00:00 2001 From: Nathan Anderson Date: Tue, 24 Dec 2024 11:15:18 -0700 Subject: [PATCH] Switched to xanmod kernel, rebase --- flake.lock | 114 ++++++++++++++++++-------- nate/desktop-configuration.nix | 3 +- nate/dotfiles/foot/foot.ini | 1 - nate/modules/home-manager/home.nix | 7 +- nate/modules/sway/sway_conf.nix | 9 +- nate/nixos/hardware-configuration.nix | 6 ++ 6 files changed, 94 insertions(+), 46 deletions(-) diff --git a/flake.lock b/flake.lock index 14594bc..096c834 100644 --- a/flake.lock +++ b/flake.lock @@ -1,65 +1,86 @@ { "nodes": { - "home-manager": { + "flake-parts": { "inputs": { - "nixpkgs": [ - "nixpkgs-unstable" + "nixpkgs-lib": [ + "nur", + "nixpkgs" ] }, "locked": { - "lastModified": 1718530513, - "narHash": "sha256-BmO8d0r+BVlwWtMLQEYnwmngqdXIuyFzMwvmTcLMee8=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1734366194, + "narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=", "owner": "nix-community", "repo": "home-manager", - "rev": "a1fddf0967c33754271761d91a3d921772b30d0e", + "rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.05", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1719426051, - "narHash": "sha256-yJL9VYQhaRM7xs0M867ZFxwaONB9T2Q4LnGo1WovuR4=", + "lastModified": 1734323986, + "narHash": "sha256-m/lh6hYMIWDYHCAsn81CDAiXoT3gmxXI9J987W5tZrE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "89c49874fb15f4124bf71ca5f42a04f2ee5825fd", + "rev": "394571358ce82dff7411395829aa6a3aad45b907", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-23": { - "locked": { - "lastModified": 1719234068, - "narHash": "sha256-1AjSIedDC/aERt24KsCUftLpVppW61S7awfjGe7bMio=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "90bd1b26e23760742fdcb6152369919098f05417", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-23.11", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1726937504, - "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=", + "lastModified": 1734119587, + "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9357f4f23713673f310988025d9dc261c20e70c6", + "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1734119587, + "narHash": "sha256-AKU6qqskl0yf2+JdRdD0cfxX4b9x3KKV5RqA6wijmPM=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "3566ab7246670a43abd2ffa913cc62dad9cdf7d5", "type": "github" }, "original": { @@ -70,12 +91,17 @@ } }, "nur": { + "inputs": { + "flake-parts": "flake-parts", + "nixpkgs": "nixpkgs_2", + "treefmt-nix": "treefmt-nix" + }, "locked": { - "lastModified": 1719509062, - "narHash": "sha256-IYlezkrqdHmO/SXShve0PhDZVwLuHYweaRyrLrvta5E=", + "lastModified": 1734477737, + "narHash": "sha256-cPCcKzLYCWS6ywHdJvn5DzaqOg8ppsv4E0giuaDQwYg=", "owner": "nix-community", "repo": "NUR", - "rev": "0713da5785faf081a4fa06500890f8726755f464", + "rev": "24a04cb00533ff6bd9098d303a789764afe81193", "type": "github" }, "original": { @@ -88,10 +114,30 @@ "inputs": { "home-manager": "home-manager", "nixpkgs": "nixpkgs", - "nixpkgs-23": "nixpkgs-23", "nixpkgs-unstable": "nixpkgs-unstable", "nur": "nur" } + }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733222881, + "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "49717b5af6f80172275d47a418c9719a31a78b53", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } } }, "root": "root", diff --git a/nate/desktop-configuration.nix b/nate/desktop-configuration.nix index 9cdbf2c..f52045c 100644 --- a/nate/desktop-configuration.nix +++ b/nate/desktop-configuration.nix @@ -42,9 +42,8 @@ in ]; nixpkgs.overlays = [ - inputs.nur.overlay + inputs.nur.overlays.default ]; - # Enable flakes feature nix.settings.experimental-features = [ diff --git a/nate/dotfiles/foot/foot.ini b/nate/dotfiles/foot/foot.ini index cbff81e..74cf9ac 100644 --- a/nate/dotfiles/foot/foot.ini +++ b/nate/dotfiles/foot/foot.ini @@ -1,6 +1,5 @@ [main] font=Hurmit Nerd Font Mono:size=12 -notify=yes selection-target=clipboard diff --git a/nate/modules/home-manager/home.nix b/nate/modules/home-manager/home.nix index ef4334b..8ead4cc 100644 --- a/nate/modules/home-manager/home.nix +++ b/nate/modules/home-manager/home.nix @@ -62,8 +62,8 @@ # flutter316 docker docker-compose - fossil - fnc + # fossil + # fnc jq python310 ### LSP's @@ -137,7 +137,8 @@ obs-studio prusa-slicer yubioath-flutter - gnome.gnome-disk-utility + gnome-disk-utility + handbrake kdePackages.filelight # diff --git a/nate/modules/sway/sway_conf.nix b/nate/modules/sway/sway_conf.nix index db3beac..a880af3 100644 --- a/nate/modules/sway/sway_conf.nix +++ b/nate/modules/sway/sway_conf.nix @@ -28,6 +28,7 @@ programs.sway.wrapperFeatures.gtk = true; nixpkgs.config.allowUnfree = config.swaywm.useNonFree; + # nixpkgs.config.allowUnsupportedSystem = true; # For R2ModMan # nixpkgs.config.permittedInsecurePackages = [ # "electron-25.9.0" @@ -163,7 +164,6 @@ pulse.enable = true; wireplumber.enable = true; }; - sound.enable = false; ### ## Misc @@ -188,18 +188,15 @@ services.xserver.videoDrivers = [ "amdgpu" ]; # Enable HIP systemd.tmpfiles.rules = [ - "L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}" + "L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}" ]; hardware.graphics = { # Mesa enable = true; enable32Bit = true; - # Vulkan - driSupport = true; # Rocm support extraPackages = with pkgs; [ - rocm-opencl-icd - rocm-opencl-runtime + rocmPackages.clr.icd ]; }; }; diff --git a/nate/nixos/hardware-configuration.nix b/nate/nixos/hardware-configuration.nix index 04ef11e..1876744 100644 --- a/nate/nixos/hardware-configuration.nix +++ b/nate/nixos/hardware-configuration.nix @@ -13,6 +13,12 @@ boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; + # Use xanmod kernel. List kernels by running: + # `nix repl` + # > :l + # > pkgs.linuxPackages + boot.kernelPackages = pkgs.linuxPackages_xanmod; + fileSystems."/" = { device = "/dev/disk/by-uuid/ab6f54b1-f9ba-482a-b1b4-ac3ebdbfe751"; fsType = "ext4";