mirror of
https://github.com/RGBCube/ncc
synced 2025-07-29 19:17:45 +00:00
Reorder stuff
This commit is contained in:
parent
2bd9c15e51
commit
95d330492f
3 changed files with 32 additions and 13 deletions
19
flake.nix
19
flake.nix
|
@ -19,19 +19,28 @@
|
|||
};
|
||||
|
||||
inputs = {
|
||||
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
nixpkgs = {
|
||||
url = "github:NixOS/nixpkgs/nixos-unstable";
|
||||
};
|
||||
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
nh = {
|
||||
url = "github:viperML/nh";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
fenix = {
|
||||
url = "github:nix-community/fenix";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
hyprland.url = "github:hyprwm/Hyprland";
|
||||
hyprland = {
|
||||
url = "github:hyprwm/Hyprland";
|
||||
};
|
||||
};
|
||||
|
||||
outputs = { nixpkgs, home-manager, fenix, ... } @ inputs: let
|
||||
|
@ -44,7 +53,7 @@
|
|||
];
|
||||
|
||||
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;
|
||||
|
@ -129,10 +138,10 @@
|
|||
configurationDirectory
|
||||
];
|
||||
in {
|
||||
nixosConfigurations.${hostName} = nixpkgs.lib.nixosSystem {
|
||||
nixosConfigurations.${hostName} = lib.nixosSystem {
|
||||
specialArgs = arguments;
|
||||
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);
|
||||
}
|
||||
|
|
|
@ -3,23 +3,33 @@
|
|||
homeConfiguration [ "nixos" "root" ] {
|
||||
programs.nushell.shellAliases = {
|
||||
g = "git";
|
||||
|
||||
ga = "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";
|
||||
gcm = "git commit --message";
|
||||
gca = "git commit --amend --no-edit";
|
||||
gcm = "git commit --message";
|
||||
|
||||
gcl = "git clone";
|
||||
|
||||
gd = "git diff";
|
||||
gds = "git diff --staged";
|
||||
|
||||
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";
|
||||
gsp = "git stash pop";
|
||||
|
||||
gst = "git status";
|
||||
};
|
||||
|
||||
|
|
|
@ -10,7 +10,7 @@ homeConfiguration "nixos" {
|
|||
];
|
||||
});
|
||||
|
||||
theme = "Gruvbox Dark";
|
||||
theme = "Gruvbox Dark";
|
||||
|
||||
settings = {
|
||||
allow_remote_control = true;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue