diff --git a/flake.lock b/flake.lock index e8620bb..8324fde 100644 --- a/flake.lock +++ b/flake.lock @@ -85,11 +85,11 @@ ] }, "locked": { - "lastModified": 1779226674, - "narHash": "sha256-wuOkjI6pRiN4sEn/EPBRnNW5cmcpvd7xtIM8y5LooAs=", + "lastModified": 1777713215, + "narHash": "sha256-8GzXDOXckDWwST8TY5DbwYFjdvQLlP7K9CLSVx6iTTo=", "owner": "nix-community", "repo": "disko", - "rev": "65fb947964bd44fc0008faf77d1fcb7a9f40bb32", + "rev": "63b4e7e6cf75307c1d26ac3762b886b5b0247267", "type": "github" }, "original": { @@ -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", @@ -231,11 +210,11 @@ ] }, "locked": { - "lastModified": 1779213149, - "narHash": "sha256-Cf+p/T4Z3n9Sw0TiR3kQaIwQI+/hfvLJcoTzeq6yS3E=", + "lastModified": 1778876681, + "narHash": "sha256-9XOIxYLBp+sJsPWNnNyk1aVfYXuuRJZ4Anpplm9Tn8g=", "owner": "nix-community", "repo": "home-manager", - "rev": "bd868f769a69d3b6091a1da68a75cb83a181033c", + "rev": "c7fad8197070948d8aa02cb8922240ee129cab2e", "type": "github" }, "original": { @@ -309,11 +288,11 @@ }, "nixos": { "locked": { - "lastModified": 1779102034, - "narHash": "sha256-vZJZjLo513IeI8hjzHFc6TDezUd4uCE2Eq4SNO3DNNg=", + "lastModified": 1778737229, + "narHash": "sha256-6xWoytx8jFW4PF1GjRm/i/53trbpKGfz6zjzQGBr4cI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "687f05a9184cad4eaf905c48b63649e3a86f5433", + "rev": "d7a713c0b7e47c908258e71cba7a2d77cc8d71d5", "type": "github" }, "original": { @@ -340,11 +319,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1779258371, - "narHash": "sha256-j1iZsLy6oFApqR1oiDmHhvkwxXqcNi0aoSJj643LuwU=", + "lastModified": 1778593042, + "narHash": "sha256-xYGrSg6354UK2K4WSQd4+TfyvfqmvFbSY+ZtGQUXK0c=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "c97bc4d15bd3473dd095e8e8ba57330ab1943a77", + "rev": "9bd7c80d43e258aaa607d83b43661df11444d808", "type": "github" }, "original": { @@ -448,11 +427,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1778869304, - "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", + "lastModified": 1778443072, + "narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d233902339c02a9c334e7e593de68855ad26c4cb", + "rev": "da5ad661ba4e5ef59ba743f0d112cbc30e474f32", "type": "github" }, "original": { @@ -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" } }, @@ -544,11 +501,11 @@ ] }, "locked": { - "lastModified": 1779263007, - "narHash": "sha256-JkwxVCt7EHCrisHkzhMPKhfdaNAhpyyKuIdLoNYGuPI=", + "lastModified": 1778846616, + "narHash": "sha256-cqNwCnEdzUlUgNk9c3bVkXnEfmhzHvHre2Nr2C0sIfo=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "6891eb4b5fbac054b9406da94525daeec71646e3", + "rev": "3e3671b5f0e7c60e8f10bdf8667598603203546a", "type": "github" }, "original": { 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"; diff --git a/users/tao/nushell/completions/completions-docker.nu b/users/tao/nushell/completions/completions-docker.nu index 42daeef..e8e02cc 100644 --- a/users/tao/nushell/completions/completions-docker.nu +++ b/users/tao/nushell/completions/completions-docker.nu @@ -1,27 +1,7 @@ -export def "nu-complete docker ps" [] { +export def "nu-complete docker start" [] { docker ps --all --format json | from json --objects | select Names Image | rename value description } export extern "docker start" [ - ...recipe: string@"nu-complete docker ps" + ...recipe: string@"nu-complete docker start" ] - -export extern "docker stop" [ - ...recipe: string@"nu-complete docker ps" -] - -export extern "docker restart" [ - ...recipe: string@"nu-complete docker ps" -] - -export extern "docker rm" [ - ...recipe: string@"nu-complete docker ps" -] - -export def --wrapped "docker bash" [ - name: string@"nu-complete docker ps" - ...rest -] { - docker exec -it -e DISPLAY $name bash ...$rest -} -