diff --git a/home-manager/home.nix b/home-manager/home.nix index 76a6b33..8f27abb 100644 --- a/home-manager/home.nix +++ b/home-manager/home.nix @@ -70,7 +70,6 @@ vmware-workstation jetbrains.datagrip jetbrains.goland - jetbrains.webstorm dig python3 ansible diff --git a/nixos/machines/lpt-mans/configuration.nix b/nixos/machines/lpt-mans/configuration.nix index b0f1491..fb162cc 100644 --- a/nixos/machines/lpt-mans/configuration.nix +++ b/nixos/machines/lpt-mans/configuration.nix @@ -13,39 +13,71 @@ 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; }; - # Enable CUPS to print documents. - services.printing.enable = true; + services.xserver.displayManager.autoLogin.enable = false; + services.xserver.displayManager.autoLogin.user = "mans"; 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"; # Did you read the comment? + system.stateVersion = "22.11"; } diff --git a/nixos/machines/lpt-mans/configuration.nix.old b/nixos/machines/lpt-mans/configuration.nix.old new file mode 100644 index 0000000..b0f1491 --- /dev/null +++ b/nixos/machines/lpt-mans/configuration.nix.old @@ -0,0 +1,51 @@ +# 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? +}