diff --git a/extras/dev.nix b/extras/dev.nix index 59169b6..3fbfe42 100644 --- a/extras/dev.nix +++ b/extras/dev.nix @@ -3,17 +3,6 @@ pkgs, ... }: { - services.dockerRegistry = { - enable = true; - listenAddress = "0.0.0.0"; - port = 5000; - storagePath = "/var/lob/docker-registry"; - enableDelete = true; - enableGarbageCollect = true; - garbageCollectDates = "daily"; - openFirewall = false; - }; - boot.kernel.sysctl."vm.overcommit_memory" = "1"; # systemd.user.services.lspmux = { @@ -26,8 +15,6 @@ # }; programs.qgroundcontrol.enable = true; environment.systemPackages = with pkgs; [ - foxglove-studio - foxglove-cli claude-code # keep-sorted start sticky_comments=no # act @@ -79,11 +66,11 @@ wild # keep-sorted end - # # alloy - # bun - # docker-compose - # ngrok - # deno + # alloy + bun + docker-compose + ngrok + deno # # databases # sqlite diff --git a/flake.lock b/flake.lock index e3ada4a..d18e2d5 100644 --- a/flake.lock +++ b/flake.lock @@ -30,12 +30,12 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1780083956, - "narHash": "sha256-hhPxK9t1ofQnId9vcrtW2C7sC+fB6EJx6Q7RtqUAtKo=", - "rev": "efa5aa3cc1a40cf3dab8c07bfbc07f5edd44d4a6", - "revCount": 420, + "lastModified": 1779475417, + "narHash": "sha256-7/U/+X66C7XmLnt5JVJVtpx8wVDRU//Awaeqkq9+NNc=", + "rev": "8a9c57ea6b458a40589df60f26200b7d305354d1", + "revCount": 417, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/0.1.420%2Brev-efa5aa3cc1a40cf3dab8c07bfbc07f5edd44d4a6/019e7548-4f1c-7680-9b6c-839f3317a0da/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/0.1.417%2Brev-8a9c57ea6b458a40589df60f26200b7d305354d1/019e5102-f8d8-79f0-8541-a9816865d409/source.tar.gz?rev=8a9c57ea6b458a40589df60f26200b7d305354d1&revCount=417" }, "original": { "type": "tarball", @@ -85,11 +85,11 @@ ] }, "locked": { - "lastModified": 1780290312, - "narHash": "sha256-eTAlX0CwgB84Ts3GaBd944A3DRXVMzgA0EqroZBISUo=", + "lastModified": 1779699611, + "narHash": "sha256-EcCaSTKnmg2o4wLKaN1aqQFomwyhO7ik0bX9COdyCas=", "owner": "nix-community", "repo": "disko", - "rev": "115e5211780054d8a890b41f0b7734cafad54dfe", + "rev": "5ba0c9555c28685e57fa54c7a25e42c7efdbfc8d", "type": "github" }, "original": { @@ -190,11 +190,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1780320683, - "narHash": "sha256-fxpL42AirGqicF5FixBge4+tn32GtJu3rnacL7pzSiI=", + "lastModified": 1779750197, + "narHash": "sha256-Fcr61O7zcnFPPb0X1JvpKBX7SAnWrzoK6h/w/XJnlkg=", "owner": "helix-editor", "repo": "helix", - "rev": "72d583700adf1f0e4e79356662b563cd3a76ab88", + "rev": "0343e2e41c105cb093ffdf52b56a6e45b0046da5", "type": "github" }, "original": { @@ -231,11 +231,11 @@ ] }, "locked": { - "lastModified": 1780099287, - "narHash": "sha256-efIPwVGtIWIjWcznhaop6XN6HxnOL8800hF6CBNvlqQ=", + "lastModified": 1779726696, + "narHash": "sha256-/p37CB5n6Wpw250b0Lq0CYwNq2D8uGKzDoBulyLcQqA=", "owner": "nix-community", "repo": "home-manager", - "rev": "7d8127d308c3fb9664f7e643eec944be74ebb37d", + "rev": "1a95e2efb477959b70b4a14c51035975c0481df6", "type": "github" }, "original": { @@ -252,11 +252,11 @@ ] }, "locked": { - "lastModified": 1780099287, - "narHash": "sha256-efIPwVGtIWIjWcznhaop6XN6HxnOL8800hF6CBNvlqQ=", + "lastModified": 1778805320, + "narHash": "sha256-nGFJ01m2CTBKD4ABtcY4vLhHrRN91LKr/pn41PcU78A=", "owner": "nix-community", "repo": "home-manager", - "rev": "7d8127d308c3fb9664f7e643eec944be74ebb37d", + "rev": "9846abe15e7d0d36b8acbd4d05f2b87461744c92", "type": "github" }, "original": { @@ -309,11 +309,11 @@ }, "nixos": { "locked": { - "lastModified": 1779796641, - "narHash": "sha256-ZsIrKmhp4vbBXoXXmR/tBXA/UCsAQiJL9vsgZEduhVY=", + "lastModified": 1779467186, + "narHash": "sha256-nOesoDCiXcUftqbRBMz9tt4blI5PvljMWbm3kuCA+0s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "25f538306313eae3927264466c70d7001dcea1df", + "rev": "b77b3de8775677f84492abe84635f87b0e153f0f", "type": "github" }, "original": { @@ -339,15 +339,12 @@ } }, "nixos-hardware": { - "inputs": { - "nixpkgs": "nixpkgs_4" - }, "locked": { - "lastModified": 1780310866, - "narHash": "sha256-fPBRVf6A5xlACYcOI59shGrjURuvwu0lRsDoSCEXt/I=", + "lastModified": 1779258371, + "narHash": "sha256-j1iZsLy6oFApqR1oiDmHhvkwxXqcNi0aoSJj643LuwU=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "4ed851c979641e28597a05086332d75cdc9e395f", + "rev": "c97bc4d15bd3473dd095e8e8ba57330ab1943a77", "type": "github" }, "original": { @@ -450,19 +447,6 @@ } }, "nixpkgs_4": { - "locked": { - "lastModified": 1767892417, - "narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=", - "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba", - "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre924538.3497aa5c9457/nixexprs.tar.xz" - }, - "original": { - "type": "tarball", - "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" - } - }, - "nixpkgs_5": { "locked": { "lastModified": 1779560665, "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=", @@ -486,11 +470,11 @@ ] }, "locked": { - "lastModified": 1780329920, - "narHash": "sha256-1h43rRtAlJw3a2bvNiScnwFGrvDxSOXq1MmkKYyIX40=", + "lastModified": 1779756131, + "narHash": "sha256-//XfHx8NJar3xenOBltnZ8UcxEca4d4CBSmeWXNj6iI=", "owner": "nix-community", "repo": "NUR", - "rev": "f7a6f144246366adc7d6a3e20dcd7b4cdd9f2f32", + "rev": "bd1f99d01a6d100134d4e048819329bb013a4be2", "type": "github" }, "original": { @@ -510,7 +494,7 @@ "nixos": "nixos", "nixos-facter-modules": "nixos-facter-modules", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nixpkgs-last-building": "nixpkgs-last-building", "nur": "nur", "zen-browser": "zen-browser" @@ -560,11 +544,11 @@ ] }, "locked": { - "lastModified": 1780309250, - "narHash": "sha256-XE9QhtahY3C3/6DA0f7CsJ+RWDR4Y0OEucRFeTUpWFo=", + "lastModified": 1779649538, + "narHash": "sha256-k256zgHyqJ/0siFdq5y4GSwJyYKhQnW83N9K8S7OMKo=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "9c1e768c5cdf4be1db2989d14856022cfedb2fa1", + "rev": "e8fbde26a92a8c078fb1355c9f7c8dba5f7eb9d6", "type": "github" }, "original": { diff --git a/systems/BASED.nix b/systems/BASED.nix index 819f2be..05554d0 100644 --- a/systems/BASED.nix +++ b/systems/BASED.nix @@ -22,7 +22,11 @@ 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 @@ -57,10 +61,7 @@ # keep-sorted end ]; programs.partition-manager.enable = lib.mkDefault true; - programs.pmount.enable = lib.mkDefault true; - programs.mosh.enable = lib.mkDefault true; - fonts.fontDir.enable = true; fonts.packages = with pkgs; [ # keep-sorted start cooper-hewitt @@ -76,27 +77,27 @@ noto-fonts-color-emoji # keep-sorted end ]; - # system.userActivationScripts = { - # copy-fonts-local-share = { - # text = '' - # rm -rf ~/.local/share/fonts - # mkdir -p ~/.local/share/fonts - # # cp ${pkgs.cooper-hewitt}/share/fonts/truetype/* ~/.local/share/fonts/ - # # cp ${pkgs.ibm-plex}/share/fonts/truetype/* ~/.local/share/fonts/ - # # cp ${pkgs.inconsolata}/share/fonts/truetype/* ~/.local/share/fonts/ - # # cp ${pkgs.iosevka}/share/fonts/truetype/* ~/.local/share/fonts/ - # # cp ${pkgs.libertine}/share/fonts/truetype/* ~/.local/share/fonts/ - # # cp ${pkgs.linux-libertine-g}/share/fonts/truetype/* ~/.local/share/fonts/ - # # cp ${pkgs.nerd-fonts.fira-code}/share/fonts/truetype/* ~/.local/share/fonts/ - # # cp ${pkgs.nerd-fonts.iosevka-term}/share/fonts/truetype/* ~/.local/share/fonts/ - # # cp ${pkgs.noto-fonts-color-emoji}/share/fonts/truetype/* ~/.local/share/fonts/ - # cp ${pkgs.noto-fonts-cjk-sans}/share/fonts/opentype/* ~/.local/share/fonts/ - # cp ${pkgs.noto-fonts-cjk-serif}/share/fonts/opentype/* ~/.local/share/fonts/ - # chmod 544 ~/.local/share/fonts - # chmod 444 ~/.local/share/fonts/* - # ''; - # }; - # }; + system.userActivationScripts = { + copy-fonts-local-share = { + text = '' + rm -rf ~/.local/share/fonts + mkdir -p ~/.local/share/fonts + cp ${pkgs.cooper-hewitt}/share/fonts/truetype/* ~/.local/share/fonts/ + cp ${pkgs.ibm-plex}/share/fonts/truetype/* ~/.local/share/fonts/ + cp ${pkgs.inconsolata}/share/fonts/truetype/* ~/.local/share/fonts/ + cp ${pkgs.iosevka}/share/fonts/truetype/* ~/.local/share/fonts/ + cp ${pkgs.libertine}/share/fonts/truetype/* ~/.local/share/fonts/ + cp ${pkgs.linux-libertine-g}/share/fonts/truetype/* ~/.local/share/fonts/ + cp ${pkgs.nerd-fonts.fira-code}/share/fonts/truetype/* ~/.local/share/fonts/ + cp ${pkgs.nerd-fonts.iosevka-term}/share/fonts/truetype/* ~/.local/share/fonts/ + cp ${pkgs.noto-fonts-cjk-sans}/share/fonts/truetype/* ~/.local/share/fonts/ + cp ${pkgs.noto-fonts-cjk-serif}/share/fonts/truetype/* ~/.local/share/fonts/ + cp ${pkgs.noto-fonts-color-emoji}/share/fonts/truetype/* ~/.local/share/fonts/ + chmod 544 ~/.local/share/fonts + chmod 444 ~/.local/share/fonts/* + ''; + }; + }; hardware.graphics.enable = true; # hardware.opengl = { diff --git a/systems/NOlaptop.nix b/systems/NOlaptop.nix index 45d31ae..95e5639 100644 --- a/systems/NOlaptop.nix +++ b/systems/NOlaptop.nix @@ -17,12 +17,10 @@ # ]; environment.systemPackages = with pkgs; [ - # keep-sorted start - framework-tool fw-ectool - lact + framework-tool nvtopPackages.amd - # keep-sorted end + lact ]; services.lact.enable = true; @@ -48,9 +46,12 @@ "amdgpu" ]; - boot.kernelPackages = pkgs.linuxPackages_latest; + # boot.kernelPackages = pkgs.linuxPackages_latest; + boot.kernelPackages = pkgs.nur.repos.Ev357.linux-patched; boot.kernelParams = [ "amdgpu.abmlevel=1" + # amd doesn't have deep + # "mem_sleep_default=deep" ]; boot.kernelModules = ["amdgpu"]; powerManagement.cpuFreqGovernor = "powersave";