diff --git a/flake.lock b/flake.lock index 7d54e29..0b642ae 100644 --- a/flake.lock +++ b/flake.lock @@ -96,11 +96,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1749570083, - "narHash": "sha256-/y7EWrwsK/fOHYL4aGqGpU/2E4lzePLBtmcpbXH1D7I=", + "lastModified": 1749765011, + "narHash": "sha256-F/Hl8ZJNUdxV+Dw5/KEdS3BfXMZhYUSXMS06wyq/+tc=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "ca879d7ff778aad35626c67219e532e0d034181b", + "rev": "4825ae9d1980f8de8a90affd86e6f0564f813588", "type": "github" }, "original": { @@ -185,11 +185,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1749451322, - "narHash": "sha256-t53R3kSDl4Jie+Ooxi/aQFN2ODRp1tXQSJBevOt3IkQ=", + "lastModified": 1749623906, + "narHash": "sha256-QD7e5WNVj4aWS5mlJZZnLJ6Lg0h5RSyyEFo2I6xBUEQ=", "owner": "nix-community", "repo": "fenix", - "rev": "77de5067629e201436c76f14f96614a19368c4ae", + "rev": "873cccc628f5e39407e319e6711f3b7d6d1f15cc", "type": "github" }, "original": { @@ -415,11 +415,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1749432877, - "narHash": "sha256-z3fWdIANU38HVqgqAhBM0lHq7OTa3Ncxs4Hh/dejEk8=", + "lastModified": 1749738489, + "narHash": "sha256-qjal0TFAqArHqOVdf+Wicn1PIWOkOom+tonW0ou5cns=", "owner": "helix-editor", "repo": "helix", - "rev": "2b26d27416b4b0fb2286bf05aae173ec23dd6592", + "rev": "62f270e5d2fb34a77dd30a3b2e6b4c9fb6f1cfe1", "type": "github" }, "original": { @@ -437,11 +437,11 @@ ] }, "locked": { - "lastModified": 1749526396, - "narHash": "sha256-UL9F76abAk87llXOrcQRjhd5OaOclUd6MIltsqcUZmo=", + "lastModified": 1749649116, + "narHash": "sha256-pCuUfMkhlP+XqW+TXX5Tssk8IE4TpS3MbG7OQtvaQdM=", "owner": "nix-community", "repo": "home-manager", - "rev": "427c96044f11a5da50faf6adaf38c9fa47e6d044", + "rev": "02040b7777f65342b96c7f826a5c6aef95585057", "type": "github" }, "original": { @@ -457,11 +457,11 @@ ] }, "locked": { - "lastModified": 1749400020, - "narHash": "sha256-0nTmHO8AYgRYk5v6zw5oZ3x9nh+feb+Isn7WNe318M0=", + "lastModified": 1749779443, + "narHash": "sha256-r6YTIMprNCYcJcA4oZ0x1wPaHPPHUxb8CnyEeMkhGks=", "owner": "nix-community", "repo": "home-manager", - "rev": "2835e8ba0ad99ba86d4a5e497a962ec9fa35e48f", + "rev": "18f3a0d21c3739a242aafa17c04c5238bbab5a41", "type": "github" }, "original": { @@ -479,11 +479,11 @@ ] }, "locked": { - "lastModified": 1749495634, - "narHash": "sha256-NPifVq2XZGRCsLBoUt6M5YUTiIh23+ubq57w7mSODt8=", + "lastModified": 1749627191, + "narHash": "sha256-bUv8CDE6Uyxak4UkOvRjx5xj6+msEHSpYGeAjkuTnTs=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "c40d2f31f92571bf341497884174a132829ef0fc", + "rev": "f31df4cb6b2eeef6cf0113edb687297be72a69df", "type": "github" }, "original": { @@ -544,11 +544,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1749396815, - "narHash": "sha256-vwr2vLETE4CSi4c6SFoQyP+uBUnvwPPQmn+1D1207ts=", + "lastModified": 1749754824, + "narHash": "sha256-4np99yTzIyosbx8hUvkOaaMoLuQpWIwNmkcYR2F8uXM=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "e6db401ff0aa3b03507b4819f9a44deab3cfcf2f", + "rev": "3308d82c470d2614530536b8a69169ebc61eb1b5", "type": "github" }, "original": { @@ -577,11 +577,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1749327170, - "narHash": "sha256-mBrxeWd7L8oAIh6G2PgKuZAzqyZMyjBpHEAcSSTbhJg=", + "lastModified": 1749752245, + "narHash": "sha256-AOiLFwSsLC86GFPUZQJwW1ZsWKKtbR/G85SbmtkEuuk=", "owner": "YaLTeR", "repo": "niri", - "rev": "f918eabe6a144e78c62c3fc0cfa7fe32e4623e5a", + "rev": "97dfd2b1a00bcb9b765a8fa92ce39d2e0c79abc2", "type": "github" }, "original": { @@ -621,11 +621,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1749424580, - "narHash": "sha256-mt45T2JVYPLwJs3Gi0Hr6Eo5TE+sPyWUDq/H6Qg66ek=", + "lastModified": 1749770917, + "narHash": "sha256-3jOhroFAAKg/vPmgmDnOKUGJp6GfLycUkhyMaJKZ7zg=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "fae5ebd4d5da1db8323a673728ebecc06b9dc653", + "rev": "f5d076cdc61fe2f268d624a34a3df52573620396", "type": "github" }, "original": { @@ -683,11 +683,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1749237914, - "narHash": "sha256-N5waoqWt8aMr/MykZjSErOokYH6rOsMMXu3UOVH5kiw=", + "lastModified": 1749727998, + "narHash": "sha256-mHv/yeUbmL91/TvV95p+mBVahm9mdQMJoqaTVTALaFw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "70c74b02eac46f4e4aa071e45a6189ce0f6d9265", + "rev": "fd487183437963a59ba763c0cc4f27e3447dd6dd", "type": "github" }, "original": { @@ -699,11 +699,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1749173751, - "narHash": "sha256-ENY3y3v6S9ZmLDDLI3LUT8MXmfXg/fSt2eA4GCnMVCE=", + "lastModified": 1749488106, + "narHash": "sha256-b9GIWdF/8jKpCC5JIMgDLZgwe8cEbty2fyTyo1eDFfI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ed29f002b6d6e5e7e32590deb065c34a31dc3e91", + "rev": "8fe3e32e7f210522377c3bcff80931a3284ace6a", "type": "github" }, "original": { @@ -715,11 +715,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1749143949, - "narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=", + "lastModified": 1749285348, + "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d", + "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f", "type": "github" }, "original": { @@ -790,11 +790,11 @@ "nur-rycee": { "flake": false, "locked": { - "lastModified": 1749269004, - "narHash": "sha256-20eV5kl7iP7ODy9ZNW2SAg8bIg2ttud+IWs7UHxsbE0=", + "lastModified": 1749701004, + "narHash": "sha256-KeZvDN/OgLsxf6y8jnyNuj3XvnPuBI3i58a4lcElddc=", "owner": "rycee", "repo": "nur-expressions", - "rev": "c579adeca940c70ac7dd661a1cda662f2d1fb158", + "rev": "f70d23962d858c8996558ff30e3f0af205fe0f3a", "type": "gitlab" }, "original": { @@ -829,11 +829,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1749419176, - "narHash": "sha256-Hs0vidgwvBiBuqNjR5oCQMMGUfUYwwnyxLShg3yzhWU=", + "lastModified": 1749558764, + "narHash": "sha256-R9vQiqez6Gm0ARJKgbsAeLyX493vwIaexOUAz0vDhak=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "9fc1b9076cf49c7f54497df9cfa4485a63f14d3e", + "rev": "9c3476d225ccc90c081280c2a20e9f7d8a200325", "type": "github" }, "original": { @@ -872,11 +872,11 @@ ] }, "locked": { - "lastModified": 1749350575, - "narHash": "sha256-ltLegOYrp69v/7BXlNfSwUPrt2DvF7N668pV4a6rWRA=", + "lastModified": 1749695868, + "narHash": "sha256-debjTLOyqqsYOUuUGQsAHskFXH5+Kx2t3dOo/FCoNRA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "24d5806474b0779d373f381f00d75ad51fd45099", + "rev": "55f914d5228b5c8120e9e0f9698ed5b7214d09cd", "type": "github" }, "original": { @@ -892,11 +892,11 @@ ] }, "locked": { - "lastModified": 1747603214, - "narHash": "sha256-lAblXm0VwifYCJ/ILPXJwlz0qNY07DDYdLD+9H+Wc8o=", + "lastModified": 1749592509, + "narHash": "sha256-VunQzfZFA+Y6x3wYi2UE4DEQ8qKoAZZCnZPUlSoqC+A=", "owner": "Mic92", "repo": "sops-nix", - "rev": "8d215e1c981be3aa37e47aeabd4e61bb069548fd", + "rev": "50754dfaa0e24e313c626900d44ef431f3210138", "type": "github" }, "original": { @@ -933,11 +933,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1749398498, - "narHash": "sha256-Usx6sGnT/D8ZnWiZg+J1OY3dp4ZssMQiN1XeXcsL/cs=", + "lastModified": 1749767991, + "narHash": "sha256-tgKABKKmQMEU6Mlsi5fJ37AgWCQVnf8bQUd2Pv9x/sk=", "owner": "danth", "repo": "stylix", - "rev": "5869510e48e64d916dc6905dc664a02b0f85f1bd", + "rev": "343938594e57483635d6fb34d90c227e8dd46072", "type": "github" }, "original": { diff --git a/flake/nixos.nix b/flake/nixos.nix index 10cd557..bf2058a 100644 --- a/flake/nixos.nix +++ b/flake/nixos.nix @@ -12,7 +12,7 @@ in { flake = { nixosModules.default = defaultNixosModule; nixosConfigurations = let - makeNixConfiguration = hostName: + makeNixosConfiguration = hostName: nixpkgs.lib.nixosSystem { modules = [defaultNixosModule] @@ -31,7 +31,7 @@ in { ] |> ( with lib; - flip genAttrs makeNixConfiguration + flip genAttrs makeNixosConfiguration ); }; } diff --git a/home/david/modules/programs/niri/config.nix b/home/david/modules/programs/niri/config.nix index 060606c..0e9986a 100644 --- a/home/david/modules/programs/niri/config.nix +++ b/home/david/modules/programs/niri/config.nix @@ -26,13 +26,11 @@ plain ; - sh = getExe' config.programs.bash.package "sh"; swaylock = getExe config.programs.swaylock.package; fuzzel = getExe config.programs.fuzzel.package; waybar = getExe config.programs.waybar.package; swaync = getExe config.services.swaync.package; fcitx5 = lib.getExe' osConfig.i18n.inputMethod.package "fcitx5"; - sleep = lib.getExe' pkgs.coreutils "sleep"; polkit-kde-agent = getExe' pkgs.kdePackages.polkit-kde-agent-1 "polkit-kde-agent"; wpctl = getExe' pkgs.wireplumber "wpctl"; diff --git a/home/modules/programs/atuin.nix b/home/modules/programs/atuin.nix index 1a0e037..8e84e5f 100644 --- a/home/modules/programs/atuin.nix +++ b/home/modules/programs/atuin.nix @@ -18,6 +18,9 @@ in { logLevel = "trace"; }; enable = true; + flags = [ + "--disable-up-arrow" + ]; settings = { auto_sync = true; update_check = false; diff --git a/home/modules/programs/eza.nix b/home/modules/programs/eza.nix index 0eddc82..03e2d34 100644 --- a/home/modules/programs/eza.nix +++ b/home/modules/programs/eza.nix @@ -4,15 +4,29 @@ ... }: let cfg = config.youthlic.programs.eza; + fish-cfg = config.youthlic.programs.fish; + bash-cfg = config.youthlic.programs.bash; + ion-cfg = config.youthlic.programs.ion; in { options = { youthlic.programs.eza = { enable = lib.mkEnableOption "eza"; }; }; - config = { - programs.eza = lib.mkIf cfg.enable { - enable = true; - }; - }; + config = lib.mkMerge [ + (lib.mkIf cfg.enable { + programs.eza = { + enable = true; + }; + }) + (lib.mkIf (cfg.enable && fish-cfg.enable) { + programs.eza.enableFishIntegration = true; + }) + (lib.mkIf (cfg.enable && bash-cfg.enable) { + programs.eza.enableBashIntegration = true; + }) + (lib.mkIf (cfg.enable && ion-cfg.enable) { + programs.eza.enableIonIntegration = true; + }) + ]; } diff --git a/home/modules/programs/fzf.nix b/home/modules/programs/fzf.nix index 5132f09..3d9c918 100644 --- a/home/modules/programs/fzf.nix +++ b/home/modules/programs/fzf.nix @@ -4,15 +4,25 @@ ... }: let cfg = config.youthlic.programs.fzf; + fish-cfg = config.youthlic.programs.fish; + bash-cfg = config.youthlic.programs.bash; in { options = { youthlic.programs.fzf = { enable = lib.mkEnableOption "fzf"; }; }; - config = { - programs.fzf = lib.mkIf cfg.enable { - enable = true; - }; - }; + config = lib.mkMerge [ + (lib.mkIf cfg.enable { + programs.fzf = { + enable = true; + }; + }) + (lib.mkIf (cfg.enable && fish-cfg.enable) { + programs.fzf.enableFishIntegration = true; + }) + (lib.mkIf (cfg.enable && bash-cfg.enable) { + programs.fzf.enableBashIntegration = true; + }) + ]; } diff --git a/nixos/configurations/Akun/default.nix b/nixos/configurations/Akun/default.nix index c205080..9f2fba5 100644 --- a/nixos/configurations/Akun/default.nix +++ b/nixos/configurations/Akun/default.nix @@ -66,7 +66,7 @@ services.scx.enable = true; boot = { - kernelPackages = pkgs.linuxPackages_cachyos-lto; + kernelPackages = pkgs.linuxPackages_cachyos; loader.systemd-boot.enable = true; loader.efi.canTouchEfiVariables = true; }; diff --git a/nixos/configurations/Tytonidae/default.nix b/nixos/configurations/Tytonidae/default.nix index 16f9b93..82a74ec 100644 --- a/nixos/configurations/Tytonidae/default.nix +++ b/nixos/configurations/Tytonidae/default.nix @@ -100,7 +100,7 @@ services.scx.enable = true; boot = { - kernelPackages = pkgs.linuxPackages_cachyos-lto; + kernelPackages = pkgs.linuxPackages_cachyos; loader.systemd-boot.enable = true; loader.efi.canTouchEfiVariables = true; initrd.systemd.enable = true; diff --git a/nixos/modules/default.nix b/nixos/modules/default.nix index 8147afe..f3f153d 100644 --- a/nixos/modules/default.nix +++ b/nixos/modules/default.nix @@ -35,6 +35,7 @@ additions ]; }; + system.rebuild.enableNg = true; environment.systemPackages = with pkgs; [ deploy-rs ]; diff --git a/nixos/modules/programs/radicle.nix b/nixos/modules/programs/radicle.nix index 120a0ef..153503f 100644 --- a/nixos/modules/programs/radicle.nix +++ b/nixos/modules/programs/radicle.nix @@ -46,6 +46,7 @@ in { "rad:z4D5UCArafTzTQpDZNQRuqswh3ury" "rad:z4V1sjrXqjvFdnCUbxPFqd5p4DtH5" "rad:z6cFWeWpnZNHh9rUW8phgA3b5yGt" + "rad:z4Uh671FzoooaHjLvmtW9BtGMF9qm" ]; }; };