From 2dcdd0b29a5223f6eeca5d712c8f1ebc89dfb3c6 Mon Sep 17 00:00:00 2001 From: lsoriano-mcm Date: Thu, 7 Aug 2025 15:10:14 -0500 Subject: [PATCH] upd --- flake.lock | 279 ++------------------------------- flake.nix | 19 +-- hosts/hakase/configuration.nix | 6 + packages/neovim/home.nix | 2 +- packages/steam/default.nix | 7 - packages/steam/jovian.nix | 1 - 6 files changed, 25 insertions(+), 289 deletions(-) diff --git a/flake.lock b/flake.lock index 0f264bf..dc53967 100644 --- a/flake.lock +++ b/flake.lock @@ -1,21 +1,5 @@ { "nodes": { - "app2unit-src": { - "flake": false, - "locked": { - "lastModified": 1751917736, - "narHash": "sha256-TjePNU9Wu9kaXSczMAZcMV0HSC9zqzLcgKXdbkyLSAU=", - "owner": "Vladimir-csp", - "repo": "app2unit", - "rev": "6a2fe29210fd939571fdfcd78581965ef479c749", - "type": "github" - }, - "original": { - "owner": "Vladimir-csp", - "repo": "app2unit", - "type": "github" - } - }, "aquamarine": { "inputs": { "hyprutils": [ @@ -49,63 +33,6 @@ "type": "github" } }, - "caelestia-cli-src": { - "flake": false, - "locked": { - "lastModified": 1752705650, - "narHash": "sha256-+XPGBYwjvbsPx7HhST9QTliDWl2HG43l2mvV7bjHqr4=", - "ref": "refs/heads/main", - "rev": "4a0bd16dd50587343a2b95b2817608d2d5c47c3e", - "revCount": 268, - "type": "git", - "url": "https://git.sakamoto.dev/kenji/caelestia-cli" - }, - "original": { - "type": "git", - "url": "https://git.sakamoto.dev/kenji/caelestia-cli" - } - }, - "caelestia-shell": { - "inputs": { - "app2unit-src": "app2unit-src", - "caelestia-cli-src": "caelestia-cli-src", - "caelestia-shell-src": "caelestia-shell-src", - "flake-utils": "flake-utils", - "nixpkgs": [ - "nixpkgs" - ], - "quickshell": "quickshell" - }, - "locked": { - "lastModified": 1752705685, - "narHash": "sha256-0lh61BB1wR555O239wdf2wHeWn2xwbZxVxqF+nln5V4=", - "ref": "refs/heads/master", - "rev": "418754a149d692b3efd43dfb5cc3586c4d07d07f", - "revCount": 14, - "type": "git", - "url": "https://git.sakamoto.dev/kenji/caelestia-nix" - }, - "original": { - "type": "git", - "url": "https://git.sakamoto.dev/kenji/caelestia-nix" - } - }, - "caelestia-shell-src": { - "flake": false, - "locked": { - "lastModified": 1751355641, - "narHash": "sha256-GDarX9uOlXGc2NstZmCFXBl1g5iWvchL1QA9zuWKw4Q=", - "ref": "refs/heads/main", - "rev": "4b341ca16fda528987e5ac2745945d28f422d839", - "revCount": 806, - "type": "git", - "url": "https://git.sakamoto.dev/kenji/caelestia-dots" - }, - "original": { - "type": "git", - "url": "https://git.sakamoto.dev/kenji/caelestia-dots" - } - }, "chaotic": { "inputs": { "flake-schemas": "flake-schemas", @@ -241,27 +168,6 @@ "type": "github" } }, - "flake-parts_3": { - "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" - } - }, "flake-schemas": { "locked": { "lastModified": 1721999734, @@ -296,25 +202,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_5" + "systems": "systems_3" }, "locked": { "lastModified": 1731533236, @@ -538,7 +426,7 @@ "nixpkgs" ], "pre-commit-hooks": "pre-commit-hooks", - "systems": "systems_3", + "systems": "systems_2", "xdph": "xdph" }, "locked": { @@ -800,27 +688,6 @@ "type": "github" } }, - "matugen": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ], - "systems": "systems_4" - }, - "locked": { - "lastModified": 1745334376, - "narHash": "sha256-GZAesQW51EwCEB9w5caxgi87LiAMhVfP6GqZmet9VZc=", - "owner": "InioX", - "repo": "Matugen", - "rev": "4619cca93513470dc2a1833d9a138297cbccaf2e", - "type": "github" - }, - "original": { - "owner": "InioX", - "repo": "Matugen", - "type": "github" - } - }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -898,11 +765,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1751734292, - "narHash": "sha256-AeW333kvHQPHyhF1MH4ogtAuQmReNeCOJmOcvD2IHcM=", + "lastModified": 1754594915, + "narHash": "sha256-lw3FTqw0189AL0zVIC6Shltb5cfCX2ZGAEwDh7XXQjU=", "ref": "refs/heads/master", - "rev": "13cd454fb30d75a204ed245ec094210635cc22a6", - "revCount": 67, + "rev": "24fdf605ce3ec4b9e994297b77371722673f8612", + "revCount": 69, "type": "git", "url": "https://git.sakamoto.dev/kenji/nixovim.git" }, @@ -1013,31 +880,9 @@ "type": "github" } }, - "nur": { - "inputs": { - "flake-parts": "flake-parts_3", - "nixpkgs": [ - "nixpkgs" - ], - "treefmt-nix": "treefmt-nix_2" - }, - "locked": { - "lastModified": 1751596056, - "narHash": "sha256-YYSPbbr900ciunCWYPIvUbSnnchcMWH907w4LY7uyZs=", - "owner": "nix-community", - "repo": "NUR", - "rev": "8062772f4de4a7ce091bfdb88322e236cffcff30", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "NUR", - "type": "github" - } - }, "nuschtosSearch": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "ixx": "ixx", "nixpkgs": [ "nixovim", @@ -1082,61 +927,16 @@ "type": "github" } }, - "quickshell": { - "inputs": { - "nixpkgs": [ - "caelestia-shell", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1752486994, - "narHash": "sha256-/11zPRDdPPn61GXDyvDes9otFTP5lLqmETAtwMdeYWI=", - "ref": "refs/heads/master", - "rev": "5ac9096c1c63f6940c6b95f1118b540dfe029278", - "revCount": 632, - "type": "git", - "url": "https://git.outfoxxed.me/outfoxxed/quickshell" - }, - "original": { - "type": "git", - "url": "https://git.outfoxxed.me/outfoxxed/quickshell" - } - }, - "quickshell_2": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1753090730, - "narHash": "sha256-QG14m53ZGp2Gk7xD2Q+Tf7RYCKfk/BYRaBtX3X4IKbc=", - "ref": "refs/heads/master", - "rev": "db77c71c216530159c2dcf5b269ebb4706b2e2dd", - "revCount": 653, - "type": "git", - "url": "https://git.outfoxxed.me/outfoxxed/quickshell" - }, - "original": { - "type": "git", - "url": "https://git.outfoxxed.me/outfoxxed/quickshell" - } - }, "root": { "inputs": { - "caelestia-shell": "caelestia-shell", "chaotic": "chaotic", "darwin": "darwin", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils", "home-manager": "home-manager_2", "hyprland": "hyprland", "jovian": "jovian_2", - "matugen": "matugen", "nixovim": "nixovim", - "nixpkgs": "nixpkgs_4", - "nur": "nur", - "quickshell": "quickshell_2" + "nixpkgs": "nixpkgs_4" } }, "rust-overlay": { @@ -1195,50 +995,20 @@ }, "systems_2": { "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", "type": "github" }, "original": { "owner": "nix-systems", - "repo": "default", + "repo": "default-linux", "type": "github" } }, "systems_3": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "systems_4": { - "locked": { - "lastModified": 1689347949, - "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", - "owner": "nix-systems", - "repo": "default-linux", - "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default-linux", - "type": "github" - } - }, - "systems_5": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -1275,27 +1045,6 @@ "type": "github" } }, - "treefmt-nix_2": { - "inputs": { - "nixpkgs": [ - "nur", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733222881, - "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "49717b5af6f80172275d47a418c9719a31a78b53", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, "xdph": { "inputs": { "hyprland-protocols": [ diff --git a/flake.nix b/flake.nix index 6ec20b0..9215c26 100644 --- a/flake.nix +++ b/flake.nix @@ -6,11 +6,6 @@ flake-utils.url = "github:numtide/flake-utils"; chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; - nur = { - url = "github:nix-community/NUR"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - jovian = { url = "github:Jovian-Experiments/Jovian-NixOS"; inputs.nixpkgs.follows = "nixpkgs"; @@ -33,16 +28,6 @@ url = "git+https://git.sakamoto.dev/kenji/nixovim.git"; inputs.nixpkgs.follows = "nixpkgs"; }; - - quickshell = { - url = "git+https://git.outfoxxed.me/outfoxxed/quickshell"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - - caelestia-shell = { - url = "git+https://git.sakamoto.dev/kenji/caelestia-nix"; - inputs.nixpkgs.follows = "nixpkgs"; - }; }; outputs = { @@ -52,6 +37,8 @@ home-manager, darwin, chaotic, + nixovim, + jovian, ... } @ inputs: let config = import ./config.nix; @@ -80,6 +67,8 @@ modules = [ chaotic.nixosModules.default home-manager.nixosModules.home-manager + jovian.nixosModules.default + nixovim.nixosModules.default ./hosts/hakase/configuration.nix ]; }; diff --git a/hosts/hakase/configuration.nix b/hosts/hakase/configuration.nix index 8120c48..616c7a2 100644 --- a/hosts/hakase/configuration.nix +++ b/hosts/hakase/configuration.nix @@ -119,6 +119,12 @@ ''; zsh.enable = true; fish.enable = true; + + appimage = { + enable = true; + binfmt = true; + }; + ssh.extraConfig = myConfig.optionals.Ssh.extraConfig; }; diff --git a/packages/neovim/home.nix b/packages/neovim/home.nix index 0a28a65..dfc6ca5 100644 --- a/packages/neovim/home.nix +++ b/packages/neovim/home.nix @@ -5,6 +5,6 @@ ... }: { home.packages = [ - inputs.nixovim.packages.${system}.default + inputs.nixovim.packages.${system}.full ]; } diff --git a/packages/steam/default.nix b/packages/steam/default.nix index e84d8af..804acf8 100644 --- a/packages/steam/default.nix +++ b/packages/steam/default.nix @@ -3,13 +3,6 @@ myConfig, ... }: { - environment.systemPackages = with pkgs; [ - steam-run - ]; - - programs.appimage.enable = true; - programs.appimage.binfmt = true; - programs.steam = { enable = true; remotePlay.openFirewall = true; diff --git a/packages/steam/jovian.nix b/packages/steam/jovian.nix index 14e8f16..b1b7198 100644 --- a/packages/steam/jovian.nix +++ b/packages/steam/jovian.nix @@ -6,7 +6,6 @@ ... }: { imports = [ - inputs.jovian.nixosModules.default ]; environment.sessionVariables = { DECKY_HOME = "/home/${myConfig.essentials.Username}/homebrew";