1
Fork 0
mirror of https://github.com/RGBCube/ncc synced 2025-07-30 19:47:47 +00:00

Reorder stuff

This commit is contained in:
RGBCube 2023-11-13 21:48:43 +03:00
parent 2bd9c15e51
commit 95d330492f
No known key found for this signature in database
3 changed files with 32 additions and 13 deletions

View file

@ -19,19 +19,28 @@
}; };
inputs = { inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs = {
url = "github:NixOS/nixpkgs/nixos-unstable";
};
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nh = {
url = "github:viperML/nh";
inputs.nixpkgs.follows = "nixpkgs";
};
fenix = { fenix = {
url = "github:nix-community/fenix"; url = "github:nix-community/fenix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
hyprland.url = "github:hyprwm/Hyprland"; hyprland = {
url = "github:hyprwm/Hyprland";
};
}; };
outputs = { nixpkgs, home-manager, fenix, ... } @ inputs: let outputs = { nixpkgs, home-manager, fenix, ... } @ inputs: let
@ -44,7 +53,7 @@
]; ];
lib = nixpkgs.lib // { lib = nixpkgs.lib // {
recursiveUpdate3 = x: y: z: nixpkgs.lib.recursiveUpdate x (nixpkgs.lib.recursiveUpdate y z); recursiveUpdate3 = x: y: z: lib.recursiveUpdate x (lib.recursiveUpdate y z);
}; };
theme = import ./themes/gruvbox.nix; theme = import ./themes/gruvbox.nix;
@ -129,10 +138,10 @@
configurationDirectory configurationDirectory
]; ];
in { in {
nixosConfigurations.${hostName} = nixpkgs.lib.nixosSystem { nixosConfigurations.${hostName} = lib.nixosSystem {
specialArgs = arguments; specialArgs = arguments;
modules = modules; modules = modules;
}; };
}; };
in builtins.foldl' nixpkgs.lib.recursiveUpdate {} (builtins.concatMap (architecture: builtins.map (configuration: importConfiguration configuration architecture) machines) architectures); in builtins.foldl' lib.recursiveUpdate {} (builtins.concatMap (architecture: builtins.map (configuration: importConfiguration configuration architecture) machines) architectures);
} }

View file

@ -3,23 +3,33 @@
homeConfiguration [ "nixos" "root" ] { homeConfiguration [ "nixos" "root" ] {
programs.nushell.shellAliases = { programs.nushell.shellAliases = {
g = "git"; g = "git";
ga = "git add"; ga = "git add";
gaa = "git add ./"; gaa = "git add ./";
grs = "git reset";
grsh = "git reset --hard";
grb = "git rebase";
grbi = "git rebase --interactive";
grba = "git rebase --abort";
grl = "git reflog";
gc = "git commit"; gc = "git commit";
gcm = "git commit --message";
gca = "git commit --amend --no-edit"; gca = "git commit --amend --no-edit";
gcm = "git commit --message";
gcl = "git clone"; gcl = "git clone";
gd = "git diff"; gd = "git diff";
gds = "git diff --staged"; gds = "git diff --staged";
gp = "git push"; gp = "git push";
grb = "git rebase";
grba = "git rebase --abort";
grbi = "git rebase --interactive";
grl = "git reflog";
grs = "git reset";
grsh = "git reset --hard";
gs = "git stash"; gs = "git stash";
gsp = "git stash pop"; gsp = "git stash pop";
gst = "git status"; gst = "git status";
}; };

View file

@ -10,7 +10,7 @@ homeConfiguration "nixos" {
]; ];
}); });
theme = "Gruvbox Dark"; theme = "Gruvbox Dark";
settings = { settings = {
allow_remote_control = true; allow_remote_control = true;