diff --git a/config/hosts/imxyy-nix/home.nix b/config/hosts/imxyy-nix/home.nix index d91f6eb..40775d4 100644 --- a/config/hosts/imxyy-nix/home.nix +++ b/config/hosts/imxyy-nix/home.nix @@ -16,7 +16,7 @@ anki - ayugram-desktop + working.ayugram-desktop signal-desktop element-desktop fractal @@ -162,4 +162,4 @@ ]; }; }; -} +} \ No newline at end of file diff --git a/flake.lock b/flake.lock index c6f2218..d374df6 100644 --- a/flake.lock +++ b/flake.lock @@ -106,11 +106,11 @@ ] }, "locked": { - "lastModified": 1761906071, - "narHash": "sha256-uq0X0KRzZkKGlkU1ARM+LWCAVvSYJZtTMpuzMO6LXRs=", + "lastModified": 1763110997, + "narHash": "sha256-S2vF+3D/9vna3/vBV7LHiGUbp+ltPsQhvccIyim6VQg=", "owner": "catppuccin", "repo": "nix", - "rev": "fd1bc7b1af0a576edb13c166c4b1f7b5c7555a73", + "rev": "e6928cdd3dd20636326c2756d2bc8fd1cd825768", "type": "github" }, "original": { @@ -128,11 +128,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1761827347, - "narHash": "sha256-tIrTFSntAyXVrQE9GnauXzQxEZJCZA9TEp4jAENsgwA=", + "lastModified": 1762966292, + "narHash": "sha256-WJtAHPDOJRd/ecQJBFyuyqBIbDG0ocdQuBGPBRRsgew=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "0c234b99a8606b482d6644e1f2d26d41985fb85c", + "rev": "037d0bb4a6b51609e66fab2221d3bca2d3b5fa3b", "type": "github" }, "original": { @@ -149,11 +149,11 @@ ] }, "locked": { - "lastModified": 1761698061, - "narHash": "sha256-iyvYHJn9K+cnW2+icxGA3qm69W8RpCz1v8+rb2U/KzQ=", + "lastModified": 1763015923, + "narHash": "sha256-IJGWKVxztJT/NsonaRjWm5OaW07Rg+kBr6NMhfQiJzM=", "owner": "Bali10050", "repo": "Darkly", - "rev": "b9260d390fb8c673a37500f567b11e3b297216cc", + "rev": "5a323b775695f889b495d9f499eceb38ed538b42", "type": "github" }, "original": { @@ -192,11 +192,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1761979010, - "narHash": "sha256-isqMvjTk3jdTHN6KA/BWQvOSVe7O35OQKAZNtLK76OY=", + "lastModified": 1763150544, + "narHash": "sha256-Vnps7OKuHLqOTBRnspMhjHQ11mKyfUlhHEZ2anTEAp8=", "owner": "nix-community", "repo": "fenix", - "rev": "3107255abfe4f2d1c3eee7a3e2f5a5eb6f2200fe", + "rev": "6479b325536a1c87dedbc67d5ee4cb42ce014438", "type": "github" }, "original": { @@ -240,11 +240,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "type": "github" }, "original": { @@ -466,8 +466,8 @@ }, "original": { "owner": "imxyy1soope1", - "ref": "master", "repo": "go-musicfox", + "rev": "938c4d6bb2a318bc6251f3b11fa8cf54d29b4419", "type": "github" } }, @@ -500,11 +500,11 @@ ] }, "locked": { - "lastModified": 1761770832, - "narHash": "sha256-IQIWG6kHxnUpx5KEb9r0BROL3/R6UQ/30aO2oHncBA8=", + "lastModified": 1762787259, + "narHash": "sha256-t2U/GLLXHa2+kJkwnFNRVc2fEJ/lUfyZXBE5iKzJdcs=", "owner": "nix-community", "repo": "home-manager", - "rev": "124b99dbd1594dbebdd575ac7142752ee96a98a0", + "rev": "37a3d97f2873e0f68711117c34d04b7c7ead8f4e", "type": "github" }, "original": { @@ -520,11 +520,11 @@ ] }, "locked": { - "lastModified": 1761878381, - "narHash": "sha256-lCRaipHgszaFZ1Cs8fdGJguVycCisBAf2HEFgip5+xU=", + "lastModified": 1762964643, + "narHash": "sha256-RYHN8O/Aja59XDji6WSJZPkJpYVUfpSkyH+PEupBJqM=", "owner": "nix-community", "repo": "home-manager", - "rev": "4ac96eb21c101a3e5b77ba105febc5641a8959aa", + "rev": "827f2a23373a774a8805f84ca5344654c31f354b", "type": "github" }, "original": { @@ -542,11 +542,11 @@ ] }, "locked": { - "lastModified": 1752603129, - "narHash": "sha256-S+wmHhwNQ5Ru689L2Gu8n1OD6s9eU9n9mD827JNR+kw=", + "lastModified": 1762964643, + "narHash": "sha256-RYHN8O/Aja59XDji6WSJZPkJpYVUfpSkyH+PEupBJqM=", "owner": "nix-community", "repo": "home-manager", - "rev": "e8c19a3cec2814c754f031ab3ae7316b64da085b", + "rev": "827f2a23373a774a8805f84ca5344654c31f354b", "type": "github" }, "original": { @@ -595,11 +595,11 @@ ] }, "locked": { - "lastModified": 1761748321, - "narHash": "sha256-hD5mVzmUeyVppjArdy2uVdQe/CQUR9i3WgZB05onE7A=", + "lastModified": 1762856455, + "narHash": "sha256-x7zgteJWIlbVexL2ubOadUXKlHSjh0RAjLO1KfWdgpU=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "533db5857c9e00ca352558a928417116ee08a824", + "rev": "29a671ae20223d182eaf54b963a735230497c2f9", "type": "github" }, "original": { @@ -664,11 +664,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1761724527, - "narHash": "sha256-nB500dSUaNBtOsu5JI1PDNmjuFD6Kdbkh648q0FoaIY=", + "lastModified": 1763126448, + "narHash": "sha256-LVYJJObvkWwR8QB/Srr6Rks+Fw2lYvnRNOH0etV9DM8=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "1ff74954f559bb2da63e28b3fcffd3b09ec32842", + "rev": "add7bcf2925547e180cc2fe6d5f4b5e7c579d086", "type": "github" }, "original": { @@ -697,11 +697,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1761721311, - "narHash": "sha256-fXBALdA4CKAYslcuamjzQZLUTCNBIKWybj+/2rwe3Z0=", + "lastModified": 1763014447, + "narHash": "sha256-nmu7S8J9IJKLQyIkSU8QWYHygrfw76NHGTkcr+bXMX0=", "owner": "YaLTeR", "repo": "niri", - "rev": "6e8fd153395036c2daa7c214695ed9baf2409a2e", + "rev": "a52df533c4694b5ed0a04140af60fd26146df911", "type": "github" }, "original": { @@ -800,11 +800,11 @@ ] }, "locked": { - "lastModified": 1761969132, - "narHash": "sha256-0me4+e+1VxNuvySSw0voqMCWU/eUmTuth7f4+Q2jbUY=", + "lastModified": 1762908663, + "narHash": "sha256-HqdYfzBaidYX+EYAcXDFCggXJPZBv2fusMwhc7/4+cI=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "761582d6ab431549fe1396d2cd681e3fe9376020", + "rev": "debc562c48c445f9f08778ecb9fc6b35197623ad", "type": "github" }, "original": { @@ -815,11 +815,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1761672384, - "narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=", + "lastModified": 1762844143, + "narHash": "sha256-SlybxLZ1/e4T2lb1czEtWVzDCVSTvk9WLwGhmxFmBxI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c", + "rev": "9da7f1cf7f8a6e2a7cb3001b048546c92a8258b4", "type": "github" }, "original": { @@ -843,11 +843,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1761993804, - "narHash": "sha256-hAzNOwXGbmXcoHAoHhMKcm2A/QRoatYon7gjVcD4dNE=", + "lastModified": 1763185868, + "narHash": "sha256-jKSDU/8nSpYyyd8i0jZMSeq0N6DT2AAT/L3GrIOSrUw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "497be408195b0a64eb89f2ced3b70aec7268bbb2", + "rev": "9ef55366d2e9176fb46469a753c7d2161bb06710", "type": "github" }, "original": { @@ -859,11 +859,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1761468971, - "narHash": "sha256-vY2OLVg5ZTobdroQKQQSipSIkHlxOTrIF1fsMzPh8w8=", + "lastModified": 1763049705, + "narHash": "sha256-A5LS0AJZ1yDPTa2fHxufZN++n8MCmtgrJDtxFxrH4S8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "78e34d1667d32d8a0ffc3eba4591ff256e80576e", + "rev": "3acb677ea67d4c6218f33de0db0955f116b7588c", "type": "github" }, "original": { @@ -875,11 +875,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1761992524, - "narHash": "sha256-yNHj/YYnB+I2MV1rjvMzdMWJEx1vPYOac95oGPsVYaM=", + "lastModified": 1763182931, + "narHash": "sha256-L3ocbCSpekZCLSDuByaSfb6rwe7Qban8d782bc/j0l4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7d6d8af114cb68bb99a55b7f4a3c0dffebd4c1c5", + "rev": "d82502b7773487d325a541ce84deb166cea3748a", "type": "github" }, "original": { @@ -891,11 +891,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1761907660, - "narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=", + "lastModified": 1762977756, + "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15", + "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", "type": "github" }, "original": { @@ -905,6 +905,22 @@ "type": "github" } }, + "nixpkgs-working": { + "locked": { + "lastModified": 1762844143, + "narHash": "sha256-SlybxLZ1/e4T2lb1czEtWVzDCVSTvk9WLwGhmxFmBxI=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "9da7f1cf7f8a6e2a7cb3001b048546c92a8258b4", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "9da7f1cf7f8a6e2a7cb3001b048546c92a8258b4", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1730531603, @@ -955,11 +971,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1761373498, - "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=", + "lastModified": 1762977756, + "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce", + "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", "type": "github" }, "original": { @@ -969,6 +985,22 @@ "type": "github" } }, + "nixpkgs_6": { + "locked": { + "lastModified": 1761236834, + "narHash": "sha256-+pthv6hrL5VLW2UqPdISGuLiUZ6SnAXdd2DdUE+fV2Q=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "d5faa84122bc0a1fd5d378492efce4e289f8eac1", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "noctalia": { "inputs": { "nixpkgs": [ @@ -990,6 +1022,7 @@ "original": { "owner": "noctalia-dev", "repo": "noctalia-shell", + "rev": "34a6947ad69ff9aec4960e0d1d618a0c041943ca", "type": "github" } }, @@ -1042,11 +1075,11 @@ ] }, "locked": { - "lastModified": 1761897390, - "narHash": "sha256-er4gYrIoThYLjlsOMTysoRfn67d1Gci+ZpqDrtQxrA0=", + "lastModified": 1763115162, + "narHash": "sha256-TgHTFlFI9tZ4kp4yy8fcfy98srgcob9gcOeuKjs1Mw4=", "owner": "outfoxxed", "repo": "quickshell", - "rev": "fc704e6b5d445899a1565955268c91942a4f263f", + "rev": "a00ff0394431d1fe3f33ae0934c981930e2a1efb", "type": "github" }, "original": { @@ -1074,22 +1107,24 @@ "nixpkgs-master": "nixpkgs-master", "nixpkgs-stable": "nixpkgs-stable_2", "nixpkgs-unstable": "nixpkgs-unstable", + "nixpkgs-working": "nixpkgs-working", "noctalia": "noctalia", "plant": "plant", "quickshell": "quickshell", "sops-nix": "sops-nix", "stylix": "stylix", + "treefmt": "treefmt", "zen": "zen" } }, "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1761894503, - "narHash": "sha256-SreGV62DEv7kLJEcOBrw2V6Kup0siT4wS3Ye8PlFTdE=", + "lastModified": 1762860488, + "narHash": "sha256-rMfWMCOo/pPefM2We0iMBLi2kLBAnYoB9thi4qS7uk4=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "2e2e3ebec91215078de9b754363fc9a7b0fdef13", + "rev": "2efc80078029894eec0699f62ec8d5c1a56af763", "type": "github" }, "original": { @@ -1107,11 +1142,11 @@ ] }, "locked": { - "lastModified": 1761758177, - "narHash": "sha256-MsVJG2gQTm6n2jIGu2KDT87AMeMx1GExOaEQqNkQKVE=", + "lastModified": 1762915112, + "narHash": "sha256-d9j1g8nKmYDHy+/bIOPQTh9IwjRliqaTM0QLHMV92Ic=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "37f8f092415b444c3bed6eda6bcbee51cee22e5d", + "rev": "aa1e85921cfa04de7b6914982a94621fbec5cc02", "type": "github" }, "original": { @@ -1127,11 +1162,11 @@ ] }, "locked": { - "lastModified": 1761064406, - "narHash": "sha256-8KLclb3V/13kqoxqSowA7dSBzbkzRS3JqtEplYb74Gs=", + "lastModified": 1763111468, + "narHash": "sha256-EK8coWrd1AkP4813/tY0fNqaJ0B5tyS/FfC6TSL8P0M=", "owner": "Mic92", "repo": "sops-nix", - "rev": "b83b1a4a105bd3a255b8c0f339c7231fa8aad2e5", + "rev": "d623efbbaa7cb0f1b13d7191029dc669f260460a", "type": "github" }, "original": { @@ -1162,11 +1197,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1761840967, - "narHash": "sha256-alE8Vesztx3tPxXpJURtYWD8x1cXaU/x+10Q6hbgGBY=", + "lastModified": 1762264356, + "narHash": "sha256-QVfC53Ri+8n3e7Ujx9kq6all3+TLBRRPRnc6No5qY5w=", "owner": "danth", "repo": "stylix", - "rev": "c33226f205aeab42a170913cd1f8bc3428b7e6b1", + "rev": "647bb8dd96a206a1b79c4fd714affc88b409e10b", "type": "github" }, "original": { @@ -1301,6 +1336,24 @@ "type": "github" } }, + "treefmt": { + "inputs": { + "nixpkgs": "nixpkgs_6" + }, + "locked": { + "lastModified": 1762938485, + "narHash": "sha256-AlEObg0syDl+Spi4LsZIBrjw+snSVU4T8MOeuZJUJjM=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "xwayland-satellite-stable": { "flake": false, "locked": { @@ -1321,11 +1374,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1761622056, - "narHash": "sha256-fBrUszJXmB4MY+wf3QsCnqWHcz7u7fLq0QMAWCltIQg=", + "lastModified": 1762747449, + "narHash": "sha256-Z1TKiux8K09a93w4PFDFsj8HFugXNy3iCC3Z8MpR5Rk=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "0728d59ff6463a502e001fb090f6eb92dbc04756", + "rev": "6338574bc5c036487486acde264f38f39ea15fad", "type": "github" }, "original": { @@ -1342,11 +1395,11 @@ ] }, "locked": { - "lastModified": 1761970869, - "narHash": "sha256-dlcxJTY+MwR9u3yTkBkzqfHY2+MKonDS7UzoOLlGpuw=", + "lastModified": 1763171103, + "narHash": "sha256-8yIUdnaYIx3f96ZW+gklifdhB7Zs+jLi8VPfL9owitw=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "5855db6427f25672d7f02e19af418a38fe82e26e", + "rev": "85d439e2c3271d50581392c88e9d60d6e2e87bf8", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 462efe4..0c4f606 100644 --- a/flake.nix +++ b/flake.nix @@ -6,6 +6,7 @@ nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-stable.url = "github:nixos/nixpkgs/release-25.05"; nixpkgs-master.url = "github:nixos/nixpkgs/master"; + nixpkgs-working.url = "github:nixos/nixpkgs/9da7f1cf7f8a6e2a7cb3001b048546c92a8258b4"; # nixpkgs.follows = "nixpkgs-stable"; nixpkgs.follows = "nixpkgs-unstable"; # nixpkgs.follows = "nixpkgs-master"; @@ -44,7 +45,7 @@ # go-musicfox go-musicfox = { - url = "github:imxyy1soope1/go-musicfox/master"; + url = "github:imxyy1soope1/go-musicfox/938c4d6bb2a318bc6251f3b11fa8cf54d29b4419"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -67,7 +68,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; noctalia = { - url = "github:noctalia-dev/noctalia-shell"; + url = "github:noctalia-dev/noctalia-shell/34a6947ad69ff9aec4960e0d1d618a0c041943ca"; inputs.nixpkgs.follows = "nixpkgs"; inputs.quickshell.follows = "quickshell"; # Use same quickshell version }; @@ -91,6 +92,8 @@ url = "github:nix-community/haumea/v0.2.2"; inputs.nixpkgs.follows = "nixpkgs"; }; + + treefmt.url = "github:numtide/treefmt-nix"; }; outputs = @@ -135,23 +138,22 @@ } ); - # workaround for "treefmt warning" formatter = forAllSystems ( system: let pkgs = nixpkgs.legacyPackages.${system}; + treefmtEval = inputs.treefmt.lib.evalModule pkgs ./treefmt.nix; in - pkgs.writeShellApplication { - name = "nixfmt-wrapper"; - - runtimeInputs = with pkgs; [ - fd - nixfmt-rfc-style - ]; - - text = '' - fd "$@" -t f -e nix -x nixfmt '{}' - ''; + treefmtEval.config.build.wrapper + ); + check = forAllSystems ( + system: + let + pkgs = nixpkgs.legacyPackages.${system}; + treefmtEval = inputs.treefmt.lib.evalModule pkgs ./treefmt.nix; + in + { + formatting = treefmtEval.config.build.check self; } ); @@ -251,4 +253,4 @@ } ); }; -} +} \ No newline at end of file diff --git a/modules/coding/editor/neovim/nvim/lua/plugins/nvim-tree.lua b/modules/coding/editor/neovim/nvim/lua/plugins/nvim-tree.lua index 3e95c90..6d35348 100644 --- a/modules/coding/editor/neovim/nvim/lua/plugins/nvim-tree.lua +++ b/modules/coding/editor/neovim/nvim/lua/plugins/nvim-tree.lua @@ -29,4 +29,4 @@ vim.api.nvim_create_autocmd("BufEnter", { end, }) -return M \ No newline at end of file +return M diff --git a/modules/coding/editor/neovim/nvim/lua/plugins/plugins-setup.lua b/modules/coding/editor/neovim/nvim/lua/plugins/plugins-setup.lua index 06ee741..a456f74 100644 --- a/modules/coding/editor/neovim/nvim/lua/plugins/plugins-setup.lua +++ b/modules/coding/editor/neovim/nvim/lua/plugins/plugins-setup.lua @@ -283,4 +283,4 @@ local plugins = { }, } -require("lazy").setup(plugins, {}) \ No newline at end of file +require("lazy").setup(plugins, {}) diff --git a/modules/nix.nix b/modules/nix.nix index e6faa54..cf0be21 100644 --- a/modules/nix.nix +++ b/modules/nix.nix @@ -70,4 +70,4 @@ lib.my.makeSwitch { }; */ }; -} +} \ No newline at end of file diff --git a/overlays/default.nix b/overlays/default.nix index df50c24..630c67b 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -59,4 +59,11 @@ config.allowUnfree = true; }; }; -} + + working-packages = final: _prev: { + working = import inputs.nixpkgs-working { + system = final.stdenv.hostPlatform.system; + config.allowUnfree = true; + }; + }; +} \ No newline at end of file diff --git a/treefmt.nix b/treefmt.nix new file mode 100644 index 0000000..854c30d --- /dev/null +++ b/treefmt.nix @@ -0,0 +1,8 @@ +{ ... }: +{ + projectRootFile = "flake.nix"; + programs = { + nixfmt.enable = true; + stylua.enable = true; + }; +}