diff --git a/flake.lock b/flake.lock index efca431..38ce134 100644 --- a/flake.lock +++ b/flake.lock @@ -68,7 +68,10 @@ }, "flake-parts": { "inputs": { - "nixpkgs-lib": "nixpkgs-lib" + "nixpkgs-lib": [ + "neovim-nightly-overlay", + "nixpkgs" + ] }, "locked": { "lastModified": 1748821116, @@ -85,49 +88,6 @@ } }, "flake-parts_2": { - "inputs": { - "nixpkgs-lib": [ - "miovim", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1743550720, - "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "c621e8422220273271f52058f618c94e405bb0f5", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_3": { - "inputs": { - "nixpkgs-lib": [ - "neovim-nightly-overlay", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1748821116, - "narHash": "sha256-F82+gS044J1APL0n4hH50GYdPRv/5JWm34oCJYmVKdE=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "49f0870db23e8c1ca0b5259734a02cd9e1e371a1", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "neovim-nightly-overlay", @@ -148,24 +108,6 @@ "type": "indirect" } }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "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" - } - }, "git-hooks": { "inputs": { "flake-compat": "flake-compat_2", @@ -213,7 +155,7 @@ }, "hercules-ci-effects": { "inputs": { - "flake-parts": "flake-parts_4", + "flake-parts": "flake-parts_2", "nixpkgs": [ "neovim-nightly-overlay", "nixpkgs" @@ -274,64 +216,14 @@ "type": "github" } }, - "ixx": { - "inputs": { - "flake-utils": [ - "miovim", - "nixvim", - "nuschtosSearch", - "flake-utils" - ], - "nixpkgs": [ - "miovim", - "nixvim", - "nuschtosSearch", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1748294338, - "narHash": "sha256-FVO01jdmUNArzBS7NmaktLdGA5qA3lUMJ4B7a05Iynw=", - "owner": "NuschtOS", - "repo": "ixx", - "rev": "cc5f390f7caf265461d4aab37e98d2292ebbdb85", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "ref": "v0.0.8", - "repo": "ixx", - "type": "github" - } - }, - "miovim": { - "inputs": { - "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_2", - "nixvim": "nixvim" - }, - "locked": { - "lastModified": 1751491874, - "narHash": "sha256-i6EJZ2aHIhtfAc66JEowrBlPknPTwt3MrRcX2RtFTGQ=", - "ref": "refs/heads/main", - "rev": "2b768f0b872f1a02c10cecd0cc1f91153449aa92", - "revCount": 13, - "type": "git", - "url": "https://git.rougebordeaux.xyz/misschloe/miovim.git" - }, - "original": { - "type": "git", - "url": "https://git.rougebordeaux.xyz/misschloe/miovim.git" - } - }, "neovim-nightly-overlay": { "inputs": { "flake-compat": "flake-compat", - "flake-parts": "flake-parts_3", + "flake-parts": "flake-parts", "git-hooks": "git-hooks", "hercules-ci-effects": "hercules-ci-effects", "neovim-src": "neovim-src", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_2", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -409,11 +301,11 @@ "rev": "750285c41d23803be0b66571296e1f1685939511", "revCount": 8, "type": "git", - "url": "https://git.rougebordeaux.xyz/misschloe/nix-secrets.git" + "url": "https://git.hypervirtual.world/harry123/nix-secrets.git" }, "original": { "type": "git", - "url": "https://git.rougebordeaux.xyz/misschloe/nix-secrets.git" + "url": "https://git.hypervirtual.world/harry123/nix-secrets.git" } }, "nixlib": { @@ -468,21 +360,6 @@ "type": "github" } }, - "nixpkgs-lib": { - "locked": { - "lastModified": 1748740939, - "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "656a64127e9d791a334452c6b6606d17539476e2", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, "nixpkgsSmall": { "locked": { "lastModified": 1748868858, @@ -519,51 +396,19 @@ "locked": { "lastModified": 1748792178, "narHash": "sha256-BHmgfHlCJVNisJShVaEmfDIr/Ip58i/4oFGlD1iK6lk=", - "owner": "nixos", + "owner": "NixOS", "repo": "nixpkgs", "rev": "5929de975bcf4c7c8d8b5ca65c8cd9ef9e44523e", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixpkgs-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_3": { - "locked": { - "lastModified": 1748406211, - "narHash": "sha256-B3BsCRbc+x/d0WiG1f+qfSLUy+oiIfih54kalWBi+/M=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "3d1f29646e4b57ed468d60f9d286cde23a8d1707", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1748792178, - "narHash": "sha256-BHmgfHlCJVNisJShVaEmfDIr/Ip58i/4oFGlD1iK6lk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "5929de975bcf4c7c8d8b5ca65c8cd9ef9e44523e", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { "locked": { "lastModified": 1748889542, "narHash": "sha256-Hb4iMhIbjX45GcrgOp3b8xnyli+ysRPqAgZ/LZgyT5k=", @@ -579,7 +424,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_4": { "locked": { "lastModified": 1744868846, "narHash": "sha256-5RJTdUHDmj12Qsv7XOhuospjAjATNiTMElplWnJE9Hs=", @@ -595,7 +440,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_5": { "locked": { "lastModified": 1748460289, "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=", @@ -611,51 +456,6 @@ "type": "github" } }, - "nixvim": { - "inputs": { - "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_3", - "nuschtosSearch": "nuschtosSearch", - "systems": "systems_2" - }, - "locked": { - "lastModified": 1748877332, - "narHash": "sha256-pcAqUaMtxR1l//kugWqclFXKNQKCJQz9zO61JySGP7A=", - "owner": "nix-community", - "repo": "nixvim", - "rev": "65d35db5cac209cf5acd3dfd40aee98840cfc127", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixvim", - "type": "github" - } - }, - "nuschtosSearch": { - "inputs": { - "flake-utils": "flake-utils", - "ixx": "ixx", - "nixpkgs": [ - "miovim", - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1748298102, - "narHash": "sha256-PP11GVwUt7F4ZZi5A5+99isuq39C59CKc5u5yVisU/U=", - "owner": "NuschtOS", - "repo": "search", - "rev": "f8a1c221afb8b4c642ed11ac5ee6746b0fe1d32f", - "type": "github" - }, - "original": { - "owner": "NuschtOS", - "repo": "search", - "type": "github" - } - }, "root": { "inputs": { "alejandra": [ @@ -663,13 +463,12 @@ ], "catppuccin": "catppuccin", "home-manager": "home-manager", - "miovim": "miovim", "neovim-nightly-overlay": "neovim-nightly-overlay", "nix-darwin": "nix-darwin", "nix-flatpak": "nix-flatpak", "nix-secrets": "nix-secrets", "nixos-generators": "nixos-generators", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_3", "nixpkgsSmall": "nixpkgsSmall", "nixpkgsUnstable": "nixpkgsUnstable", "sops-nix": "sops-nix", @@ -679,7 +478,7 @@ }, "sops-nix": { "inputs": { - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1747603214, @@ -698,7 +497,7 @@ "swww": { "inputs": { "flake-compat": "flake-compat_3", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_5", "utils": "utils" }, "locked": { @@ -730,36 +529,6 @@ "type": "github" } }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -783,7 +552,7 @@ }, "utils": { "inputs": { - "systems": "systems_3" + "systems": "systems" }, "locked": { "lastModified": 1731533236, diff --git a/flake.nix b/flake.nix index b8aad74..e6db417 100644 --- a/flake.nix +++ b/flake.nix @@ -18,7 +18,7 @@ }; nix-secrets = { - url = "git+https://git.rougebordeaux.xyz/misschloe/nix-secrets.git"; # replace with your own repo + url = "git+https://git.hypervirtual.world/harry123/nix-secrets.git"; # replace with your own repo flake = false; }; @@ -29,7 +29,7 @@ }; */ - miovim.url = "git+https://git.rougebordeaux.xyz/misschloe/miovim.git"; + miovim.url = "git+https://git.rougebordeaux.xyz/harry123/miovim.git"; nixos-generators = { url = "github:nix-community/nixos-generators"; inputs.nixpkgs.follows = "nixpkgsUnstable"; @@ -143,7 +143,6 @@ }; home-manager.extraSpecialArgs = { inherit inputs; }; } - { programs.nix-ld.enable = true; } ]; }; diff --git a/home-manager/home.nix b/home-manager/home.nix index 6bbebe2..b34c5a9 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -66,7 +66,6 @@ wofi-emoji obsidian - cinny-desktop audacious audacious-plugins diff --git a/hosts/workstation/configuration.nix b/hosts/workstation/configuration.nix index 2342b3a..4ed093d 100644 --- a/hosts/workstation/configuration.nix +++ b/hosts/workstation/configuration.nix @@ -15,7 +15,7 @@ ./hardware-configuration.nix ../../shared/client/niri.nix ../../shared - ./features + ./software ]; # Bootloader. @@ -68,7 +68,6 @@ users.users.misschloe777 = { isNormalUser = true; description = "misschloe777"; - shell = pkgs.zsh; extraGroups = [ "networkmanager" "wheel" diff --git a/hosts/workstation/features/default.nix b/hosts/workstation/features/default.nix deleted file mode 100644 index ca4de34..0000000 --- a/hosts/workstation/features/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - imports = [ - ./hardware - ./software - ]; -}