From 35b5f153700b63b4a776d694f27b2bdb29a0b644 Mon Sep 17 00:00:00 2001 From: cnst Date: Fri, 29 Aug 2025 14:34:55 +0200 Subject: [PATCH] misc and flake lock --- flake.lock | 268 ++++++------------ flake.nix | 5 - hosts/kima/modules.nix | 4 +- hosts/toothpc/hardware-configuration.nix | 4 + modules/home/programs/helix/languages.nix | 90 +++--- modules/nixos/hardware/graphics/default.nix | 10 +- modules/nixos/programs/microfetch/default.nix | 4 +- users/toothpick/default.nix | 13 +- 8 files changed, 149 insertions(+), 249 deletions(-) diff --git a/flake.lock b/flake.lock index 300ffb20..abedaf4b 100644 --- a/flake.lock +++ b/flake.lock @@ -21,29 +21,10 @@ "type": "github" } }, - "ags": { - "inputs": { - "astal": "astal", - "nixpkgs": "nixpkgs_2" - }, - "locked": { - "lastModified": 1755864602, - "narHash": "sha256-/r1llrce4yG7aoKwedeehNDRYJMdkTlbT55v+5bBHIQ=", - "owner": "Aylur", - "repo": "ags", - "rev": "0603f8242f054127eb49ed3f7d9eee5c1d4b5559", - "type": "github" - }, - "original": { - "owner": "Aylur", - "repo": "ags", - "type": "github" - } - }, "anyrun": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "systems": "systems_2" }, "locked": { @@ -80,11 +61,11 @@ ] }, "locked": { - "lastModified": 1755632680, - "narHash": "sha256-EjaD8+d7AiAV2fGRN4NTMboWDwk8szDfwbzZ8DL1PhQ=", + "lastModified": 1755946532, + "narHash": "sha256-POePremlUY5GyA1zfbtic6XLxDaQcqHN6l+bIxdT5gc=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "50637ed23e962f0db294d6b0ef534f37b144644b", + "rev": "81584dae2df6ac79f6b6dae0ecb7705e95129ada", "type": "github" }, "original": { @@ -93,41 +74,20 @@ "type": "github" } }, - "astal": { - "inputs": { - "nixpkgs": [ - "ags", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1752404970, - "narHash": "sha256-XULTToDUkIshNXEO+YP2mAHdQv8bxWDvKjbamBfOC8E=", - "owner": "aylur", - "repo": "astal", - "rev": "2c5eb54f39e1710c6e2c80915a240978beb3269a", - "type": "github" - }, - "original": { - "owner": "aylur", - "repo": "astal", - "type": "github" - } - }, "chaotic": { "inputs": { "flake-schemas": "flake-schemas", "home-manager": "home-manager_2", "jovian": "jovian", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1756074717, - "narHash": "sha256-zWS//20J1wFmKg7C+gZkSkR1DyrnkW0y2B6bgFaQ4cI=", + "lastModified": 1756413080, + "narHash": "sha256-XPhfr1tQf2n3R5PBvkQjLMaEChLC38nVn9PPkRF8lho=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "a12198a1d1af26d8bb639d8a9742f4a18269e840", + "rev": "f0f6da3f90d21263789656a0804cf4e8d536a638", "type": "github" }, "original": { @@ -382,7 +342,7 @@ "fonts": { "inputs": { "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1753431871, @@ -444,11 +404,11 @@ }, "hardware": { "locked": { - "lastModified": 1755330281, - "narHash": "sha256-aJHFJWP9AuI8jUGzI77LYcSlkA9wJnOIg4ZqftwNGXA=", + "lastModified": 1756245047, + "narHash": "sha256-9bHzrVbjAudbO8q4vYFBWlEkDam31fsz0J7GB8k4AsI=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "3dac8a872557e0ca8c083cdcfc2f218d18e113b0", + "rev": "a65b650d6981e23edd1afa1f01eb942f19cdcbb7", "type": "github" }, "original": { @@ -459,15 +419,15 @@ }, "helix-flake": { "inputs": { - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "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": { @@ -483,11 +443,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": { @@ -525,11 +485,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": { @@ -583,11 +543,11 @@ ] }, "locked": { - "lastModified": 1754305013, - "narHash": "sha256-u+M2f0Xf1lVHzIPQ7DsNCDkM1NYxykOSsRr4t3TbSM4=", + "lastModified": 1755678602, + "narHash": "sha256-uEC5O/NIUNs1zmc1aH1+G3GRACbODjk2iS0ET5hXtuk=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "4c1d63a0f22135db123fc789f174b89544c6ec2d", + "rev": "157cc52065a104fc3b8fa542ae648b992421d1c7", "type": "github" }, "original": { @@ -647,11 +607,11 @@ ] }, "locked": { - "lastModified": 1752164251, - "narHash": "sha256-v/FnmgSkOypGkpDHQW8KK0uVIyh2njVgEa7hOpWW9ZM=", + "lastModified": 1756291201, + "narHash": "sha256-YzRWE3rCnsY0WDRJcn4KvyWUoe+5zdkUYNIaHGP9BZ4=", "owner": "hyprwm", "repo": "hypridle", - "rev": "dda793b66a79e5602675fa370dd9a93f1d70a60e", + "rev": "5430b73ddf148651bcf35fa39ed4d757c7534028", "type": "github" }, "original": { @@ -670,17 +630,17 @@ "hyprlang": "hyprlang", "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner_2", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_6", "pre-commit-hooks": "pre-commit-hooks", "systems": "systems_3", "xdph": "xdph" }, "locked": { - "lastModified": 1756069181, - "narHash": "sha256-LnlqoXiF+HfK2vU0hPwXB2BFy/Pkxtv86zIGdz2Ur9s=", + "lastModified": 1756467067, + "narHash": "sha256-egQBZALqGa6bfYtJK6mWrhxOby0Oiq23dUnIcwFT3Hg=", "owner": "hyprwm", "repo": "hyprland", - "rev": "0ed880f3f7dc2c746bf3590eee266c010d737558", + "rev": "05a1c0aa7395d19213e587c83089ecbd7b92085c", "type": "github" }, "original": { @@ -879,11 +839,11 @@ ] }, "locked": { - "lastModified": 1754413248, - "narHash": "sha256-d2C75Ij8JCuNwy6Vgq32Fe1iSrEOOnBnOX4JZJvtAFA=", + "lastModified": 1756305651, + "narHash": "sha256-KttBtdPHDCuD+BT0da8DmBarv6k+9GA9INpeDLLgpc8=", "owner": "hyprwm", "repo": "hyprlock", - "rev": "347e05a40ec3bc48b3f21f44dea551d07773e214", + "rev": "8d0e56998e299ae42f3fd8ede5bb5c396193cdbc", "type": "github" }, "original": { @@ -942,11 +902,11 @@ ] }, "locked": { - "lastModified": 1755416120, - "narHash": "sha256-PosTxeL39YrLvCX5MqqPA6NNWQ4T5ea5K55nmN7ju9Q=", + "lastModified": 1756117388, + "narHash": "sha256-oRDel6pNl/T2tI+nc/USU9ZP9w08dxtl7hiZxa0C/Wc=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "e631ea36ddba721eceda69bfee6dd01068416489", + "rev": "b2ae3204845f5f2f79b4703b441252d8ad2ecfd0", "type": "github" }, "original": { @@ -1064,11 +1024,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": { @@ -1082,7 +1042,7 @@ "crane": "crane", "flake-compat": "flake-compat_2", "flake-parts": "flake-parts_4", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_7", "pre-commit-hooks-nix": "pre-commit-hooks-nix", "rust-overlay": "rust-overlay_3" }, @@ -1100,24 +1060,6 @@ "type": "github" } }, - "microfetch": { - "inputs": { - "nixpkgs": "nixpkgs_9" - }, - "locked": { - "lastModified": 1754330672, - "narHash": "sha256-BjBSpMMgB97GRDIKOQUcX19M/79h76ffXpcuOovbbSo=", - "owner": "NotAShelf", - "repo": "microfetch", - "rev": "9d8905354efca612a1e9fe87845293a4460e0553", - "type": "github" - }, - "original": { - "owner": "NotAShelf", - "repo": "microfetch", - "type": "github" - } - }, "mnw": { "locked": { "lastModified": 1748710831, @@ -1143,11 +1085,11 @@ ] }, "locked": { - "lastModified": 1756087120, - "narHash": "sha256-VP7wb0KZLVX+kK0nmvIUcMf1WbGl/PdUpNPxlkqBR6A=", + "lastModified": 1756432252, + "narHash": "sha256-jOBNNFSQg+PDT1TYzvyKjsy9OYkTmKhKFmqyIyXyA2U=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "0ca8d5927960555f78b495a14aab4e2be08f202b", + "rev": "80cf8e61fa8d7760eb45da43beba7bf2aabe1395", "type": "github" }, "original": { @@ -1210,55 +1152,7 @@ "type": "github" } }, - "nixpkgs_10": { - "locked": { - "lastModified": 1755615617, - "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "20075955deac2583bb12f07151c2df830ef346b4", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_11": { - "locked": { - "lastModified": 1755049066, - "narHash": "sha256-ANrc15FSoOAdNbfKHxqEJjZLftIwIsenJGRb/04K41s=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "e45f8f193029378d0aaee5431ba098dc80054e9a", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { - "locked": { - "lastModified": 1754214453, - "narHash": "sha256-Q/I2xJn/j1wpkGhWkQnm20nShYnG7TI99foDBpXm1SY=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "5b09dc45f24cf32316283e62aec81ffee3c3e376", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1755186698, "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", @@ -1274,13 +1168,13 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { - "lastModified": 1755615617, - "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", + "lastModified": 1756266583, + "narHash": "sha256-cr748nSmpfvnhqSXPiCfUPxRz2FJnvf/RjJGvFfaCsM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "20075955deac2583bb12f07151c2df830ef346b4", + "rev": "8a6d5427d99ec71c64f0b93d45778c889005d9c2", "type": "github" }, "original": { @@ -1290,7 +1184,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1753250450, "narHash": "sha256-i+CQV2rPmP8wHxj0aq4siYyohHwVlsh40kV89f3nw1s=", @@ -1306,7 +1200,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1740560979, "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=", @@ -1322,13 +1216,13 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { - "lastModified": 1755186698, - "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", + "lastModified": 1756266583, + "narHash": "sha256-cr748nSmpfvnhqSXPiCfUPxRz2FJnvf/RjJGvFfaCsM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fbcf476f790d8a217c3eab4e12033dc4a0f6d23c", + "rev": "8a6d5427d99ec71c64f0b93d45778c889005d9c2", "type": "github" }, "original": { @@ -1338,7 +1232,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1754243818, "narHash": "sha256-sEPw2W01UPf0xNGnMGNZIaE1XHkk7O+lLLetYEXVZHk=", @@ -1354,13 +1248,13 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { - "lastModified": 1754214453, - "narHash": "sha256-Q/I2xJn/j1wpkGhWkQnm20nShYnG7TI99foDBpXm1SY=", + "lastModified": 1756266583, + "narHash": "sha256-cr748nSmpfvnhqSXPiCfUPxRz2FJnvf/RjJGvFfaCsM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5b09dc45f24cf32316283e62aec81ffee3c3e376", + "rev": "8a6d5427d99ec71c64f0b93d45778c889005d9c2", "type": "github" }, "original": { @@ -1370,12 +1264,28 @@ "type": "github" } }, + "nixpkgs_9": { + "locked": { + "lastModified": 1755049066, + "narHash": "sha256-ANrc15FSoOAdNbfKHxqEJjZLftIwIsenJGRb/04K41s=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "e45f8f193029378d0aaee5431ba098dc80054e9a", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nvf": { "inputs": { "flake-compat": "flake-compat_3", "flake-parts": "flake-parts_5", "mnw": "mnw", - "nixpkgs": "nixpkgs_11", + "nixpkgs": "nixpkgs_9", "systems": "systems_4" }, "locked": { @@ -1402,11 +1312,11 @@ ] }, "locked": { - "lastModified": 1755446520, - "narHash": "sha256-I0Ok1OGDwc1jPd8cs2VvAYZsHriUVFGIUqW+7uSsOUM=", + "lastModified": 1755960406, + "narHash": "sha256-RF7j6C1TmSTK9tYWO6CdEMtg6XZaUKcvZwOCD2SICZs=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "4b04db83821b819bbbe32ed0a025b31e7971f22e", + "rev": "e891a93b193fcaf2fc8012d890dc7f0befe86ec2", "type": "github" }, "original": { @@ -1444,7 +1354,6 @@ "root": { "inputs": { "agenix": "agenix", - "ags": "ags", "anyrun": "anyrun", "chaotic": "chaotic", "fenix": "fenix", @@ -1459,9 +1368,8 @@ "hyprlock": "hyprlock", "hyprpaper": "hyprpaper", "lanzaboote": "lanzaboote", - "microfetch": "microfetch", "nix-gaming": "nix-gaming", - "nixpkgs": "nixpkgs_10", + "nixpkgs": "nixpkgs_8", "nvf": "nvf", "systems": "systems_5", "tuirun": "tuirun", @@ -1493,11 +1401,11 @@ ] }, "locked": { - "lastModified": 1756003222, - "narHash": "sha256-lmEMhIIbjt8Wp1EYbNqCojuU9ygyDFv8Tu0X1k8qIMc=", + "lastModified": 1756262090, + "narHash": "sha256-PQHSup4d0cVXxJ7mlHrrxBx1WVrmudKiNQgnNl5xRas=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "88ceedecde53e809b4bf8b5fd10d181889d9bac7", + "rev": "df7ea78aded79f195a92fc5423de96af2b8a85d1", "type": "github" }, "original": { @@ -1708,11 +1616,11 @@ ] }, "locked": { - "lastModified": 1754860085, - "narHash": "sha256-HejweK1BTNtLcIQbrXw+DMs+vymSKrFM11uR7+L94AU=", + "lastModified": 1756458553, + "narHash": "sha256-hV8jxWBDHb0J6cpIz26+VF9e1Taihki6PDnKk2FuE3Y=", "ref": "refs/heads/main", - "rev": "8f0517f96b6b95968fe4f204874cda9706b4f4c8", - "revCount": 120, + "rev": "4925aa405012d20b698cb65c83b0fcd42bb0f9fc", + "revCount": 123, "type": "git", "url": "https://git.sr.ht/~canasta/zen-browser-flake" }, diff --git a/flake.nix b/flake.nix index 560a4892..b2cb32f0 100644 --- a/flake.nix +++ b/flake.nix @@ -92,7 +92,6 @@ }; anyrun.url = "github:anyrun-org/anyrun"; - microfetch.url = "github:NotAShelf/microfetch"; agenix.url = "github:ryantm/agenix"; # Rust toolchain @@ -106,10 +105,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - ags = { - url = "github:Aylur/ags"; - }; - # Custom tuirun = { url = "git+https://git.sr.ht/~canasta/tuirun"; diff --git a/hosts/kima/modules.nix b/hosts/kima/modules.nix index 18c338bd..643dc82e 100644 --- a/hosts/kima/modules.nix +++ b/hosts/kima/modules.nix @@ -171,9 +171,9 @@ enable = true; }; nfs = { - enable = true; + enable = false; server.enable = false; - client.enable = true; + client.enable = false; }; nix-ld = { enable = false; diff --git a/hosts/toothpc/hardware-configuration.nix b/hosts/toothpc/hardware-configuration.nix index 4be42065..e0d5b455 100644 --- a/hosts/toothpc/hardware-configuration.nix +++ b/hosts/toothpc/hardware-configuration.nix @@ -23,6 +23,10 @@ kernelModules = []; }; kernelModules = []; + kernelParams = [ + "intel_pstate=active" + "nvidia_drm.modeset=1" + ]; extraModulePackages = []; }; diff --git a/modules/home/programs/helix/languages.nix b/modules/home/programs/helix/languages.nix index e1d397ac..167fd0cd 100644 --- a/modules/home/programs/helix/languages.nix +++ b/modules/home/programs/helix/languages.nix @@ -38,15 +38,15 @@ injection-regex = "(clojure|clj|edn|boot|yuck)"; file-types = ["clj" "cljs" "cljc" "clje" "cljr" "cljx" "edn" "boot" "yuck"]; } - { - name = "cmake"; - auto-format = true; - language-servers = ["cmake-language-server"]; - formatter = { - command = lib.getExe pkgs.cmake-format; - args = ["-"]; - }; - } + # { + # name = "cmake"; + # auto-format = true; + # language-servers = ["cmake-language-server"]; + # formatter = { + # command = lib.getExe pkgs.cmake-format; + # args = ["-"]; + # }; + # } { name = "lua"; auto-format = true; @@ -55,11 +55,11 @@ command = lib.getExe pkgs.stylua; }; } - { - name = "javascript"; - auto-format = true; - language-servers = ["dprint" "typescript-language-server"]; - } + # { + # name = "javascript"; + # auto-format = true; + # language-servers = ["dprint" "typescript-language-server"]; + # } { name = "json"; formatter = deno "json"; @@ -83,24 +83,24 @@ args = ["-q"]; }; } - { - name = "python"; - language-servers = ["pylsp"]; - formatter = { - command = lib.getExe pkgs.black; - args = ["-" "--quiet" "--line-length 100"]; - }; - } + # { + # name = "python"; + # language-servers = ["pylsp"]; + # formatter = { + # command = lib.getExe pkgs.black; + # args = ["-" "--quiet" "--line-length 100"]; + # }; + # } { name = "qml"; auto-format = true; language-servers = ["qmlls"]; } - { - name = "typescript"; - auto-format = true; - language-servers = ["dprint" "typescript-language-server"]; - } + # { + # name = "typescript"; + # auto-format = true; + # language-servers = ["dprint" "typescript-language-server"]; + # } # { # name = "php"; # auto-format = true; @@ -142,9 +142,9 @@ clangd.fallbackFlags = ["-std=c++2b"]; }; - cmake-language-server = { - command = lib.getExe pkgs.cmake-language-server; - }; + # cmake-language-server = { + # command = lib.getExe pkgs.cmake-language-server; + # }; lua-language-server = { command = lib.getExe pkgs.lua-language-server; @@ -173,27 +173,27 @@ }; }; - dprint = { - command = lib.getExe pkgs.dprint; - args = ["lsp"]; - }; + # dprint = { + # command = lib.getExe pkgs.dprint; + # args = ["lsp"]; + # }; qmlls = { command = "${pkgs.qt6.qtdeclarative}/bin/qmlls"; args = ["-E"]; }; - pyright = { - command = "${pkgs.pyright}/bin/pyright-langserver"; - args = ["--stdio"]; - config = { - reportMissingTypeStubs = false; - analysis = { - typeCheckingMode = "basic"; - autoImportCompletions = true; - }; - }; - }; + # pyright = { + # command = "${pkgs.pyright}/bin/pyright-langserver"; + # args = ["--stdio"]; + # config = { + # reportMissingTypeStubs = false; + # analysis = { + # typeCheckingMode = "basic"; + # autoImportCompletions = true; + # }; + # }; + # }; typescript-language-server = { command = lib.getExe pkgs.nodePackages.typescript-language-server; diff --git a/modules/nixos/hardware/graphics/default.nix b/modules/nixos/hardware/graphics/default.nix index 4be91ff8..02dc6891 100644 --- a/modules/nixos/hardware/graphics/default.nix +++ b/modules/nixos/hardware/graphics/default.nix @@ -34,13 +34,10 @@ ]; nvidiaOffloadScript = pkgs.writeShellScriptBin "nvidia-offload" '' - export LIBVA_DRIVER_NAME=nvidia - export GBM_BACKEND=nvidia-drm + export __NV_PRIME_RENDER_OFFLOAD=1 + export __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0 export __GLX_VENDOR_LIBRARY_NAME=nvidia - export __GL_VRR_ALLOWED=1 - export XDG_SESSION_TYPE=wayland - export NVD_BACKEND=direct - export ELECTRON_OZONE_PLATFORM_HINT=auto + export __VK_LAYER_NV_optimus=NVIDIA_only exec "$@" ''; @@ -92,6 +89,7 @@ in { then commonPackages ++ (with pkgs; [ + nvidiaOffloadScript intel-media-driver nvidia-vaapi-driver vulkan-tools diff --git a/modules/nixos/programs/microfetch/default.nix b/modules/nixos/programs/microfetch/default.nix index 6070ba1a..9034bd20 100644 --- a/modules/nixos/programs/microfetch/default.nix +++ b/modules/nixos/programs/microfetch/default.nix @@ -1,7 +1,7 @@ { config, lib, - inputs, + pkgs, ... }: let inherit (lib) mkIf mkEnableOption; @@ -11,6 +11,6 @@ in { nixos.programs.microfetch.enable = mkEnableOption "Enables microfetch"; }; config = mkIf cfg.enable { - environment.systemPackages = [inputs.microfetch.packages.x86_64-linux.default]; + environment.systemPackages = [pkgs.microfetch]; }; } diff --git a/users/toothpick/default.nix b/users/toothpick/default.nix index c9ad287a..d7484eb6 100644 --- a/users/toothpick/default.nix +++ b/users/toothpick/default.nix @@ -2,6 +2,7 @@ imports = [ ./modules ]; + home = { username = "toothpick"; homeDirectory = "/home/toothpick"; @@ -9,32 +10,26 @@ extraOutputsToInstall = ["doc" "devdoc"]; packages = with pkgs; [ - # user specific pkgs filezilla ]; + sessionVariables = { BROWSER = "zen"; EDITOR = "nvim"; TERM = "xterm-256color"; - STEAM_EXTRA_COMPAT_TOOLS_PATHS = "/home/toothpick/.steam/root/compatibilitytools.d"; # proton and steam compat - QT_QPA_PLATFORM = "wayland"; - SDL_VIDEODRIVER = "wayland"; LIBVA_DRIVER_NAME = "nvidia"; - XDG_SESSION_TYPE = "wayland"; - GBM_BACKEND = "nvidia-drm"; __GLX_VENDOR_LIBRARY_NAME = "nvidia"; NVD_BACKEND = "direct"; - EGL_PLATFORM = "wayland"; + GBM_BACKEND = "nvidia-drm"; }; }; - # disable manuals as nmd fails to build often + manual = { html.enable = false; json.enable = false; manpages.enable = false; }; - # let HM manage itself when in standalone mode programs.home-manager.enable = true; }