diff --git a/flake.lock b/flake.lock index c3a6e05..7999e7b 100644 --- a/flake.lock +++ b/flake.lock @@ -132,11 +132,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1756084013, - "narHash": "sha256-dw/pea4INPz4CdUALK+p9qe4/HPsSj2//Odxh4ec8Yo=", + "lastModified": 1756419218, + "narHash": "sha256-bD10TLSG2KljGpW/HpVPa6wIMjjwQ69IjeaRWP1QE0k=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "a925c86e2ee3d13e39979975c8f8443eda53f6bb", + "rev": "cf5f934ea48b4a3048febc0132ffc628a0fde759", "type": "github" }, "original": { @@ -264,11 +264,11 @@ "doomemacs": { "flake": false, "locked": { - "lastModified": 1755787657, - "narHash": "sha256-NMTfJXmNvsdxx0ckMzdT47SrHTtyNoY/l7aLd1HVgvg=", + "lastModified": 1756305047, + "narHash": "sha256-JdFKV52EMCf3fLJRNIxd5gO/BMG2cTYCwng9yz2nPKU=", "owner": "doomemacs", "repo": "doomemacs", - "rev": "2129fffc79189bb6d4fd3bb665a4a936247411c4", + "rev": "058cb20a12e29cc1990b0c08b887873689bc968f", "type": "github" }, "original": { @@ -287,11 +287,11 @@ ] }, "locked": { - "lastModified": 1756087945, - "narHash": "sha256-+abiBhtddmBlNrxko1r4Z6oKSKszBkzemrt2k//NXGk=", + "lastModified": 1756369684, + "narHash": "sha256-bzVfYyJIcxy/3pPG1Gr2GQDP8Hd239Hv4A88IkXNT3E=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "9e3a5b9a0c79e66b4a1e2490be606a058a6712fe", + "rev": "656c40437f2ad596a9f26110d774098d869a96ad", "type": "github" }, "original": { @@ -800,11 +800,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1756129838, - "narHash": "sha256-AC6Xui8uhKcLlIfmRqE4UJmohNe4d9oqq+Xt2NuJBiU=", + "lastModified": 1756305977, + "narHash": "sha256-u3HYKT9vcAKw5mNaARUzmukfS1yjHH+3tTyVgZXob30=", "owner": "helix-editor", "repo": "helix", - "rev": "8671882ee2c18af3a4d6df1af4f01ae18d1c6494", + "rev": "7e4e556f84cd657dc99e3e0acfa7442170a01a11", "type": "github" }, "original": { @@ -844,11 +844,11 @@ ] }, "locked": { - "lastModified": 1756022458, - "narHash": "sha256-J1i35r4HfNDdPpwL0vOBaZopQudAUVtartEerc1Jryc=", + "lastModified": 1756261190, + "narHash": "sha256-eiy0klFK5EVJLNilutR7grsZN/7Itj9DyD75eyOf83k=", "owner": "nix-community", "repo": "home-manager", - "rev": "9e3a33c0bcbc25619e540b9dfea372282f8a9740", + "rev": "77f348da3176dc68b20a73dab94852a417daf361", "type": "github" }, "original": { @@ -864,11 +864,11 @@ ] }, "locked": { - "lastModified": 1756022458, - "narHash": "sha256-J1i35r4HfNDdPpwL0vOBaZopQudAUVtartEerc1Jryc=", + "lastModified": 1756261190, + "narHash": "sha256-eiy0klFK5EVJLNilutR7grsZN/7Itj9DyD75eyOf83k=", "owner": "nix-community", "repo": "home-manager", - "rev": "9e3a33c0bcbc25619e540b9dfea372282f8a9740", + "rev": "77f348da3176dc68b20a73dab94852a417daf361", "type": "github" }, "original": { @@ -914,11 +914,11 @@ ] }, "locked": { - "lastModified": 1755931229, - "narHash": "sha256-j8ghatY34DbEnHe42r8VtAe05WyMUK+d66uGKsfLbbk=", + "lastModified": 1756201372, + "narHash": "sha256-bK5j5cwJgO5AZXlDl5AgISzpOv9YV1Fcv2nDr9RW/5o=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "bcad5af8eb475df936f6cf2d04b076dc6784af95", + "rev": "9f6745bd704ab7f2617d41c2b02f4fd5f9ed0e89", "type": "github" }, "original": { @@ -954,15 +954,15 @@ "lix": { "flake": false, "locked": { - "lastModified": 1755787066, - "narHash": "sha256-X2UwkUEban08GRSPXRr+kz8fckHqebr3P77qSvjoeOw=", - "rev": "ac9721a92e8138d29707824dbedb484c76948493", + "lastModified": 1753306924, + "narHash": "sha256-jLCEW0FvjFhC+c4RHzH+xbkSOxrnpFHnhjOw6sudhx0=", + "rev": "1a4393d0aac31aba21f5737ede1b171e11336d77", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/ac9721a92e8138d29707824dbedb484c76948493.tar.gz?rev=ac9721a92e8138d29707824dbedb484c76948493" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/1a4393d0aac31aba21f5737ede1b171e11336d77.tar.gz?rev=1a4393d0aac31aba21f5737ede1b171e11336d77" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/lix/archive/main.tar.gz" + "url": "https://git.lix.systems/lix-project/lix/archive/release-2.93.tar.gz" } }, "lix-module": { @@ -977,15 +977,16 @@ ] }, "locked": { - "lastModified": 1756125573, - "narHash": "sha256-IgD1JR7scSEwlK/YAbmrcTWpAYT30LPldCUHdzXkaMs=", - "ref": "refs/heads/main", - "rev": "1c906dd92e032bcb5a27f98cf53833cae889537f", - "revCount": 160, + "lastModified": 1756125859, + "narHash": "sha256-6a+PWILmqHCs9B5eIBLg6HSZ8jYweZpgOWO8FlyVwYI=", + "ref": "release-2.93", + "rev": "d3292125035b04df00d01549a26e948631fabe1e", + "revCount": 156, "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" } @@ -1001,11 +1002,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1756080870, - "narHash": "sha256-kxClZk/T/Z3vGCo2At5n/clqQY7RwPULkOdtPEkkzmI=", + "lastModified": 1756339591, + "narHash": "sha256-2UQrDxTrr9FTzyWPsUAKpkAEWipl3oW4cf+WD+tBS3E=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "7a6894dbb8e81e33fd437b2bf96f26aab848cd2e", + "rev": "0e23f4c26e5e711f09a634e804b0b5002ecaa46f", "type": "github" }, "original": { @@ -1017,11 +1018,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1756079028, - "narHash": "sha256-u58rAgWhxtfr3G6ol2aTW20ZbL9sJmaIX4lzo+tukXc=", + "lastModified": 1756337722, + "narHash": "sha256-Kh6FRSmWm3S7a1k0Uje/PquFVA5V+8MVfw+jicWwRuc=", "owner": "neovim", "repo": "neovim", - "rev": "bccec33f5a011fac7f0a90260c72c2ac2f4c334f", + "rev": "24020ef2dd3daffa56af0eff5e6c2ed82af80335", "type": "github" }, "original": { @@ -1042,11 +1043,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1756127747, - "narHash": "sha256-Zc9+83Vg1FCOIjf1E/tZxk7mwyKPrGystc+48OkeDhM=", + "lastModified": 1756337322, + "narHash": "sha256-FiUw6z+ytxopB8dYc0/LVtc/8F8wnsdUvpzSHNeojb8=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "d63f7848d0e0b9d2860be5ba9c4f6ed09e91049e", + "rev": "a0a748911825656657dcffbe16eb58c9d4039a77", "type": "github" }, "original": { @@ -1075,11 +1076,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1756121001, - "narHash": "sha256-qAS8KtQSInO80zmTwTxmlOZzD9tTl8tc1hY0CYRSr78=", + "lastModified": 1756304824, + "narHash": "sha256-XOR+SyrASQQ2DnQvK2pcPx67sPyGdG3wwmZGlgpoJu8=", "owner": "YaLTeR", "repo": "niri", - "rev": "9b622b1c8cee332b0dd5a92ba07242b3d0dc2198", + "rev": "d9833fc1c3de306f500662471ae001094813dbd5", "type": "github" }, "original": { @@ -1140,11 +1141,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1756111507, - "narHash": "sha256-PrB7K/W1XxmUWzE6zuGDvDyax1x3wNB7Bg0IiixSlME=", + "lastModified": 1756370503, + "narHash": "sha256-7CB4DCVsekyqfmTS9M2UHy6H9Y9U7FAIN50Vwc9qhv0=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "8c227aa094b40895c442cdfb4669aa4a3eb2ccf3", + "rev": "11884c4e88bf631b4fa646e907f3cf780ee44a83", "type": "github" }, "original": { @@ -1199,11 +1200,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1755330281, - "narHash": "sha256-aJHFJWP9AuI8jUGzI77LYcSlkA9wJnOIg4ZqftwNGXA=", + "lastModified": 1756245047, + "narHash": "sha256-9bHzrVbjAudbO8q4vYFBWlEkDam31fsz0J7GB8k4AsI=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "3dac8a872557e0ca8c083cdcfc2f218d18e113b0", + "rev": "a65b650d6981e23edd1afa1f01eb942f19cdcbb7", "type": "github" }, "original": { @@ -1215,11 +1216,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1755615617, - "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", + "lastModified": 1756266583, + "narHash": "sha256-cr748nSmpfvnhqSXPiCfUPxRz2FJnvf/RjJGvFfaCsM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "20075955deac2583bb12f07151c2df830ef346b4", + "rev": "8a6d5427d99ec71c64f0b93d45778c889005d9c2", "type": "github" }, "original": { @@ -1277,11 +1278,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1755922037, - "narHash": "sha256-wY1+2JPH0ZZC4BQefoZw/k+3+DowFyfOxv17CN/idKs=", + "lastModified": 1756217674, + "narHash": "sha256-TH1SfSP523QI7kcPiNtMAEuwZR3Jdz0MCDXPs7TS8uo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b1b3291469652d5a2edb0becc4ef0246fff97a7c", + "rev": "4e7667a90c167f7a81d906e5a75cba4ad8bee620", "type": "github" }, "original": { @@ -1341,11 +1342,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1755829505, - "narHash": "sha256-4/Jd+LkQ2ssw8luQVkqVs9spDBVE6h/u/hC/tzngsPo=", + "lastModified": 1756256966, + "narHash": "sha256-sSVfAOlYIK01ptcDImwkyDVfhGPy/muVa4e7xxbhgho=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f937f8ecd1c70efd7e9f90ba13dfb400cf559de4", + "rev": "4c202d26483c5ccf3cb95e0053163facde9f047e", "type": "github" }, "original": { @@ -1373,11 +1374,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1755615617, - "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", + "lastModified": 1756266583, + "narHash": "sha256-cr748nSmpfvnhqSXPiCfUPxRz2FJnvf/RjJGvFfaCsM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "20075955deac2583bb12f07151c2df830ef346b4", + "rev": "8a6d5427d99ec71c64f0b93d45778c889005d9c2", "type": "github" }, "original": { @@ -1405,11 +1406,11 @@ }, "nixpkgs_7": { "locked": { - "lastModified": 1755615617, - "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", + "lastModified": 1756266583, + "narHash": "sha256-cr748nSmpfvnhqSXPiCfUPxRz2FJnvf/RjJGvFfaCsM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "20075955deac2583bb12f07151c2df830ef346b4", + "rev": "8a6d5427d99ec71c64f0b93d45778c889005d9c2", "type": "github" }, "original": { @@ -1459,11 +1460,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1756148061, - "narHash": "sha256-9QlWBvwDlizUa7YwlBnrmdXvh5pjaVGLG7u1N68VX5k=", + "lastModified": 1756305488, + "narHash": "sha256-+6cgFdac+DN5PAZg3YtRXAEdk++r6msy7wfFMNMNsEY=", "owner": "nix-community", "repo": "nixvim", - "rev": "8e3ca3fc1f3ae23dee0e6d35dd4a70ea8ef7164c", + "rev": "b7e96214e8e7244eceae73c606dcd243f6d180a3", "type": "github" }, "original": { @@ -1478,11 +1479,11 @@ "nixpkgs": "nixpkgs_7" }, "locked": { - "lastModified": 1756154233, - "narHash": "sha256-XKHIJ24aRmlQjqiv56OTvV70/IuK5CFmIP9v+NaBFOM=", + "lastModified": 1756416356, + "narHash": "sha256-xcqREhXocGZPbDsvjD7ncDz8++jfX5ZwpGc0maiD9CY=", "owner": "nix-community", "repo": "NUR", - "rev": "d81438d52a643b84a8bdd7ed0ba39a8e3b97f628", + "rev": "e4de97a152b367ba92ee590ff67fee4f33c46d92", "type": "github" }, "original": { @@ -1622,11 +1623,11 @@ ] }, "locked": { - "lastModified": 1756003222, - "narHash": "sha256-lmEMhIIbjt8Wp1EYbNqCojuU9ygyDFv8Tu0X1k8qIMc=", + "lastModified": 1756262090, + "narHash": "sha256-PQHSup4d0cVXxJ7mlHrrxBx1WVrmudKiNQgnNl5xRas=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "88ceedecde53e809b4bf8b5fd10d181889d9bac7", + "rev": "df7ea78aded79f195a92fc5423de96af2b8a85d1", "type": "github" }, "original": { @@ -1969,11 +1970,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1755963545, - "narHash": "sha256-hGXzVhlk+gelqagKAgOHbilNYasM+jM3T8JPshDl2/M=", + "lastModified": 1756260173, + "narHash": "sha256-wcf04fl5ncbOqAK7OCWIgILERIbMfL/eeM3UThqgErI=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "d759c64681bab7cd34f48122037d7420d42f3024", + "rev": "af33f7eb124b51ff6d9cdf9b428643e2246c8cbb", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 4ffcc2b..ae55340 100644 --- a/flake.nix +++ b/flake.nix @@ -56,8 +56,8 @@ # nixpkgs.follows = "nixos-cosmic/nixpkgs"; lix-module = { - # url = "git+https://git.lix.systems/lix-project/nixos-module?ref=release-2.93"; - url = "git+https://git.lix.systems/lix-project/nixos-module"; + url = "git+https://git.lix.systems/lix-project/nixos-module?ref=release-2.93"; + # url = "git+https://git.lix.systems/lix-project/nixos-module"; inputs = { nixpkgs.follows = "nixpkgs"; flake-utils.follows = "flake-utils"; diff --git a/home/david/modules/programs/firefox.nix b/home/david/modules/programs/firefox.nix index c670856..9666fb7 100644 --- a/home/david/modules/programs/firefox.nix +++ b/home/david/modules/programs/firefox.nix @@ -19,6 +19,7 @@ in ]; programs.firefox = { enable = true; + package = pkgs.firefox-beta; betterfox = { enable = true; }; diff --git a/home/david/modules/programs/openssh.nix b/home/david/modules/programs/openssh.nix index e6d6abc..7c3e7a8 100644 --- a/home/david/modules/programs/openssh.nix +++ b/home/david/modules/programs/openssh.nix @@ -17,14 +17,26 @@ in (lib.mkIf cfg.enable { programs.ssh = { enable = true; - hashKnownHosts = true; extraOptionOverrides = { HostKeyAlgorithms = "ssh-ed25519-cert-v01@openssh.com,ssh-rsa-cert-v01@openssh.com,ssh-ed25519,ssh-rsa,ecdsa-sha2-nistp521-cert-v01@openssh.com,ecdsa-sha2-nistp384-cert-v01@openssh.com,ecdsa-sha2-nistp256-cert-v01@openssh.com,ecdsa-sha2-nistp521,ecdsa-sha2-nistp384,ecdsa-sha2-nistp256"; KexAlgorithms = "curve25519-sha256@libssh.org,ecdh-sha2-nistp521,ecdh-sha2-nistp384,ecdh-sha2-nistp256,diffie-hellman-group-exchange-sha256"; MACs = "hmac-sha2-512-etm@openssh.com,hmac-sha2-256-etm@openssh.com,umac-128-etm@openssh.com,hmac-sha2-512,hmac-sha2-256,umac-128@openssh.com"; Ciphers = "chacha20-poly1305@openssh.com,aes256-gcm@openssh.com,aes128-gcm@openssh.com,aes256-ctr,aes192-ctr,aes128-ctr"; }; + enableDefaultConfig = false; matchBlocks = { + "*" = { + forwardAgent = false; + addKeysToAgent = "no"; + compression = false; + serverAliveInterval = 0; + serverAliveCountMax = 3; + hashKnownHosts = false; + userKnownHostsFile = "~/.ssh/known_hosts"; + controlMaster = "no"; + controlPath = "~/.ssh/master-%r@%n:%p"; + controlPersist = "no"; + }; "github.com" = { hostname = "ssh.github.com"; port = 443; diff --git a/nixos/configurations/Tytonidae/default.nix b/nixos/configurations/Tytonidae/default.nix index 50dd172..d856d7e 100644 --- a/nixos/configurations/Tytonidae/default.nix +++ b/nixos/configurations/Tytonidae/default.nix @@ -103,7 +103,7 @@ services.scx = { enable = true; scheduler = "scx_lavd"; - package = pkgs.scx_git.rustscheds; + package = pkgs.scx.rustscheds; }; boot = { diff --git a/nixos/modules/gui/default.nix b/nixos/modules/gui/default.nix index feed25e..2c6baef 100644 --- a/nixos/modules/gui/default.nix +++ b/nixos/modules/gui/default.nix @@ -28,7 +28,10 @@ in environment.systemPackages = with pkgs; [ fontconfig ]; - programs.firefox.enable = true; + programs.firefox = { + enable = true; + package = pkgs.firefox-beta; + }; fonts = { enableDefaultPackages = false; diff --git a/nixos/modules/gui/kde.nix b/nixos/modules/gui/kde.nix index f6bce71..82cbaf3 100644 --- a/nixos/modules/gui/kde.nix +++ b/nixos/modules/gui/kde.nix @@ -8,6 +8,8 @@ let in { config = lib.mkIf (cfg.enabled == "kde") { + # Fix stylix bug + qt.platformTheme = lib.mkForce "kde"; services = { desktopManager.plasma6.enable = true; displayManager.sddm.enable = true; diff --git a/nixos/modules/gui/niri.nix b/nixos/modules/gui/niri.nix index e10ccfa..d748287 100644 --- a/nixos/modules/gui/niri.nix +++ b/nixos/modules/gui/niri.nix @@ -42,28 +42,28 @@ in "com.system76.CosmicFiles.desktop" ]; "x-scheme-handler/about" = [ - "firefox.desktop" + "firefox-beta.desktop" "chromium-browser.desktop" ]; "x-scheme-handler/ftp" = [ - "firefox.desktop" + "firefox-beta.desktop" "chromium-browser.desktop" ]; "x-scheme-handler/http" = [ - "firefox.desktop" + "firefox-beta.desktop" "chromium-browser.desktop" ]; "x-scheme-handler/https" = [ - "firefox.desktop" + "firefox-beta.desktop" "chromium-browser.desktop" ]; "x-scheme-handler/mailto" = [ - "firefox.desktop" + "firefox-beta.desktop" "chromium-browser.desktop" ]; "x-scheme-handler/tg" = [ "telegramdesktop.desktop" ]; "x-scheme-handler/unknown" = [ - "firefox.desktop" + "firefox-beta.desktop" "chromium-browser.desktop" ]; "image/gif" = [ diff --git a/nixos/modules/nix.nix b/nixos/modules/nix.nix index 8fd3a15..37c15df 100644 --- a/nixos/modules/nix.nix +++ b/nixos/modules/nix.nix @@ -28,6 +28,13 @@ "fluffychat-linux" "immersive-translate" ]; + packageOverrides = p: { + intel-vaapi-driver = p.intel-vaapi-driver.override { enableHybridCodec = true; }; + onnxruntime = p.onnxruntime.override { + cudaSupport = false; + ncclSupport = false; + }; + }; }; }; sops.secrets."access-tokens" = { diff --git a/pkgs/editor-runtime.nix b/pkgs/editor-runtime.nix index 6de275a..1e8f93a 100644 --- a/pkgs/editor-runtime.nix +++ b/pkgs/editor-runtime.nix @@ -46,8 +46,8 @@ symlinkJoin { lua-language-server bash-language-server shfmt - hurl - cmake-language-server + # hurl + # cmake-language-server kdlfmt rustfmt clang-tools