random stuff
- shell fixes - noice function for nixos-configurations - flake update - random
This commit is contained in:
parent
52bb01cc79
commit
a5040dcc1b
8 changed files with 23 additions and 22 deletions
18
flake.lock
generated
18
flake.lock
generated
|
@ -74,11 +74,11 @@
|
||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1745503349,
|
"lastModified": 1745955289,
|
||||||
"narHash": "sha256-bUGjvaPVsOfQeTz9/rLTNLDyqbzhl0CQtJJlhFPhIYw=",
|
"narHash": "sha256-mmV2oPhQN+YF2wmnJzXX8tqgYmUYXUj3uUUBSTmYN5o=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "f7bee55a5e551bd8e7b5b82c9bc559bc50d868d1",
|
"rev": "72081c9fbbef63765ae82bff9727ea79cc86bd5b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -90,11 +90,11 @@
|
||||||
},
|
},
|
||||||
"nixos-unstable": {
|
"nixos-unstable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1745526057,
|
"lastModified": 1745930157,
|
||||||
"narHash": "sha256-ITSpPDwvLBZBnPRS2bUcHY3gZSwis/uTe255QgMtTLA=",
|
"narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "f771eb401a46846c1aebd20552521b233dd7e18b",
|
"rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -106,11 +106,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1745742390,
|
"lastModified": 1745921652,
|
||||||
"narHash": "sha256-1rqa/XPSJqJg21BKWjzJZC7yU0l/YTVtjRi0RJmipus=",
|
"narHash": "sha256-hEAvEN+y/OQ7wA7+u3bFJwXSe8yoSf2QaOMH3hyTJTQ=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "26245db0cb552047418cfcef9a25da91b222d6c7",
|
"rev": "b000159bba69b0106a42f65e52dbf27f77aca9d3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
inArgs: hostname: {
|
inArgs: hostname: #{
|
||||||
${hostname} = inArgs.nixpkgs.lib.nixosSystem {
|
#${hostname} = inArgs.nixpkgs.lib.nixosSystem {
|
||||||
|
inArgs.nixpkgs.lib.nixosSystem {
|
||||||
specialArgs = {inherit inArgs;};
|
specialArgs = {inherit inArgs;};
|
||||||
modules = [
|
modules = [
|
||||||
{networking.hostName = hostname;}
|
{networking.hostName = hostname;}
|
||||||
(./hosts/${hostname})
|
(./hosts/${hostname})
|
||||||
];
|
];
|
||||||
};
|
}
|
||||||
}
|
|
||||||
|
|
|
@ -5,8 +5,6 @@
|
||||||
nixos-unstable,
|
nixos-unstable,
|
||||||
...
|
...
|
||||||
}: {
|
}: {
|
||||||
#networking.hostName = "crocoite"; # Define your hostname.
|
|
||||||
|
|
||||||
# This value determines the NixOS release from which the default
|
# This value determines the NixOS release from which the default
|
||||||
# settings for stateful data, like file locations and database versions
|
# settings for stateful data, like file locations and database versions
|
||||||
# on your system were taken. It‘s perfectly fine and recommended to leave
|
# on your system were taken. It‘s perfectly fine and recommended to leave
|
||||||
|
@ -34,9 +32,9 @@
|
||||||
# });
|
# });
|
||||||
# })
|
# })
|
||||||
];
|
];
|
||||||
|
|
||||||
# Configure your nixpkgs instance
|
# Configure your nixpkgs instance
|
||||||
config = {
|
config = {
|
||||||
# Disable if you don't want unfree packages
|
|
||||||
allowUnfree = true;
|
allowUnfree = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -10,7 +10,6 @@
|
||||||
./obs-studio.nix
|
./obs-studio.nix
|
||||||
./packages.nix
|
./packages.nix
|
||||||
./programs.nix
|
./programs.nix
|
||||||
./shell.nix
|
|
||||||
./virt.nix
|
./virt.nix
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./zsh.nix
|
|
||||||
./fish.nix
|
./fish.nix
|
||||||
|
./shell.nix
|
||||||
|
./zsh.nix
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,5 +11,4 @@
|
||||||
direnv.enableFishIntegration = true;
|
direnv.enableFishIntegration = true;
|
||||||
foot.enableFishIntegration = true;
|
foot.enableFishIntegration = true;
|
||||||
};
|
};
|
||||||
environment.systemPackages = [pkgs.starship];
|
|
||||||
}
|
}
|
||||||
|
|
10
outputs.nix
10
outputs.nix
|
@ -9,15 +9,17 @@ inArgs: let
|
||||||
# pass to it, with each system as an argument
|
# pass to it, with each system as an argument
|
||||||
forAllSystems = inArgs.nixpkgs.lib.genAttrs systems;
|
forAllSystems = inArgs.nixpkgs.lib.genAttrs systems;
|
||||||
|
|
||||||
|
lib = inArgs.nixpkgs.lib;
|
||||||
|
|
||||||
hostHelper = import ./hostHelper.nix inArgs;
|
hostHelper = import ./hostHelper.nix inArgs;
|
||||||
|
|
||||||
in {
|
in {
|
||||||
# NixOS configuration entrypoint
|
# NixOS configuration entrypoint
|
||||||
# Available through 'nixos-rebuild --flake .#your-hostname'
|
# Available through 'nixos-rebuild --flake .#your-hostname'
|
||||||
# to add more append // (host_helper example);
|
# to add more append // (host_helper example);
|
||||||
|
nixosConfigurations = builtins.mapAttrs (name: options: (hostHelper name)) {
|
||||||
nixosConfigurations =
|
crocoite = {};
|
||||||
(hostHelper "crocoite"); #// (host_helper2 "jitsi");
|
};
|
||||||
|
|
||||||
# Your custom packages
|
# Your custom packages
|
||||||
# Accessible through 'nix build', 'nix shell', etc
|
# Accessible through 'nix build', 'nix shell', etc
|
||||||
|
@ -33,4 +35,6 @@ in {
|
||||||
# Formatter for your nix files, available through 'nix fmt'
|
# Formatter for your nix files, available through 'nix fmt'
|
||||||
# Other options beside 'alejandra' include 'nixpkgs-fmt'
|
# Other options beside 'alejandra' include 'nixpkgs-fmt'
|
||||||
formatter = forAllSystems (system: inArgs.nixpkgs.legacyPackages.${system}.alejandra);
|
formatter = forAllSystems (system: inArgs.nixpkgs.legacyPackages.${system}.alejandra);
|
||||||
|
|
||||||
|
#checks = forAllSystems (system: inArgs(hostHelper "crocoite").system.build.toplevel);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue