Compare commits

..

No commits in common. "114e169a0f20acacc63510eb801475df34089729" and "0f9a3fbe30a112b9ed98be0b21659f1f55d6d002" have entirely different histories.

4 changed files with 18 additions and 100 deletions

View File

@ -70,6 +70,7 @@
vmware-workstation vmware-workstation
jetbrains.datagrip jetbrains.datagrip
jetbrains.goland jetbrains.goland
jetbrains.webstorm
dig dig
python3 python3
ansible ansible
@ -82,10 +83,10 @@
nmap nmap
]; ];
# services.nextcloud-client = { services.nextcloud-client = {
# enable = true; enable = true;
# startInBackground = true; startInBackground = true;
# }; };
services.dunst.enable = true; services.dunst.enable = true;
services.flameshot.enable = true; services.flameshot.enable = true;

View File

@ -13,71 +13,39 @@
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
./network.nix ./network.nix
./hardware-configuration.nix
../../modules
../../roles/base.nix ../../roles/base.nix
../../roles/desktop.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.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
boot.supportedFilesystems = [ "zfs" ];
boot.zfs.forceImportRoot = false;
networking.hostId = "b28f793f";
# Setup keyfile # Setup keyfile
boot.initrd.secrets = { boot.initrd.secrets = {
"/crypto_keyfile.bin" = null; "/crypto_keyfile.bin" = null;
}; };
services.xserver.displayManager.autoLogin.enable = false; # Enable CUPS to print documents.
services.xserver.displayManager.autoLogin.user = "mans"; services.printing.enable = true;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
wget wget
neovim neovim
openssl openssl
tree
file
inetutils
]; ];
# services.gnome3.gnome-keyring.enable = true;
programs.gnupg.agent = {
enable = true;
enableSSHSupport = true;
};
home-manager = { home-manager = {
extraSpecialArgs = { inherit inputs; }; extraSpecialArgs = { inherit inputs; };
users = { users = {
# Import your home-manager configuration
mans = import ../../../home-manager/home.nix; mans = import ../../../home-manager/home.nix;
}; };
}; };
# https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion # https://nixos.wiki/wiki/FAQ/When_do_I_update_stateVersion
system.stateVersion = "22.11"; system.stateVersion = "22.11"; # Did you read the comment?
} }

View File

@ -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?
}