Compare commits

..

No commits in common. "f57f7097c117996c39ce40188586546fab21e97b" and "2f950e883d9cb1feea4866838c01b7fbad974d8e" have entirely different histories.

3 changed files with 7 additions and 57 deletions

View File

@ -2,13 +2,12 @@
# your system. Help is available in the configuration.nix(5) man page, on # your system. Help is available in the configuration.nix(5) man page, on
# https://search.nixos.org/options and in the NixOS manual (`nixos-help`). # https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
{ config, pkgs, inputs, ... }: { config, lib, pkgs, ... }:
{ {
imports = imports =
[ # Include the results of the hardware scan. [ # Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-configuration.nix
inputs.sovr.nixosModules.default
]; ];
# Use the GRUB 2 boot loader. # Use the GRUB 2 boot loader.
@ -22,11 +21,9 @@
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
fish fish
git git
neovim
tmux tmux
vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
wget wget
inputs.sovr.packages."${pkgs.system}".sovr-server
]; ];
i18n.defaultLocale = "en_US.UTF-8"; i18n.defaultLocale = "en_US.UTF-8";
@ -41,6 +38,9 @@
programs.neovim.enable = true; programs.neovim.enable = true;
programs.neovim.defaultEditor = true; programs.neovim.defaultEditor = true;
# Set your time zone.
time.timeZone = "America/Phoenix";
# Configure network proxy if necessary # Configure network proxy if necessary
# networking.proxy.default = "http://user:password@proxy:port/"; # networking.proxy.default = "http://user:password@proxy:port/";
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
@ -50,26 +50,13 @@
network.enable = true; network.enable = true;
}; };
services.openssh.enable = true; services.openssh.enable = true;
services.sovr-server = {
enable = true;
sessionSecret = "secret";
};
systemd.network.enable = true; systemd.network.enable = true;
# Set your time zone.
time.timeZone = "America/Phoenix";
users.groups.deploy = {};
users.users.deploy = {
extraGroups = [ "deploy" ];
isNormalUser = true;
};
users.users.eliribble = { users.users.eliribble = {
extraGroups = [ "wheel" ]; # Enable sudo for the user.
initialHashedPassword = "$y$j9T$XYOMZR8RZEiTnpaF8lsxv1$H7YbWDpzbnYXTLN0ZMhvtKOlSMy64P7C/RdLBaeaNf/"; initialHashedPassword = "$y$j9T$XYOMZR8RZEiTnpaF8lsxv1$H7YbWDpzbnYXTLN0ZMhvtKOlSMy64P7C/RdLBaeaNf/";
isNormalUser = true; isNormalUser = true;
openssh.authorizedKeys.keys = ["ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBvhtF6nRWlA6PVs71Eek7p0p2PxTd3P6ZEGFV2t75MB eliribble@nixos"]; extraGroups = [ "wheel" ]; # Enable sudo for the user.
}; };
users.users.root.initialHashedPassword = "$y$j9T$Ti26ax34797JfBHz.qOF20$Ft.w/amrklqfOxs1Q44udCON6qo8Yj51CqLSksOYAQ2"; users.users.root.initialHashedPassword = "$y$j9T$Ti26ax34797JfBHz.qOF20$Ft.w/amrklqfOxs1Q44udCON6qo8Yj51CqLSksOYAQ2";

View File

@ -16,44 +16,9 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": {
"locked": {
"lastModified": 1735264675,
"narHash": "sha256-MgdXpeX2GuJbtlBrH9EdsUeWl/yXEubyvxM1G+yO4Ak=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "d49da4c08359e3c39c4e27c74ac7ac9b70085966",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-24.11",
"repo": "nixpkgs",
"type": "github"
}
},
"root": { "root": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs"
"sovr": "sovr"
}
},
"sovr": {
"inputs": {
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1735827455,
"narHash": "sha256-BpqQu/opMGrr6xUbbFQy2bkEbUSQhbxN4X8M8DRun5I=",
"ref": "refs/heads/main",
"rev": "950e618c387282e13e4ec865ae37d0e168b4469a",
"revCount": 60,
"type": "git",
"url": "file:///home/eliribble/src/sovr.cloud"
},
"original": {
"type": "git",
"url": "file:///home/eliribble/src/sovr.cloud"
} }
} }
}, },

View File

@ -4,12 +4,10 @@
inputs = { inputs = {
# NixOS official package source, using the nixos-24.11 branch here # NixOS official package source, using the nixos-24.11 branch here
nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
sovr.url = "git+file:///home/eliribble/src/sovr.cloud";
}; };
outputs = { self, nixpkgs, sovr, ... }@inputs: { outputs = { self, nixpkgs, ... }@inputs: {
nixosConfigurations.sovr = nixpkgs.lib.nixosSystem { nixosConfigurations.sovr = nixpkgs.lib.nixosSystem {
specialArgs = { inherit inputs; };
system = "x86_64-linux"; system = "x86_64-linux";
modules = [ modules = [
# Import the previous configuration.nix we used, # Import the previous configuration.nix we used,