diff --git a/flake.lock b/flake.lock index f2dbe00..8943ab2 100644 --- a/flake.lock +++ b/flake.lock @@ -90,11 +90,11 @@ "bt-tracker": { "flake": false, "locked": { - "lastModified": 1746720600, - "narHash": "sha256-HRa7/lX6Cz1+c0Bo0mdTgyTCAKV17I45N7F41IUd0/c=", + "lastModified": 1746864607, + "narHash": "sha256-1+IXJn2krSWeuLoLlTT9/F/Ej0f9yKxAbaM+ya/8YAY=", "owner": "XIU2", "repo": "TrackersListCollection", - "rev": "b90418d8ee2ef9a999dd8c412393f95cc711035d", + "rev": "8717ac5dd34f91c21c591235e2ba17d22cd9142f", "type": "github" }, "original": { @@ -157,11 +157,11 @@ ] }, "locked": { - "lastModified": 1746695594, - "narHash": "sha256-pAAWYs3S+/tY65vemHZdVSXpeIz4JINEJZoPoBjr8JU=", + "lastModified": 1746729224, + "narHash": "sha256-9R4sOLAK1w3Bq54H3XOJogdc7a6C2bLLmatOQ+5pf5w=", "owner": "nix-community", "repo": "disko", - "rev": "6bb82b77ce140137177e30df067759931ab60a73", + "rev": "85555d27ded84604ad6657ecca255a03fd878607", "type": "github" }, "original": { @@ -352,11 +352,11 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1746649518, - "narHash": "sha256-ogOT0WwOy8rY5vhJ5JfVOa3qc6sbDxRAMQAQIjCz1gk=", + "lastModified": 1746806042, + "narHash": "sha256-Hx92i3f5IjHaWpReyCKvGdqG55bZFU3wxGzA3wv9VLA=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "bcff488095cab023f26bb7bbfaf674cb0086ef87", + "rev": "7f9bb3c0e54f585e11259bc0c9064813d061929c", "type": "github" }, "original": { @@ -432,20 +432,17 @@ }, "helix": { "inputs": { - "flake-utils": [ - "flake-utils" - ], "nixpkgs": [ "nixpkgs" ], "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1746710534, - "narHash": "sha256-OkPewzZXoV3CI7nHln2/Y5hPKVe0NuwNzFQnOveOsv4=", + "lastModified": 1746882514, + "narHash": "sha256-1f7Mis5Wj24jkQVxER5mbjBy8ZgQgEZhOMwQwBCSRfY=", "owner": "helix-editor", "repo": "helix", - "rev": "e4ef096945638850ad1b383c49cd197e1458c614", + "rev": "4c8600967c5d6f7cc5f15eb8e6d50f68cfe99704", "type": "github" }, "original": { @@ -462,11 +459,11 @@ ] }, "locked": { - "lastModified": 1746719124, - "narHash": "sha256-KOL73WIjO00ds1oIe+5HAcGcpd/TfE6dymmmYbiSlYM=", + "lastModified": 1746798521, + "narHash": "sha256-axfz/jBEH9XHpS7YSumstV7b2PrPf7L8bhWUtLBv3nA=", "owner": "nix-community", "repo": "home-manager", - "rev": "3c59c5132b64e885faca381e713b579dcbddba75", + "rev": "e95a7c5b6fa93304cd2fd78cf676c4f6d23c422c", "type": "github" }, "original": { @@ -486,11 +483,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1746717416, - "narHash": "sha256-MDL5/PMRdWnKt6QtkVrEejdyMKUShoxRLTqtrbpRWys=", + "lastModified": 1746871470, + "narHash": "sha256-cFjXllMbOwnU/va6LrRXMgZOLBGhYUuIXb7fqtsGgrk=", "owner": "jj-vcs", "repo": "jj", - "rev": "da6d564e266a663bbce52c2a1f13a76b6a6ce967", + "rev": "1194b94e51155f7955be16dfbc8c972f0672be2c", "type": "github" }, "original": { @@ -502,11 +499,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1742622332, - "narHash": "sha256-z652gNdFc/95Fheq4DzVObERYRo+j9RdCF6tzkR8r80=", - "rev": "6059cbb031e49e05dd5d16208e2e50d3ab2611db", + "lastModified": 1746827286, + "narHash": "sha256-qCRBy8Bbh5XhPalPkhonxNgfsbw3lP0UIXBLSrhxAvI=", + "rev": "dcb0a97000d50b2868ed4f8d9fd465c5a5b8eb3a", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/6059cbb031e49e05dd5d16208e2e50d3ab2611db.tar.gz?rev=6059cbb031e49e05dd5d16208e2e50d3ab2611db" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/dcb0a97000d50b2868ed4f8d9fd465c5a5b8eb3a.tar.gz?rev=dcb0a97000d50b2868ed4f8d9fd465c5a5b8eb3a" }, "original": { "type": "tarball", @@ -525,15 +522,16 @@ ] }, "locked": { - "lastModified": 1742945498, - "narHash": "sha256-MB/b/xcDKqaVBxJIIxwb81r8ZiGLeKEcqokATRRroo8=", - "ref": "refs/heads/main", - "rev": "fa69ae26cc32dda178117b46487c2165c0e08316", - "revCount": 138, + "lastModified": 1746839156, + "narHash": "sha256-4wPryIk4yXSmxEBmxMsMaeG/7as5EXQxVXs+LjTY8fI=", + "ref": "release-2.93", + "rev": "4ca269a38949de3ef7f47da25576dc8974855f8f", + "revCount": 141, "type": "git", "url": "https://git.lix.systems/lix-project/nixos-module" }, "original": { + "ref": "release-2.93", "type": "git", "url": "https://git.lix.systems/lix-project/nixos-module" } @@ -604,11 +602,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1746702551, - "narHash": "sha256-ygR8f63Z+3mkqak1XBWjPYqB0KMVCLVE9UZaoOavrFc=", + "lastModified": 1746875335, + "narHash": "sha256-hPoOSOPSK9UHZJQ87WO9s7eZbVJYvwfYv1PSPUtIQNo=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "bfb8be07381e9b847c9f38cd63a809023f6da086", + "rev": "0e3779afdf0ef51958071b151fc11dc74bb8971c", "type": "github" }, "original": { @@ -619,11 +617,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1746621361, - "narHash": "sha256-T9vOxEqI1j1RYugV0b9dgy0AreiZ9yBDKZJYyclF0og=", + "lastModified": 1746814339, + "narHash": "sha256-hf2lICJzwACWuzHCmZn5NI6LUAOgGdR1yh8ip+duyhk=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "2ea3ad8a1f26a76f8a8e23fc4f7757c46ef30ee5", + "rev": "3c5e12673265dfb0de3d9121420c0c2153bf21e0", "type": "github" }, "original": { @@ -635,11 +633,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1746461020, - "narHash": "sha256-7+pG1I9jvxNlmln4YgnlW4o+w0TZX24k688mibiFDUE=", + "lastModified": 1746663147, + "narHash": "sha256-Ua0drDHawlzNqJnclTJGf87dBmaO/tn7iZ+TCkTRpRc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3730d8a308f94996a9ba7c7138ede69c1b9ac4ae", + "rev": "dda3dcd3fe03e991015e9a74b22d35950f264a54", "type": "github" }, "original": { @@ -714,11 +712,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1746461020, - "narHash": "sha256-7+pG1I9jvxNlmln4YgnlW4o+w0TZX24k688mibiFDUE=", + "lastModified": 1746663147, + "narHash": "sha256-Ua0drDHawlzNqJnclTJGf87dBmaO/tn7iZ+TCkTRpRc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3730d8a308f94996a9ba7c7138ede69c1b9ac4ae", + "rev": "dda3dcd3fe03e991015e9a74b22d35950f264a54", "type": "github" }, "original": { @@ -754,11 +752,11 @@ "nur-rycee": { "flake": false, "locked": { - "lastModified": 1746681993, - "narHash": "sha256-w3mYEUnbBjMC01c6ZixEa6LIqyiTCU9eF3vv9YTesWs=", + "lastModified": 1746849806, + "narHash": "sha256-6vJX4DnhDlWNtOOh3v08YqPgjJblfgHnV9562nPHNEo=", "owner": "rycee", "repo": "nur-expressions", - "rev": "1f0519b8b0d044ac3699b52e60586cbebbb7b6cb", + "rev": "e2408d3f94a6b658e12f135501aa7fd38efabc72", "type": "gitlab" }, "original": { @@ -841,11 +839,11 @@ ] }, "locked": { - "lastModified": 1746671794, - "narHash": "sha256-V+mpk2frYIEm85iYf+KPDmCGG3zBRAEhbv0E3lHdG2U=", + "lastModified": 1746844454, + "narHash": "sha256-GcUWDQUDRYrD34ol90KGUpjbVcOfUNbv0s955jPecko=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ceec434b8741c66bb8df5db70d7e629a9d9c598f", + "rev": "be092436d4c0c303b654e4007453b69c0e33009e", "type": "github" }, "original": { @@ -902,11 +900,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1746575057, - "narHash": "sha256-kBlPMNZXPzDG4HUmdqYpvjvVYkoDdDrVvO14cKgHaiU=", + "lastModified": 1746875263, + "narHash": "sha256-WhcWBF8c7l9LoLQ18n9NjuvCBF5WJ6c2DemDTZgGKsI=", "owner": "danth", "repo": "stylix", - "rev": "685deb9bae2e4c463e953ff39bd54fd448feaf05", + "rev": "1c71f3bde228f7b17c1aad75f2b97276daf8db42", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index bd51d13..51106b0 100644 --- a/flake.nix +++ b/flake.nix @@ -8,7 +8,7 @@ # nixpkgs.follows = "nixos-cosmic/nixpkgs"; lix-module = { - url = "git+https://git.lix.systems/lix-project/nixos-module"; + url = "git+https://git.lix.systems/lix-project/nixos-module?ref=release-2.93"; inputs = { nixpkgs.follows = "nixpkgs"; flake-utils.follows = "flake-utils"; @@ -22,7 +22,6 @@ ref = "master"; inputs = { nixpkgs.follows = "nixpkgs"; - flake-utils.follows = "flake-utils"; }; }; diff --git a/home/david/modules/programs/niri/config.nix b/home/david/modules/programs/niri/config.nix index 42382b6..868c357 100644 --- a/home/david/modules/programs/niri/config.nix +++ b/home/david/modules/programs/niri/config.nix @@ -450,6 +450,8 @@ in (plain "environment" [ (leaf "DISPLAY" DISPLAY) ]) + (plain "overview" [ + ]) ] # others ) ++ ( diff --git a/nixos/configurations/Akun/default.nix b/nixos/configurations/Akun/default.nix index 4989924..c16e8bd 100644 --- a/nixos/configurations/Akun/default.nix +++ b/nixos/configurations/Akun/default.nix @@ -1,12 +1,22 @@ -{pkgs, ...}: { - imports = [ - ./gui.nix - ./hardware-configuration.nix - ./stylix.nix - ./users - ./networking.nix - ./disk-config.nix - ]; +{ + inputs, + pkgs, + ... +}: { + imports = + (with inputs.nixos-hardware.nixosModules; [ + common-cpu-intel + common-pc-laptop + common-pc-laptop-ssd + ]) + ++ [ + ./gui.nix + ./hardware-configuration.nix + ./stylix.nix + ./users + ./networking.nix + ./disk-config.nix + ]; youthlic = { users.deploy.enable = true; diff --git a/nixos/configurations/Tytonidae/default.nix b/nixos/configurations/Tytonidae/default.nix index 6310aac..4b26f79 100644 --- a/nixos/configurations/Tytonidae/default.nix +++ b/nixos/configurations/Tytonidae/default.nix @@ -6,8 +6,13 @@ ... }: { imports = - (with inputs; [ - nixos-hardware.nixosModules.asus-fx506hm + (with inputs.nixos-hardware.nixosModules; [ + common-hidpi + common-cpu-intel + common-gpu-nvidia-nonprime + common-pc-laptop + common-pc-laptop-ssd + asus-battery ]) ++ [ ./users @@ -96,6 +101,15 @@ loader.efi.canTouchEfiVariables = true; initrd.systemd.enable = true; }; + hardware.nvidia = { + modesetting.enable = true; + open = true; + prime = { + reverseSync.enable = lib.mkDefault true; + intelBusId = "PCI:0:2:0"; + nvidiaBusId = "PCI:1:0:0"; + }; + }; # This value determines the NixOS release from which the default # settings for stateful data, like file locations and database versions diff --git a/nixos/configurations/Tytonidae/specialisation/niri-hybrid.nix b/nixos/configurations/Tytonidae/specialisation/niri-hybrid.nix index ca1ea8b..43bc42c 100644 --- a/nixos/configurations/Tytonidae/specialisation/niri-hybrid.nix +++ b/nixos/configurations/Tytonidae/specialisation/niri-hybrid.nix @@ -1,4 +1,8 @@ -{lib, ...}: let +{ + inputs, + lib, + ... +}: let extraConfig = '' output "DP-1" { mode "2560x1440@169.900" @@ -22,7 +26,9 @@ in { config.specialisation.niri-hybrid = { inheritParentConfig = true; configuration = { + imports = [inputs.nixos-hardware.nixosModules.common-gpu-nvidia]; youthlic.gui.niri.extraConfig = lib.mkForce extraConfig; + hardware.nvidia.prime.reverseSync.enable = lib.mkForce false; }; }; } diff --git a/nixos/modules/programs/forgejo.nix b/nixos/modules/programs/forgejo.nix index 72e90a8..b4d2cac 100644 --- a/nixos/modules/programs/forgejo.nix +++ b/nixos/modules/programs/forgejo.nix @@ -68,7 +68,7 @@ in { }; mailer = { ENABLED = true; - MAILER_TYPE = "sendmail"; + PROTOCOL = "sendmail"; FROM = "do-not-reply@${config.services.forgejo.settings.server.DOMAIN}"; SENDMAIL_PATH = "${pkgs.system-sendmail}/bin/sendmail"; }; diff --git a/pkgs/_sources/generated.json b/pkgs/_sources/generated.json index 7d9b5ea..29d233b 100644 --- a/pkgs/_sources/generated.json +++ b/pkgs/_sources/generated.json @@ -92,7 +92,7 @@ }, "rime-ice": { "cargoLocks": null, - "date": "2025-05-01", + "date": "2025-05-08", "extract": null, "name": "rime-ice", "passthru": null, @@ -104,16 +104,16 @@ "name": null, "owner": "iDvel", "repo": "rime-ice", - "rev": "5322bcd86f47d18e0785cac4a5da239664b46235", - "sha256": "sha256-BFS/pMuUlZ6pQEITZ37hotl7YUMmU7kWoHA26L+y7Pc=", + "rev": "60cd1631f9f5023cf00e86adc535571d1b86f1b2", + "sha256": "sha256-3K25oc4q/5pmZL7WYoSR6RyjgV+7o7W6MzBcIKeRD0Y=", "sparseCheckout": [], "type": "github" }, - "version": "5322bcd86f47d18e0785cac4a5da239664b46235" + "version": "60cd1631f9f5023cf00e86adc535571d1b86f1b2" }, "spotx": { "cargoLocks": null, - "date": "2025-04-23", + "date": "2025-05-03", "extract": null, "name": "spotx", "passthru": null, @@ -125,12 +125,12 @@ "name": null, "owner": "SpotX-Official", "repo": "SpotX-Bash", - "rev": "d5a23bfc64d75979373c5fddc81641dabff051aa", - "sha256": "sha256-gYr2b9oSOB/kuK6Em3T+gAALgzpRQxvSBJNWoaJ7yvg=", + "rev": "1d16abcbb6cdd0a2882084d91dedc4e1f0e3844c", + "sha256": "sha256-kSFyKLD8qb4CsbUZuHXA0GgrAsFYdIPF0gxpKwtxTX4=", "sparseCheckout": [], "type": "github" }, - "version": "d5a23bfc64d75979373c5fddc81641dabff051aa" + "version": "1d16abcbb6cdd0a2882084d91dedc4e1f0e3844c" }, "tree-sitter-idris": { "cargoLocks": null, diff --git a/pkgs/_sources/generated.nix b/pkgs/_sources/generated.nix index 1940202..d7e1ab5 100644 --- a/pkgs/_sources/generated.nix +++ b/pkgs/_sources/generated.nix @@ -65,27 +65,27 @@ }; rime-ice = { pname = "rime-ice"; - version = "5322bcd86f47d18e0785cac4a5da239664b46235"; + version = "60cd1631f9f5023cf00e86adc535571d1b86f1b2"; src = fetchFromGitHub { owner = "iDvel"; repo = "rime-ice"; - rev = "5322bcd86f47d18e0785cac4a5da239664b46235"; + rev = "60cd1631f9f5023cf00e86adc535571d1b86f1b2"; fetchSubmodules = false; - sha256 = "sha256-BFS/pMuUlZ6pQEITZ37hotl7YUMmU7kWoHA26L+y7Pc="; + sha256 = "sha256-3K25oc4q/5pmZL7WYoSR6RyjgV+7o7W6MzBcIKeRD0Y="; }; - date = "2025-05-01"; + date = "2025-05-08"; }; spotx = { pname = "spotx"; - version = "d5a23bfc64d75979373c5fddc81641dabff051aa"; + version = "1d16abcbb6cdd0a2882084d91dedc4e1f0e3844c"; src = fetchFromGitHub { owner = "SpotX-Official"; repo = "SpotX-Bash"; - rev = "d5a23bfc64d75979373c5fddc81641dabff051aa"; + rev = "1d16abcbb6cdd0a2882084d91dedc4e1f0e3844c"; fetchSubmodules = false; - sha256 = "sha256-gYr2b9oSOB/kuK6Em3T+gAALgzpRQxvSBJNWoaJ7yvg="; + sha256 = "sha256-kSFyKLD8qb4CsbUZuHXA0GgrAsFYdIPF0gxpKwtxTX4="; }; - date = "2025-04-23"; + date = "2025-05-03"; }; tree-sitter-idris = { pname = "tree-sitter-idris";