diff --git a/config/hosts/aspects/doloro-desktop/host.nix b/config/hosts/aspects/doloro-desktop/host.nix index be36eea..99b25f1 100644 --- a/config/hosts/aspects/doloro-desktop/host.nix +++ b/config/hosts/aspects/doloro-desktop/host.nix @@ -4,12 +4,14 @@ pkgs, inputs, __findFile, + lib, ... }: { den.aspects.desktop = { includes = [ modules.nix + modules.cachyos-kernel ]; nixos = { pkgs, config, ... }: @@ -26,7 +28,8 @@ networking.hostName = "doloroo-main"; # Define your hostname. boot.kernelPackages = - inputs.nix-cachyos-kernel.legacyPackages.x86_64-linux.linuxPackages-cachyos-lts-lto; + inputs.nix-cachyos-kernel.legacyPackages.x86_64-linux.linuxPackages-cachyos-latest-lto-x86_64-v3; + boot.initrd.verbose = false; boot.kernelParams = [ "boot.shell_on_fail" diff --git a/config/hosts/aspects/doloro-laptop/host.nix b/config/hosts/aspects/doloro-laptop/host.nix index 2c5875b..2781b84 100644 --- a/config/hosts/aspects/doloro-laptop/host.nix +++ b/config/hosts/aspects/doloro-laptop/host.nix @@ -37,7 +37,7 @@ # boot.kernelPackages = pkgs.linuxPackages_6_12; # Hibernate works on 6.12 but not on latest # boot.kernelPackages = pkgs.linuxPackages_latest; # Unpinned the linux version for now.. as i am not using hibernate that often boot.kernelPackages = - inputs.nix-cachyos-kernel.legacyPackages.x86_64-linux.linuxPackages-cachyos-lts-lto; + inputs.nix-cachyos-kernel.legacyPackages.x86_64-linux.linuxPackages-cachyos-latest-lto-x86_64-v3; networking.hostName = "doloro-nixos-laptop"; # Define your hostname. security.rtkit.enable = true; diff --git a/config/modules/cachyos-kernel.nix b/config/modules/cachyos-kernel.nix index e2234c7..85bfb52 100644 --- a/config/modules/cachyos-kernel.nix +++ b/config/modules/cachyos-kernel.nix @@ -9,4 +9,11 @@ nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel/release"; }; # inputs.nix-cachyos-kernel.legacyPackages.x86_64-linux.linuxPackages-cachyos-lts-lto; + modules.cachyos-kernel = { + nixos = { + nixpkgs.overlays = [ + inputs.nix-cachyos-kernel.overlays.pinned + ]; + }; + }; } diff --git a/config/modules/hyprland/doloro-settings.nix b/config/modules/hyprland/doloro-settings.nix index 408d7a4..8ba461c 100644 --- a/config/modules/hyprland/doloro-settings.nix +++ b/config/modules/hyprland/doloro-settings.nix @@ -143,7 +143,7 @@ "$mainMod, L, exec, wlogout" ( "$mainMod, S, exec, " - + ''wayfreeze --after-freeze-cmd 'grim -g "$(slurp -d)" - | wl-copy -t image/png;killall wayfreeze' --hide-cursor'' + + ''wayfreeze --after-freeze-cmd 'grim -g "$(slurp)" - | wl-copy -t image/png; killall wayfreeze' --hide-cursor'' ) "$mainMod, F, fullscreen" "$mainMod, mouse_down, workspace, e+1" diff --git a/config/modules/nixvim/default.nix b/config/modules/nixvim/default.nix index ee7b6e5..f8ca8ce 100644 --- a/config/modules/nixvim/default.nix +++ b/config/modules/nixvim/default.nix @@ -45,6 +45,7 @@ todo-comments.enable = true; lsp-status.enable = true; transparent.enable = true; + which-key.enable = true; conform-nvim = { enable = true; settings = { diff --git a/flake.lock b/flake.lock index 7e258be..9d3b0ef 100644 --- a/flake.lock +++ b/flake.lock @@ -104,11 +104,11 @@ "cachyos-kernel": { "flake": false, "locked": { - "lastModified": 1773637879, - "narHash": "sha256-hFKu2SaRoqt6+zbmcFW6A0AbBENIX8XooJLXQWa3sLc=", + "lastModified": 1774112313, + "narHash": "sha256-Wgpr9XN55jOT5PgpxbKWCnaNjjH0F9RygqG1fQ4DmWg=", "owner": "CachyOS", "repo": "linux-cachyos", - "rev": "fa09a5bc69d3e7feeed9b1402c7df06c8170402a", + "rev": "7be1be63b167f0cdf039b865b3852e73e5310374", "type": "github" }, "original": { @@ -120,11 +120,11 @@ "cachyos-kernel-patches": { "flake": false, "locked": { - "lastModified": 1773635524, - "narHash": "sha256-JErpxWTdoHq4JuDerfsbPA60FmWOxK4oX9UL9CcsP/Q=", + "lastModified": 1774023710, + "narHash": "sha256-Oc+4K6edCv0fdvfe6UW+OpJiXYWkXRrOH9TDMNwi+J8=", "owner": "CachyOS", "repo": "kernel-patches", - "rev": "5544a0679fd6f6fb714e275514449c4ab9db2a53", + "rev": "a4e26fa95257ac09bd42930334399b0eabd5b5b1", "type": "github" }, "original": { @@ -135,11 +135,11 @@ }, "den": { "locked": { - "lastModified": 1773802746, - "narHash": "sha256-iJUVWJJszikRf+eqm0oj3g1SUIRBJNWdiDgFucMUTUU=", + "lastModified": 1774223159, + "narHash": "sha256-aPfuEzOcd1Jaj+XkELOgDSX8DpM8YQCX1z8KKpKGJtY=", "owner": "vic", "repo": "den", - "rev": "91bf41d5a40c043a8a1492455125597f6b3dbba2", + "rev": "5728cf32f2f2a3c4b0e34ecfb211ce8c0131a3a7", "type": "github" }, "original": { @@ -153,11 +153,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1773506317, - "narHash": "sha256-qWKbLUJpavIpvOdX1fhHYm0WGerytFHRoh9lVck6Bh0=", + "lastModified": 1773889306, + "narHash": "sha256-PAqwnsBSI9SVC2QugvQ3xeYCB0otOwCacB1ueQj2tgw=", "owner": "nix-community", "repo": "disko", - "rev": "878ec37d6a8f52c6c801d0e2a2ad554c75b9353c", + "rev": "5ad85c82cc52264f4beddc934ba57f3789f28347", "type": "github" }, "original": { @@ -407,11 +407,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1773827691, - "narHash": "sha256-Yc3YGaLs5fl7aVD4VA6GJVOEvEhm1JnHhc9SI3UdTdE=", + "lastModified": 1774003732, + "narHash": "sha256-6tDR417MA6RPFN90kTI+YZOanjeb01di8bVp3ME6JJw=", "owner": "vikingnope", "repo": "helium-browser-nix-flake", - "rev": "6b7839f174ae52077b40f19f36aa2acc9b029e51", + "rev": "67aa32deed6927e75a6e3fe70004bb3ad82d650c", "type": "github" }, "original": { @@ -427,11 +427,11 @@ ] }, "locked": { - "lastModified": 1773810247, - "narHash": "sha256-6Vz1Thy/1s7z+Rq5OfkWOBAdV4eD+OrvDs10yH6xJzQ=", + "lastModified": 1774210133, + "narHash": "sha256-yeiWCY9aAUUJ3ebMVjs0UZXRnT5x90MCtpbpOWiXrvM=", "owner": "nix-community", "repo": "home-manager", - "rev": "d47357a4c806d18a3e853ad2699eaec3c01622e7", + "rev": "c6fe2944ad9f2444b2d767c4a5edee7c166e8a95", "type": "github" }, "original": { @@ -515,11 +515,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1773774870, - "narHash": "sha256-WJi1VzcGBvLntY1LzoQOPFyH3CJP/AEyERhXvF9kWbE=", + "lastModified": 1774221855, + "narHash": "sha256-MxUfbRbg1ixI55BmLxI4XU6TYk8F9/ttLWIX9N9hQXA=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "775951783c2e820ead180aca4356d4a98df9d17a", + "rev": "c8b283f5ac8c370794605d61f2d1af27c6018dd9", "type": "github" }, "original": { @@ -692,11 +692,11 @@ ] }, "locked": { - "lastModified": 1773436263, - "narHash": "sha256-n+2xFJngUkBqUJD5FsbVnYEHBTyDFSqtBIwQIGPXWWo=", + "lastModified": 1773948364, + "narHash": "sha256-S76omfIVQ1TpGiXFbqih6o6XcH3sA5+5QI+SXB4HvlY=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "5e228db6821380a5875d5643176c5c46a47b8134", + "rev": "b85b779e3e3a1adcd9b098e3447cf48f9e780b35", "type": "github" }, "original": { @@ -820,11 +820,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1773809319, - "narHash": "sha256-ZuMZEuxqWneGaK+HAXz50JyCmtFo0neo6mp6F2NWj24=", + "lastModified": 1774253924, + "narHash": "sha256-5Zi+RYoRvax1gATaNC80MYR+6uBJ3F+uUZ2KL3HyTWg=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "c4ee62058cd37d7b842c3b081917f792efee9082", + "rev": "36f3b7b93efde38c4c40daeaee80a62afb550812", "type": "github" }, "original": { @@ -875,11 +875,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1773804995, - "narHash": "sha256-LL6EG35pbxgjsqYIpwUnpHGDmKFYttE+BILBNhsEaJk=", + "lastModified": 1774115689, + "narHash": "sha256-tclbyX/ww0/uDmxWfL2E1yHHEVjMfp+G5AOforlgmYc=", "owner": "xddxdd", "repo": "nix-cachyos-kernel", - "rev": "3286b7ecf1d864e2be050af78aa633d4e3ae8fdb", + "rev": "46d37ddfe759b09e722567d3a0d2c5d77017fddc", "type": "github" }, "original": { @@ -891,11 +891,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1772771118, - "narHash": "sha256-xWzaTvmmACR/SRWtABgI/Z97lcqwJAeoSd5QW1KdK1s=", + "lastModified": 1773628058, + "narHash": "sha256-hpXH0z3K9xv0fHaje136KY872VT2T5uwxtezlAskQgY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e38213b91d3786389a446dfce4ff5a8aaf6012f2", + "rev": "f8573b9c935cfaa162dd62cc9e75ae2db86f85df", "type": "github" }, "original": { @@ -922,11 +922,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1773705440, - "narHash": "sha256-xB30bbAp0e7ogSEYyc126mAJMt4FRFh8wtm6ADE1xuM=", + "lastModified": 1773964973, + "narHash": "sha256-NV/J+tTER0P5iJhUDL/8HO5MDjDceLQPRUYgdmy5wXw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "48652e9d5aea46e555b3df87354280d4f29cd3a3", + "rev": "812b3986fd1568f7a858f97fcf425ad996ba7d25", "type": "github" }, "original": { @@ -967,11 +967,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1773738184, - "narHash": "sha256-zWRjT5oPabNCiC1A3QkFXpfnsgUjyg6fUZWC+IiiZH0=", + "lastModified": 1774106199, + "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "41a2715cc472025a19bc0eb9dc4ee8b7406bfa6f", + "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655", "type": "github" }, "original": { @@ -983,11 +983,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1773628058, - "narHash": "sha256-YgVQzPaKa5eVf/rGA5Rn7BWJcP0T98JkE+2KuKVTyzA=", - "rev": "f8573b9c935cfaa162dd62cc9e75ae2db86f85df", + "lastModified": 1773840656, + "narHash": "sha256-SpvueJPdKD+U/Q2btT3e3rAYgbPQP6nbcYYfK3BJQDA=", + "rev": "9cf7092bdd603554bd8b63c216e8943cf9b12512", "type": "tarball", - "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre963857.f8573b9c935c/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre964972.9cf7092bdd60/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -1258,11 +1258,11 @@ ] }, "locked": { - "lastModified": 1773698643, - "narHash": "sha256-VCiDjE8kNs8uCAK73Ezk1r3fFuc4JepvW07YFqaN968=", + "lastModified": 1774154798, + "narHash": "sha256-zsTuloDSdKf+PrI1MsWx5z/cyGEJ8P3eERtAfdP8Bmg=", "owner": "Mic92", "repo": "sops-nix", - "rev": "8237de83e8200d16fe0c4467b02a1c608ff28044", + "rev": "3e0d543e6ba6c0c48117a81614e90c6d8c425170", "type": "github" }, "original": { @@ -1292,11 +1292,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1773792048, - "narHash": "sha256-Oy9PCLG3vtflFBWcJd8c/EB3h5RU7ABAIDWn6JrGf6o=", + "lastModified": 1774124764, + "narHash": "sha256-Poz9WTjiRlqZIf197CrMMJfTifZhrZpbHFv0eU1Nhtg=", "owner": "nix-community", "repo": "stylix", - "rev": "3f2f9d307fe58c6abe2a16eb9b62c42d53ef5ee1", + "rev": "e31c79f571c5595a155f84b9d77ce53a84745494", "type": "github" }, "original": {