Compare commits
No commits in common. "114e169a0f20acacc63510eb801475df34089729" and "0f9a3fbe30a112b9ed98be0b21659f1f55d6d002" have entirely different histories.
114e169a0f
...
0f9a3fbe30
10
flake.nix
10
flake.nix
@ -29,23 +29,23 @@
|
||||
# > Our main nixos configuration file <
|
||||
modules = [
|
||||
./nixos/machines/pc-mans/configuration.nix
|
||||
];
|
||||
];
|
||||
};
|
||||
|
||||
lpt-mans = nixpkgs.lib.nixosSystem {
|
||||
specialArgs = { inherit inputs; }; # Pass flake inputs to our config
|
||||
# > Our main nixos configuration file <
|
||||
modules = [
|
||||
./nixos/machines/lpt-mans/configuration.nix
|
||||
];
|
||||
./nixos/machines/lpt-mans/configuration.nix
|
||||
];
|
||||
};
|
||||
|
||||
srv01-home = nixpkgs.lib.nixosSystem {
|
||||
specialArgs = { inherit inputs; }; # Pass flake inputs to our config
|
||||
# > Our main nixos configuration file <
|
||||
modules = [
|
||||
./nixos/machines/srv01-home/configuration.nix
|
||||
];
|
||||
./nixos/machines/srv01-home/configuration.nix
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
@ -70,6 +70,7 @@
|
||||
vmware-workstation
|
||||
jetbrains.datagrip
|
||||
jetbrains.goland
|
||||
jetbrains.webstorm
|
||||
dig
|
||||
python3
|
||||
ansible
|
||||
@ -82,10 +83,10 @@
|
||||
nmap
|
||||
];
|
||||
|
||||
# services.nextcloud-client = {
|
||||
# enable = true;
|
||||
# startInBackground = true;
|
||||
# };
|
||||
services.nextcloud-client = {
|
||||
enable = true;
|
||||
startInBackground = true;
|
||||
};
|
||||
|
||||
services.dunst.enable = true;
|
||||
services.flameshot.enable = true;
|
||||
|
@ -13,71 +13,39 @@
|
||||
inputs.home-manager.nixosModules.home-manager
|
||||
|
||||
./network.nix
|
||||
./hardware-configuration.nix
|
||||
|
||||
../../modules
|
||||
|
||||
../../roles/base.nix
|
||||
../../roles/desktop.nix
|
||||
|
||||
../../modules/mans.nix
|
||||
../../modules/docker.nix
|
||||
|
||||
./hardware-configuration.nix
|
||||
];
|
||||
|
||||
services.xserver.displayManager.setupCommands = ''
|
||||
${pkgs.xorg.xrandr}/bin/xrandr --output DP-4 --rate 144.00 --size 1920x1080 --right-of HDMI-0 --primary --output HDMI-0 --auto
|
||||
'';
|
||||
|
||||
# services.gnome.gnome-keyring.enable = true;
|
||||
|
||||
# security.pam.services = [
|
||||
# { name = "gnome_keyring"
|
||||
# text = ''
|
||||
# auth optional ${gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so
|
||||
# session optional ${gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so auto_start
|
||||
#
|
||||
# password optional ${gnome3.gnome_keyring}/lib/security/pam_gnome_keyring.so
|
||||
# '';
|
||||
# }
|
||||
#];
|
||||
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
|
||||
boot.supportedFilesystems = [ "zfs" ];
|
||||
boot.zfs.forceImportRoot = false;
|
||||
networking.hostId = "b28f793f";
|
||||
|
||||
|
||||
# Setup keyfile
|
||||
boot.initrd.secrets = {
|
||||
"/crypto_keyfile.bin" = null;
|
||||
};
|
||||
|
||||
services.xserver.displayManager.autoLogin.enable = false;
|
||||
services.xserver.displayManager.autoLogin.user = "mans";
|
||||
# Enable CUPS to print documents.
|
||||
services.printing.enable = true;
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
wget
|
||||
neovim
|
||||
openssl
|
||||
tree
|
||||
file
|
||||
inetutils
|
||||
];
|
||||
|
||||
# services.gnome3.gnome-keyring.enable = true;
|
||||
programs.gnupg.agent = {
|
||||
enable = true;
|
||||
enableSSHSupport = true;
|
||||
};
|
||||
|
||||
home-manager = {
|
||||
extraSpecialArgs = { inherit inputs; };
|
||||
users = {
|
||||
# Import your home-manager configuration
|
||||
mans = import ../../../home-manager/home.nix;
|
||||
};
|
||||
};
|
||||
|
||||
# https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
|
||||
system.stateVersion = "22.11";
|
||||
system.stateVersion = "22.11"; # Did you read the comment?
|
||||
}
|
||||
|
@ -1,51 +0,0 @@
|
||||
# This is your system's configuration file.
|
||||
# Use this to configure your system environment (it replaces /etc/nixos/configuration.nix)
|
||||
# https://github.com/Misterio77/nix-starter-configs
|
||||
|
||||
{ inputs, lib, config, pkgs, ... }: {
|
||||
# You can import other NixOS modules here
|
||||
imports = [
|
||||
# If you want to use modules from other flakes (such as nixos-hardware):
|
||||
inputs.hardware.nixosModules.common-cpu-amd
|
||||
# inputs.hardware.nixosModules.common-gpu-nvidia
|
||||
|
||||
# Import home-manager's NixOS module
|
||||
inputs.home-manager.nixosModules.home-manager
|
||||
|
||||
./network.nix
|
||||
./hardware-configuration.nix
|
||||
|
||||
../../modules
|
||||
|
||||
../../roles/base.nix
|
||||
../../roles/desktop.nix
|
||||
];
|
||||
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
|
||||
# Setup keyfile
|
||||
boot.initrd.secrets = {
|
||||
"/crypto_keyfile.bin" = null;
|
||||
};
|
||||
|
||||
# Enable CUPS to print documents.
|
||||
services.printing.enable = true;
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
wget
|
||||
neovim
|
||||
openssl
|
||||
];
|
||||
|
||||
home-manager = {
|
||||
extraSpecialArgs = { inherit inputs; };
|
||||
users = {
|
||||
# Import your home-manager configuration
|
||||
mans = import ../../../home-manager/home.nix;
|
||||
};
|
||||
};
|
||||
|
||||
# https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
|
||||
system.stateVersion = "22.11"; # Did you read the comment?
|
||||
}
|
Loading…
Reference in New Issue
Block a user