diff --git a/flake.lock b/flake.lock index e8620bb..5dfc424 100644 --- a/flake.lock +++ b/flake.lock @@ -135,27 +135,6 @@ "url": "https://flakehub.com/f/hercules-ci/flake-parts/0.1" } }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": [ - "nur", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "git-hooks-nix": { "inputs": { "flake-compat": "flake-compat", @@ -462,27 +441,6 @@ "type": "github" } }, - "nur": { - "inputs": { - "flake-parts": "flake-parts_2", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1779470870, - "narHash": "sha256-h511LYfVIXNpTd8C/p1cMW2AVrFEjMy104XxPRIzrL0=", - "owner": "nix-community", - "repo": "NUR", - "rev": "5ea6f8868ce8f1ed17ce6da66abe084dfe3501e0", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "NUR", - "type": "github" - } - }, "root": { "inputs": { "agenix": "agenix", @@ -496,7 +454,6 @@ "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_4", "nixpkgs-last-building": "nixpkgs-last-building", - "nur": "nur", "zen-browser": "zen-browser" } }, diff --git a/flake.nix b/flake.nix index 7accc21..0cc84f3 100644 --- a/flake.nix +++ b/flake.nix @@ -3,15 +3,11 @@ inputs = { nixos.url = "github:NixOS/nixpkgs/nixos-25.11"; - nixos-facter-modules.url = "github:numtide/nixos-facter-modules"; - nixos-hardware.url = "github:NixOS/nixos-hardware/master"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-last-building.url = "github:NixOS/nixpkgs/59e69648d345d6e8fef86158c555730fa12af9de"; + nixos-facter-modules.url = "github:numtide/nixos-facter-modules"; + nixos-hardware.url = "github:NixOS/nixos-hardware/master"; determinate.url = "https://flakehub.com/f/DeterminateSystems/determinate/0.1"; - nur = { - url = "github:nix-community/NUR"; - inputs.nixpkgs.follows = "nixpkgs"; - }; agenix = { url = "github:ryantm/agenix"; inputs.darwin.follows = ""; @@ -46,7 +42,6 @@ self, nixpkgs, nixpkgs-last-building, - nur, nixos-facter-modules, nixos-hardware, determinate, @@ -105,7 +100,6 @@ ./extras/dev.nix ./extras/gaming.nix lsfg-vk-flake.nixosModules.default - nur.modules.nixos.default ]; }; NOmom = nixpkgs.lib.nixosSystem { diff --git a/systems/BASED.nix b/systems/BASED.nix index aeeb1ae..461cf80 100644 --- a/systems/BASED.nix +++ b/systems/BASED.nix @@ -21,14 +21,10 @@ nix.package = lib.mkIf (config.networking.hostName == "NOcomputer") pkgs.lixPackageSets.stable.lix; programs.pmount.enable = true; - services.eternal-terminal.enable = true; - programs.mosh.enable = true; environment.systemPackages = with pkgs; [ - eternal-terminal # keep-sorted start bat bottom - cachix cifs-utils dumbpipe dust diff --git a/systems/NOlaptop.nix b/systems/NOlaptop.nix index 82860bb..702d002 100644 --- a/systems/NOlaptop.nix +++ b/systems/NOlaptop.nix @@ -47,8 +47,7 @@ "amdgpu" ]; - # boot.kernelPackages = pkgs.linuxPackages_latest; - boot.kernelPackages = pkgs.nur.repos.Ev357.linux-patched; + boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelParams = [ "amdgpu.abmlevel=1" # amd doesn't have deep diff --git a/users/tao/helix.nix b/users/tao/helix.nix index ed84d2a..b7b4390 100644 --- a/users/tao/helix.nix +++ b/users/tao/helix.nix @@ -214,7 +214,7 @@ { name = "python"; auto-format = true; - language-servers = [/* "basedpyright" */ "ty" "ruff"]; + language-servers = ["basedpyright" "ty" "ruff"]; # formatter = { # command = "ruff"; # args = ["format"]; @@ -268,10 +268,10 @@ command = "microcad-lsp"; }; - # basedpyright = { - # command = "basedpyright-langserver"; - # args = ["--stdio"]; - # }; + basedpyright = { + command = "basedpyright-langserver"; + args = ["--stdio"]; + }; rust-analyzer.config.check.command = "clippy"; # gas = { # command = "asm-lsp";