diff --git a/common/home.nix b/common/home.nix index f45bd8ff..b1efc5b7 100644 --- a/common/home.nix +++ b/common/home.nix @@ -35,16 +35,16 @@ in { imports = [ inputs.nix-index-database.hmModules.nix-index - ./wezterm.nix + # ./wezterm.nix ./kitty.nix ./gui.nix ./auth.nix ./tmux.nix ./nvim.nix - ./goread.nix + # ./goread.nix ./ncmpcpp.nix - ./zellij.nix + # ./zellij.nix ../modules ] ++ lib.optionals device.isLinux [../linux] diff --git a/flake.lock b/flake.lock index f148a873..d5b944da 100644 --- a/flake.lock +++ b/flake.lock @@ -460,38 +460,6 @@ "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, - "flake-compat_11": { - "flake": false, - "locked": { - "lastModified": 1641205782, - "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_12": { - "flake": false, - "locked": { - "lastModified": 1641205782, - "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-compat_2": { "flake": false, "locked": { @@ -827,54 +795,6 @@ "inputs": { "systems": "systems_14" }, - "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_12": { - "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_13": { - "locked": { - "lastModified": 1644229661, - "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_14": { - "inputs": { - "systems": "systems_15" - }, "locked": { "lastModified": 1710146030, "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", @@ -889,9 +809,9 @@ "type": "github" } }, - "flake-utils_15": { + "flake-utils_12": { "inputs": { - "systems": "systems_16" + "systems": "systems_15" }, "locked": { "lastModified": 1726560853, @@ -1855,22 +1775,6 @@ "type": "github" } }, - "neorg-telescope_3": { - "flake": false, - "locked": { - "lastModified": 1722358034, - "narHash": "sha256-ei4uUqpIQjGKzu5ryu0Hlmis9TS9FJsYnjt4J4QdWlw=", - "owner": "nvim-neorg", - "repo": "neorg-telescope", - "rev": "ddb2556644cae922699a239bbb0fe16e25b084b7", - "type": "github" - }, - "original": { - "owner": "nvim-neorg", - "repo": "neorg-telescope", - "type": "github" - } - }, "neorg_2": { "flake": false, "locked": { @@ -1887,22 +1791,6 @@ "type": "github" } }, - "neorg_3": { - "flake": false, - "locked": { - "lastModified": 1731818282, - "narHash": "sha256-G0SDsIPCvc9KZP8hTF3uUl2x4cSE98XLacfEAHUdYVQ=", - "owner": "nvim-neorg", - "repo": "neorg", - "rev": "2d8ed7ee68f9b33a75324d92dbc706d93bb258a2", - "type": "github" - }, - "original": { - "owner": "nvim-neorg", - "repo": "neorg", - "type": "github" - } - }, "neovim": { "inputs": { "d2": "d2", @@ -2300,38 +2188,6 @@ "type": "github" } }, - "nixpkgs_8": { - "locked": { - "lastModified": 1644486793, - "narHash": "sha256-EeijR4guVHgVv+JpOX3cQO+1XdrkJfGmiJ9XVsVU530=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1882c6b7368fd284ad01b0a5b5601ef136321292", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_9": { - "locked": { - "lastModified": 1644486793, - "narHash": "sha256-EeijR4guVHgVv+JpOX3cQO+1XdrkJfGmiJ9XVsVU530=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1882c6b7368fd284ad01b0a5b5601ef136321292", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixvim": { "inputs": { "devshell": "devshell", @@ -2441,31 +2297,6 @@ "type": "github" } }, - "nno_2": { - "inputs": { - "flake-utils": "flake-utils_11", - "neorg": "neorg_3", - "neorg-telescope": "neorg-telescope_3", - "nixpkgs": [ - "nixpkgs" - ], - "norg": "norg_2", - "norg-meta": "norg-meta_2" - }, - "locked": { - "lastModified": 1731933255, - "narHash": "sha256-S+4ganslYoidFxCpWFpzoGVBskUrQUwzMkUKS0rz3jY=", - "owner": "nvim-neorg", - "repo": "nixpkgs-neorg-overlay", - "rev": "24c1f958312c1125ba69cfee1f5a5d0a4940da99", - "type": "github" - }, - "original": { - "owner": "nvim-neorg", - "repo": "nixpkgs-neorg-overlay", - "type": "github" - } - }, "norg": { "inputs": { "flake-compat": "flake-compat_8", @@ -2507,47 +2338,6 @@ "type": "github" } }, - "norg-meta_2": { - "inputs": { - "flake-compat": "flake-compat_12", - "flake-utils": "flake-utils_13", - "nixpkgs": "nixpkgs_9" - }, - "locked": { - "lastModified": 1713028366, - "narHash": "sha256-8qSdwHlfnjFuQF4zNdLtU2/tzDRhDZbo9K54Xxgn5+8=", - "owner": "nvim-neorg", - "repo": "tree-sitter-norg-meta", - "rev": "6f0510cc516a3af3396a682fbd6655486c2c9d2d", - "type": "github" - }, - "original": { - "owner": "nvim-neorg", - "repo": "tree-sitter-norg-meta", - "type": "github" - } - }, - "norg_2": { - "inputs": { - "flake-compat": "flake-compat_11", - "flake-utils": "flake-utils_12", - "nixpkgs": "nixpkgs_8" - }, - "locked": { - "lastModified": 1672582520, - "narHash": "sha256-kv3UiJUqMSF1qd3r4OCWomVTHTYjwX/EBRWm8mOSdwg=", - "owner": "nvim-neorg", - "repo": "tree-sitter-norg", - "rev": "d7a466e182a532065a559dbfc7a847271d5e9c29", - "type": "github" - }, - "original": { - "owner": "nvim-neorg", - "ref": "dev", - "repo": "tree-sitter-norg", - "type": "github" - } - }, "nur": { "locked": { "lastModified": 1732200980, @@ -2628,7 +2418,7 @@ }, "onepassword-shell-plugins": { "inputs": { - "flake-utils": "flake-utils_14", + "flake-utils": "flake-utils_11", "nixpkgs": [ "nixpkgs" ] @@ -2769,7 +2559,6 @@ "nixpkgs": "nixpkgs_7", "nixpkgs-master": "nixpkgs-master", "nixvim": "nixvim_2", - "nno": "nno_2", "nur": "nur", "onepassword-shell-plugins": "onepassword-shell-plugins", "openapi-tui": "openapi-tui", @@ -3053,21 +2842,6 @@ "type": "github" } }, - "systems_16": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -3347,7 +3121,7 @@ "zjstatus": { "inputs": { "crane": "crane_5", - "flake-utils": "flake-utils_15", + "flake-utils": "flake-utils_12", "nixpkgs": [ "nixpkgs" ], diff --git a/flake.nix b/flake.nix index caa48139..831ddd8f 100644 --- a/flake.nix +++ b/flake.nix @@ -11,10 +11,6 @@ url = "github:LnL7/nix-darwin"; inputs.nixpkgs.follows = "nixpkgs"; }; - nno = { - url = "github:nvim-neorg/nixpkgs-neorg-overlay"; - inputs.nixpkgs.follows = "nixpkgs"; - }; anyrun = { # My fork of anyrun that allows up / down with / url = "github:uttarayan21/anyrun"; diff --git a/modules/default.nix b/modules/default.nix index 2a62b038..24bab0c5 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -6,6 +6,6 @@ imports = [ ./goread.nix ./hyprpaper.nix - ./sketchybar.nix + # ./sketchybar.nix ]; } diff --git a/overlays.nix b/overlays.nix index 583de5de..40aa86f8 100644 --- a/overlays.nix +++ b/overlays.nix @@ -233,10 +233,10 @@ in [ shell-scipts misc-applications # inputs.neovim-nightly-overlay.overlays.default - inputs.nixvim.overlays.default + #inputs.nixvim.overlays.default inputs.nur.overlay inputs.neovim.overlays.default - inputs.nno.overlays.default + # inputs.nno.overlays.default # catppuccin inputs.rust-overlay.overlays.default #inputs.hyprland.overlays.default