From d69cc4e4005ab2fd429f652b45423093af3230b4 Mon Sep 17 00:00:00 2001 From: Tao Tien <29749622+taotien@users.noreply.github.com> Date: Sat, 8 Jun 2024 21:56:31 -0700 Subject: [PATCH] bump --- TODO | 1 - extras/folding.nix | 2 +- flake.lock | 30 +-- flake.nix | 19 +- ...sync-conflict-20240609-150050-TOQAAMI.lock | 235 ++++++++++++++++++ ....sync-conflict-20240609-150051-34PB6X7.nix | 125 ++++++++++ ...sync-conflict-20240609-150122-TOQAAMI.lock | 235 ++++++++++++++++++ systems/NOlaptop.nix | 3 - users/tao/nushell/config.nu | 1 - users/tao/nushell/stuff.nu | 1 - ...f.sync-conflict-20240609-150051-34PB6X7.nu | 148 +++++++++++ 11 files changed, 760 insertions(+), 40 deletions(-) delete mode 100644 TODO create mode 100644 flake.sync-conflict-20240609-150050-TOQAAMI.lock create mode 100644 flake.sync-conflict-20240609-150051-34PB6X7.nix create mode 100644 flake.sync-conflict-20240609-150122-TOQAAMI.lock create mode 100644 users/tao/nushell/stuff.sync-conflict-20240609-150051-34PB6X7.nu diff --git a/TODO b/TODO deleted file mode 100644 index 7137e98..0000000 --- a/TODO +++ /dev/null @@ -1 +0,0 @@ -- Disko diff --git a/extras/folding.nix b/extras/folding.nix index e73a7f8..5154df6 100644 --- a/extras/folding.nix +++ b/extras/folding.nix @@ -3,7 +3,7 @@ # boinctui ]; services.boinc = { - enable = true; + enable = false; }; # services.foldingathome = { diff --git a/flake.lock b/flake.lock index 6bc2b84..f69f3b8 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1717637172, - "narHash": "sha256-geTO9YL1V9zYGxupuZvKFWxh6II9sH2bjI1dmEVhVYQ=", + "lastModified": 1717770040, + "narHash": "sha256-eq9gP060TqWqRf2k4WO5FrG49rVq5Jy3Ptusg0CFdds=", "owner": "nix-community", "repo": "disko", - "rev": "713aa3df481782719aed4d8c20ad31a9effe3564", + "rev": "398acc470f7c2d68621db01900f053e6000129c4", "type": "github" }, "original": { @@ -128,11 +128,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1717724349, - "narHash": "sha256-ug980Dzgp4TV+oWzf5XlK9MCdLL4clJquGnwXfePQt0=", + "lastModified": 1717810515, + "narHash": "sha256-sLgNRYimDh5nRRzp/h4tENlRm2PDzPoy4YQA16aMH1o=", "owner": "lilyinstarlight", "repo": "nixos-cosmic", - "rev": "9049574deb0a50efd58a6ea5b9b8851f919a9983", + "rev": "65c027f7903b7cfb203d5267bc58c1c86e304b13", "type": "github" }, "original": { @@ -143,11 +143,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1717574423, - "narHash": "sha256-cz3P5MZffAHwL2IQaNzsqUBsJS+u0J/AAwArHMAcCa0=", + "lastModified": 1717828156, + "narHash": "sha256-YvstO0lobf3JWQuAfZCLYRTROC2ZDEgtWeQtWbO49p4=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d6c6cf6f5fead4057d8fb2d5f30aa8ac1727f177", + "rev": "057a7996d012f342a38a26261ee529cebb1755ef", "type": "github" }, "original": { @@ -173,11 +173,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1717555607, - "narHash": "sha256-WZ1s48OODmRJ3DHC+I/DtM3tDRuRJlNqMvxvAPTD7ec=", + "lastModified": 1717696253, + "narHash": "sha256-1+ua0ggXlYYPLTmMl3YeYYsBXDSCqT+Gw3u6l4gvMhA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0b8e7a1ae5a94da2e1ee3f3030a32020f6254105", + "rev": "9b5328b7f761a7bbdc0e332ac4cf076a3eedb89b", "type": "github" }, "original": { @@ -189,11 +189,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1717602782, - "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=", + "lastModified": 1717786204, + "narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e8057b67ebf307f01bdcc8fba94d94f75039d1f6", + "rev": "051f920625ab5aabe37c920346e3e69d7d34400e", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c4769ca..84f1a33 100644 --- a/flake.nix +++ b/flake.nix @@ -3,15 +3,11 @@ inputs = { nixpkgs.url = "nixpkgs/nixos-unstable"; - nixos-hardware.url = "nixos-hardware"; + nixos-hardware.url = "nixos-hardware/master"; agenix = { url = "github:ryantm/agenix"; inputs.darwin.follows = ""; }; - disko = { - url = "github:nix-community/disko"; - inputs.nixpkgs.follows = "nixpkgs"; - }; home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; @@ -48,7 +44,6 @@ nixpkgs, nixos-hardware, agenix, - disko, home-manager, plasma-manager, # helix, @@ -108,18 +103,6 @@ ./extras/uwuraid.nix ]; }; - NOserver-minecraft = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = {inherit inputs;}; - modules = [ - agenix.nixosModules.default - disko.nixosModules.disko - {disko.devices.disk.disk1.device = "/dev/vda";} - ./systems/NOserver.nix - ./extras/disk-config.nix - ./extras/minecraft-server.nix - ]; - }; }; }; } diff --git a/flake.sync-conflict-20240609-150050-TOQAAMI.lock b/flake.sync-conflict-20240609-150050-TOQAAMI.lock new file mode 100644 index 0000000..cf496bb --- /dev/null +++ b/flake.sync-conflict-20240609-150050-TOQAAMI.lock @@ -0,0 +1,235 @@ +{ + "nodes": { + "agenix": { + "inputs": { + "darwin": [], + "home-manager": "home-manager", + "nixpkgs": "nixpkgs", + "systems": "systems" + }, + "locked": { + "lastModified": 1716561646, + "narHash": "sha256-UIGtLO89RxKt7RF2iEgPikSdU53r6v/6WYB0RW3k89I=", + "owner": "ryantm", + "repo": "agenix", + "rev": "c2fc0762bbe8feb06a2e59a364fa81b3a57671c9", + "type": "github" + }, + "original": { + "owner": "ryantm", + "repo": "agenix", + "type": "github" + } + }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1717312683, + "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=", + "owner": "nix-community", + "repo": "flake-compat", + "rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "flake-compat", + "type": "github" + } + }, + "home-manager": { + "inputs": { + "nixpkgs": [ + "agenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1703113217, + "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1717525419, + "narHash": "sha256-5z2422pzWnPXHgq2ms8lcCfttM0dz+hg+x1pCcNkAws=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "a7117efb3725e6197dd95424136f79147aa35e5b", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_3": { + "inputs": { + "nixpkgs": [ + "plasma-manager", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1714377222, + "narHash": "sha256-UsDsjWCKlWn8vbXi8Zza9Hkq3xyk8fpvFNo2VM5S74E=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "2af7c78b7bb9cf18406a193eba13ef9f99388f49", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "nixos-cosmic": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1717684035, + "narHash": "sha256-c11jn4cJq7+Dsv8BrTRCFiw/pXqAX8lMcFjYOSjko4c=", + "owner": "lilyinstarlight", + "repo": "nixos-cosmic", + "rev": "94de8d686ffdadb3741c39009d05d8a660d1faea", + "type": "github" + }, + "original": { + "owner": "lilyinstarlight", + "repo": "nixos-cosmic", + "type": "github" + } + }, + "nixos-hardware": { + "locked": { + "lastModified": 1717574423, + "narHash": "sha256-cz3P5MZffAHwL2IQaNzsqUBsJS+u0J/AAwArHMAcCa0=", + "owner": "NixOS", + "repo": "nixos-hardware", + "rev": "d6c6cf6f5fead4057d8fb2d5f30aa8ac1727f177", + "type": "github" + }, + "original": { + "id": "nixos-hardware", + "ref": "master", + "type": "indirect" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1703013332, + "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1717555607, + "narHash": "sha256-WZ1s48OODmRJ3DHC+I/DtM3tDRuRJlNqMvxvAPTD7ec=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0b8e7a1ae5a94da2e1ee3f3030a32020f6254105", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1717196966, + "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, + "plasma-manager": { + "inputs": { + "home-manager": "home-manager_3", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1717666468, + "narHash": "sha256-SKPMh/Apjk3DhY0B/SqTvmt1/UFf2AHwoVPTGA6Md9c=", + "owner": "pjones", + "repo": "plasma-manager", + "rev": "d982fe0063be13bbe57a0c4ace8b406236812b94", + "type": "github" + }, + "original": { + "owner": "pjones", + "repo": "plasma-manager", + "type": "github" + } + }, + "root": { + "inputs": { + "agenix": "agenix", + "home-manager": "home-manager_2", + "nixos-cosmic": "nixos-cosmic", + "nixos-hardware": "nixos-hardware", + "nixpkgs": "nixpkgs_2", + "plasma-manager": "plasma-manager" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.sync-conflict-20240609-150051-34PB6X7.nix b/flake.sync-conflict-20240609-150051-34PB6X7.nix new file mode 100644 index 0000000..c4769ca --- /dev/null +++ b/flake.sync-conflict-20240609-150051-34PB6X7.nix @@ -0,0 +1,125 @@ +{ + description = "we say NO to shitty OSes"; + + inputs = { + nixpkgs.url = "nixpkgs/nixos-unstable"; + nixos-hardware.url = "nixos-hardware"; + agenix = { + url = "github:ryantm/agenix"; + inputs.darwin.follows = ""; + }; + disko = { + url = "github:nix-community/disko"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + home-manager = { + url = "github:nix-community/home-manager"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + plasma-manager = { + url = "github:pjones/plasma-manager"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + # helix = { + # url = "github:the-mikedavis/helix"; + # inputs.nixpkgs.follows = "nixpkgs"; + # }; + nixos-cosmic = { + url = "github:lilyinstarlight/nixos-cosmic"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + # prescurve.url = "github:taotien/prescurve"; + # prescurve.inputs.nixpkgs.follows = "nixpkgs"; + }; + + nixConfig = { + extra-substituters = [ + "https://cosmic.cachix.org/" + # "https://helix.cachix.org/" + ]; + extra-trusted-public-keys = [ + "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" + # "helix.cachix.org-1:ejp9KQpR1FBI2onstMQ34yogDm4OgU2ru6lIwPvuCVs=" + ]; + }; + + outputs = { + self, + nixpkgs, + nixos-hardware, + agenix, + disko, + home-manager, + plasma-manager, + # helix, + nixos-cosmic, + ... + } @ inputs: { + nixosConfigurations = { + NOcomputer = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + specialArgs = {inherit inputs;}; + modules = [ + nixos-hardware.nixosModules.common-cpu-amd + nixos-hardware.nixosModules.common-cpu-amd-pstate + nixos-hardware.nixosModules.common-gpu-nvidia-nonprime + agenix.nixosModules.default + home-manager.nixosModules.home-manager + ./systems/BASED.nix + ./systems/NOcomputer.nix + ./users/tao.nix + ./extras/uwuraid.nix + ./extras/dev.nix + ./extras/gaming.nix + ./extras/folding.nix + nixos-cosmic.nixosModules.default + ./extras/cosmic.nix + ]; + }; + NOlaptop = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + specialArgs = {inherit inputs;}; + modules = [ + nixos-hardware.nixosModules.framework-16-7040-amd + agenix.nixosModules.default + home-manager.nixosModules.home-manager + ./systems/BASED.nix + ./systems/NOlaptop.nix + ./users/tao.nix + ./extras/uwuraid.nix + ./extras/dev.nix + ./extras/gaming.nix + nixos-cosmic.nixosModules.default + ./extras/cosmic.nix + ]; + }; + NOmom = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + specialArgs = {inherit inputs;}; + modules = [ + nixos-hardware.nixosModules.common-cpu-intel + # inputs.nixos-hardware.nixosModules.framework-12th-gen-intel + agenix.nixosModules.default + home-manager.nixosModules.home-manager + ./systems/BASED.nix + ./systems/NOmom.nix + ./users/tao.nix + ./users/vy.nix + ./extras/uwuraid.nix + ]; + }; + NOserver-minecraft = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + specialArgs = {inherit inputs;}; + modules = [ + agenix.nixosModules.default + disko.nixosModules.disko + {disko.devices.disk.disk1.device = "/dev/vda";} + ./systems/NOserver.nix + ./extras/disk-config.nix + ./extras/minecraft-server.nix + ]; + }; + }; + }; +} diff --git a/flake.sync-conflict-20240609-150122-TOQAAMI.lock b/flake.sync-conflict-20240609-150122-TOQAAMI.lock new file mode 100644 index 0000000..cf496bb --- /dev/null +++ b/flake.sync-conflict-20240609-150122-TOQAAMI.lock @@ -0,0 +1,235 @@ +{ + "nodes": { + "agenix": { + "inputs": { + "darwin": [], + "home-manager": "home-manager", + "nixpkgs": "nixpkgs", + "systems": "systems" + }, + "locked": { + "lastModified": 1716561646, + "narHash": "sha256-UIGtLO89RxKt7RF2iEgPikSdU53r6v/6WYB0RW3k89I=", + "owner": "ryantm", + "repo": "agenix", + "rev": "c2fc0762bbe8feb06a2e59a364fa81b3a57671c9", + "type": "github" + }, + "original": { + "owner": "ryantm", + "repo": "agenix", + "type": "github" + } + }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1717312683, + "narHash": "sha256-FrlieJH50AuvagamEvWMIE6D2OAnERuDboFDYAED/dE=", + "owner": "nix-community", + "repo": "flake-compat", + "rev": "38fd3954cf65ce6faf3d0d45cd26059e059f07ea", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "flake-compat", + "type": "github" + } + }, + "home-manager": { + "inputs": { + "nixpkgs": [ + "agenix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1703113217, + "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1717525419, + "narHash": "sha256-5z2422pzWnPXHgq2ms8lcCfttM0dz+hg+x1pCcNkAws=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "a7117efb3725e6197dd95424136f79147aa35e5b", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager_3": { + "inputs": { + "nixpkgs": [ + "plasma-manager", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1714377222, + "narHash": "sha256-UsDsjWCKlWn8vbXi8Zza9Hkq3xyk8fpvFNo2VM5S74E=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "2af7c78b7bb9cf18406a193eba13ef9f99388f49", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "nixos-cosmic": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable" + }, + "locked": { + "lastModified": 1717684035, + "narHash": "sha256-c11jn4cJq7+Dsv8BrTRCFiw/pXqAX8lMcFjYOSjko4c=", + "owner": "lilyinstarlight", + "repo": "nixos-cosmic", + "rev": "94de8d686ffdadb3741c39009d05d8a660d1faea", + "type": "github" + }, + "original": { + "owner": "lilyinstarlight", + "repo": "nixos-cosmic", + "type": "github" + } + }, + "nixos-hardware": { + "locked": { + "lastModified": 1717574423, + "narHash": "sha256-cz3P5MZffAHwL2IQaNzsqUBsJS+u0J/AAwArHMAcCa0=", + "owner": "NixOS", + "repo": "nixos-hardware", + "rev": "d6c6cf6f5fead4057d8fb2d5f30aa8ac1727f177", + "type": "github" + }, + "original": { + "id": "nixos-hardware", + "ref": "master", + "type": "indirect" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1703013332, + "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1717555607, + "narHash": "sha256-WZ1s48OODmRJ3DHC+I/DtM3tDRuRJlNqMvxvAPTD7ec=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0b8e7a1ae5a94da2e1ee3f3030a32020f6254105", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1717196966, + "narHash": "sha256-yZKhxVIKd2lsbOqYd5iDoUIwsRZFqE87smE2Vzf6Ck0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "57610d2f8f0937f39dbd72251e9614b1561942d8", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, + "plasma-manager": { + "inputs": { + "home-manager": "home-manager_3", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1717666468, + "narHash": "sha256-SKPMh/Apjk3DhY0B/SqTvmt1/UFf2AHwoVPTGA6Md9c=", + "owner": "pjones", + "repo": "plasma-manager", + "rev": "d982fe0063be13bbe57a0c4ace8b406236812b94", + "type": "github" + }, + "original": { + "owner": "pjones", + "repo": "plasma-manager", + "type": "github" + } + }, + "root": { + "inputs": { + "agenix": "agenix", + "home-manager": "home-manager_2", + "nixos-cosmic": "nixos-cosmic", + "nixos-hardware": "nixos-hardware", + "nixpkgs": "nixpkgs_2", + "plasma-manager": "plasma-manager" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/systems/NOlaptop.nix b/systems/NOlaptop.nix index f3a0f95..18543c9 100644 --- a/systems/NOlaptop.nix +++ b/systems/NOlaptop.nix @@ -81,9 +81,6 @@ "amdgpu.abmlevel=1" ]; boot.kernelModules = ["kvm-amd"]; - boot.extraModulePackages = with config.boot.kernelPackages; [ - framework-laptop-kmod - ]; powerManagement.cpuFreqGovernor = "powersave"; systemd.sleep.extraConfig = "HibernateDelaySec=180m"; diff --git a/users/tao/nushell/config.nu b/users/tao/nushell/config.nu index 2017b7c..8252ffc 100644 --- a/users/tao/nushell/config.nu +++ b/users/tao/nushell/config.nu @@ -197,7 +197,6 @@ $env.config = { use_ansi_coloring: true bracketed_paste: true # enable bracketed paste, currently useless on windows edit_mode: emacs # emacs, vi - shell_integration: false # enables terminal shell integration. Off by default, as some terminals have issues with this. render_right_prompt_on_last_line: false # true or false to enable or disable right prompt to be rendered on last line of the prompt. hooks: { diff --git a/users/tao/nushell/stuff.nu b/users/tao/nushell/stuff.nu index fa099e0..bed2d8a 100644 --- a/users/tao/nushell/stuff.nu +++ b/users/tao/nushell/stuff.nu @@ -74,7 +74,6 @@ def tse [exit_node: string = ""] { } else { tailscale set --exit-node $exit_node } - sleep 5sec http get https://am.i.mullvad.net/json } def tsp [] { diff --git a/users/tao/nushell/stuff.sync-conflict-20240609-150051-34PB6X7.nu b/users/tao/nushell/stuff.sync-conflict-20240609-150051-34PB6X7.nu new file mode 100644 index 0000000..9f6fbdf --- /dev/null +++ b/users/tao/nushell/stuff.sync-conflict-20240609-150051-34PB6X7.nu @@ -0,0 +1,148 @@ +task + +alias b = btm +alias cringe = sudo bootctl set-oneshot auto-windows +alias fetch = fastfetch +alias ff = firefox +alias pu = pueue +alias t = task +alias zl = zellij + +alias jd = jj diff +alias jc = jj desc +alias js = jj status +alias jp = jj git push +alias jm = jj branch set main + +def c [path: path = "~"] { + cd $path + l +} +def l [ + --all (-a) + --long (-l) + path: path = "." +] { + if $all and $long { + ls -la $path + } else if $all { + ls -a $path + } else if $long { + ls -l $path + } else { + ls $path + } + | sort-by type name -i -n +} + +def srg [pattern] { + sk --ansi -i -c 'rg --color=always --line-number "{}"' +} + +alias nd = nix develop +def ns [package] { + nix shell $"nixpkgs#($package)" +} +def nr [package] { + nix search nixpkgs $package +} + +def rebuild [subcommand] { + sudo nice -n19 nixos-rebuild $subcommand --flake /home/tao/projects/NOflake/ --impure --verbose + rm -r ~/.config/helix/runtime/grammars/ + hx --grammar fetch; hx --grammar build + rustup update +} +def bump [] { + cd /home/tao/projects/NOflake/ + jj new -m "bump" + nix flake update + # rc2nix | save -f /home/tao/projects/NOflake/users/tao/plasma.nix; + # sudo nix store ping --store ssh://nocomputer + rebuild boot + jj new +} +alias rb = rebuild boot +alias rs = rebuild switch +alias gc = nh clean all + + +def tse [exit_node: string = ""] { + if ($exit_node | is-empty) and (ps | find deluge | is-not-empty) { + print "stop summoning first!" + return + } else { + tailscale set --exit-node $exit_node + } + sleep 5sec + http get https://am.i.mullvad.net/json +} +# def tsp [] { +# tailscale exit-node list +# | split row "\n" +# | each {str trim} +# | filter {is-not-empty} +# | skip 1 +# | last 19 +# | first 17 +# | split column -r '\s{2,}' +# | reject column5 column3 +# | rename ip addr city +# | par-each { +# insert ping { +# |row| $row.addr +# | str replace "mullvad.ts.net" "relays.mullvad.net" +# | ping -c5 -q $in +# | split row "\n" +# | last +# | split column "/" +# | get column6? +# | get 0 +# } +# } +# | sort-by ping -n -r +# } +def tsr [] { + tailscale status --json + | from json + | get Peer + | transpose nodekey node + | get node + | filter {$in.Location?.Country == USA} + | get TailscaleIPs + | each {get 0} + | select (random int 0..($in | length)) + | tse $in.0 + # tailscale status + http get https://am.i.mullvad.net/json +} +alias ts = tailscale +alias tss = tailscale status +alias tsu = tailscale up +alias tsd = tailscale down +alias tsx = tailscale exit-node list +alias tsp = tailscale exit-node suggest + +def "config stuff" [] { + hx ~/projects/NOflake/users/tao/nushell/stuff.nu +} + +def deluge-gtk [] { + tsr + deluge-gtk +} +alias deluge = deluge-gtk + +def fixme [] { + rg TODO --json + | lines + | each {from json} + | where type == "match" + | get data + | flatten + | each {$"($in.text):($in.line_number)"} + | hx ...$in +} + +source ~/.cache/starship/init.nu +source ~/.zoxide.nu