Compare commits

..

No commits in common. "1adaee60517101b1e926ab03cb303598d719eeb6" and "76ed533bd2a953bbb77fea5fde1d5fc68b4e8fdd" have entirely different histories.

12 changed files with 20 additions and 77 deletions

View File

@ -22,17 +22,23 @@
# Available through 'nixos-rebuild --flake .#your-hostname' # Available through 'nixos-rebuild --flake .#your-hostname'
nixosConfigurations = { nixosConfigurations = {
# FIXME_ replace with your hostname # FIXME_ replace with your hostname
nixos-desktop-mans = nixpkgs.lib.nixosSystem { nixos-mans = nixpkgs.lib.nixosSystem {
specialArgs = { inherit inputs; }; # Pass flake inputs to our config specialArgs = { inherit inputs; }; # Pass flake inputs to our config
# > Our main nixos configuration file < # > Our main nixos configuration file <
modules = [ ./nixos/machines/nixos-desktop-mans/configuration.nix ]; modules = [ ./nixos/configuration.nix ];
};
}; };
nixos-laptop-mans = nixpkgs.lib.nixosSystem { # Standalone home-manager configuration entrypoint
specialArgs = { inherit inputs; }; # Pass flake inputs to our config # Available through 'home-manager --flake .#your-username@your-hostname'
# > Our main nixos configuration file < # homeConfigurations = {
modules = [ ./nixos/machines/nixos-laptop-mans/configuration.nix ]; # # FIXME_ replace with your username@hostname
}; # "mans@nixos-mans" = home-manager.lib.homeManagerConfiguration {
}; # pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance
# extraSpecialArgs = { inherit inputs; }; # Pass flake inputs to our config
# # > Our main home-manager configuration file <
# modules = [ ./home-manager/home.nix ];
# };
# };
}; };
} }

View File

@ -12,7 +12,7 @@
# You can also split up your configuration and import pieces of it here: # You can also split up your configuration and import pieces of it here:
# ./users.nix # ./users.nix
./network.nix ./network.nix
../../roles/desktop.nix ./i3.nix
# Import home-manager's NixOS module # Import home-manager's NixOS module
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
@ -149,7 +149,7 @@
extraSpecialArgs = { inherit inputs; }; extraSpecialArgs = { inherit inputs; };
users = { users = {
# Import your home-manager configuration # Import your home-manager configuration
mans = import ../../../home-manager/home.nix; mans = import ../home-manager/home.nix;
}; };
}; };

View File

@ -12,7 +12,7 @@
# You can also split up your configuration and import pieces of it here: # You can also split up your configuration and import pieces of it here:
# ./users.nix # ./users.nix
./network.nix ./network.nix
../../roles/desktop.nix ./i3.nix
# Import home-manager's NixOS module # Import home-manager's NixOS module
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
@ -127,12 +127,6 @@
}; };
}; };
environment.systemPackages = with pkgs; [
wget
neovim
openssl
];
# This setups a SSH server. Very important if you're setting up a headless system. # This setups a SSH server. Very important if you're setting up a headless system.
# Feel free to remove if you don't need it. # Feel free to remove if you don't need it.
services.openssh = { services.openssh = {
@ -149,7 +143,7 @@
extraSpecialArgs = { inherit inputs; }; extraSpecialArgs = { inherit inputs; };
users = { users = {
# Import your home-manager configuration # Import your home-manager configuration
mans = import ../../../home-manager/home.nix; mans = import ../home-manager/home.nix;
}; };
}; };

View File

@ -1,21 +0,0 @@
# networking.nix
# Import the necessary modules
{ config, pkgs, ... }:
{
# Set the network interface configuration
# networking.interfaces.eth0.useDHCP = true;
networking.networkmanager.enable = true;
# Open ports in the firewall.
# networking.firewall.allowedTCPPorts = [ 22 ];
# networking.firewall.allowedUDPPorts = [ ... ];
# Or disable the firewall altogether.
# networking.firewall.enable = false;
# Set the hostname
networking.hostName = "nixos-laptop-mans";
}

View File

@ -17,5 +17,5 @@
# Set the hostname # Set the hostname
networking.hostName = "nixos-desktop-mans"; networking.hostName = "nixos-mans";
} }

View File

@ -1,12 +0,0 @@
# Module arguments which our system can use to refer to its own configuration
{ config, lib, pkgs, ... }:
{
imports = [
];
options = {
};
config = {
};
}

View File

@ -1,12 +0,0 @@
{ config, lib, pkgs, ... }:
{
imports = [
../modules/i3.nix
];
options = {
};
config = {
};
}

View File

@ -1,12 +0,0 @@
# Module arguments which our system can use to refer to its own configuration
{ config, lib, pkgs, ... }:
{
imports = [
];
options = {
};
config = {
};
}

View File

@ -1,2 +1,2 @@
#!/usr/bin/env bash #!/usr/bin/env bash
sudo nixos-rebuild switch --flake .#$(hostname) sudo nixos-rebuild switch --flake .#nixos-mans