diff --git a/flake.nix b/flake.nix index df36837..c41fdea 100644 --- a/flake.nix +++ b/flake.nix @@ -2,10 +2,11 @@ description = "im gonna cry again ;-;"; inputs = { - systems.url = "github:nix-systems/default"; + systems.url = "github:nix-systems/default-linux"; nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs-master.url = "github:NixOS/nixpkgs/master"; home-manager = { url = "github:nix-community/home-manager/release-25.11"; diff --git a/groups/cryde/default.nix b/groups/cryde/default.nix index 0229556..0596a01 100644 --- a/groups/cryde/default.nix +++ b/groups/cryde/default.nix @@ -54,20 +54,6 @@ mango.enable = true; - neovim = { - enable = true; - defaultEditor = true; - viAlias = true; - vimAlias = true; - configure = { - customRC = '' - set number - set tabstop=4 - set shiftwidth=4 - ''; - }; - }; - # Thunar also uses: `services.tumbler` & `services.gvfs` thunar = { enable = true; diff --git a/homes/me/default.nix b/homes/me/default.nix index ec85ed3..ad21f43 100755 --- a/homes/me/default.nix +++ b/homes/me/default.nix @@ -36,8 +36,10 @@ homeDirectory = "/home/me"; shellAliases = { - rebuild = "sudo nixos-rebuild switch --flake /home/me/flake --show-trace"; - trybuild = "sudo nixos-rebuild test --flake /home/me/flake --show-trace"; + # rebuild = "sudo nixos-rebuild switch --flake /home/me/flake --show-trace"; + # trybuild = "sudo nixos-rebuild test --flake /home/me/flake --show-trace"; + rebuild = "nh os switch ~/flake --show-trace"; + trybuild = "nh os test ~/flake --show-trace"; brip = "batgrep"; # bat + ripgrep man = "batman"; # bat + man }; diff --git a/nixpkgs.nix b/nixpkgs.nix index 18fcf98..fa6e201 100644 --- a/nixpkgs.nix +++ b/nixpkgs.nix @@ -11,7 +11,6 @@ (import ./overlays args) ]; config = { - # allowUnfree = false; allowBroken = false; allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ @@ -40,5 +39,16 @@ allowBroken = false; }; }; + + # nixpkgs-master + mpkgs = { + inherit system; + source = inputs.nixpkgs-master; + overlays = []; + config = { + allowUnfree = false; + allowBroken = false; + }; + }; }; }