From 6c7cbf26418e228697a419e69c973e9c67cc699e Mon Sep 17 00:00:00 2001 From: Devin Finlinson Date: Tue, 4 Feb 2025 02:39:06 -0700 Subject: mega cleanup of flake.nix using Misterio77 config as reference --- machines/doretta/configuration.nix | 89 ---------------------------------- machines/doretta/default.nix | 98 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+), 89 deletions(-) delete mode 100644 machines/doretta/configuration.nix create mode 100644 machines/doretta/default.nix (limited to 'machines/doretta') diff --git a/machines/doretta/configuration.nix b/machines/doretta/configuration.nix deleted file mode 100644 index 9640d7f..0000000 --- a/machines/doretta/configuration.nix +++ /dev/null @@ -1,89 +0,0 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page -# and in the NixOS manual (accessible by running `nixos-help`). - -{ config, pkgs, ... }: - -{ - imports = - [ # Include the results of the hardware scan. - ./hardware-configuration.nix - ]; - - # Use the systemd-boot EFI boot loader. - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - boot.binfmt.emulatedSystems = ["aarch64-linux"]; - - networking.hostName = "doretta"; # Define your hostname. - - security.pam.sshAgentAuth.enable = true; - - virtualisation.libvirtd = { - enable = true; - }; - programs.virt-manager.enable = true; - - # Set your time zone. - time.timeZone = "US/Mountain"; - - # Configure network proxy if necessary - # networking.proxy.default = "http://user:password@proxy:port/"; - # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; - - # Select internationalisation properties. - # i18n.defaultLocale = "en_US.UTF-8"; - # console = { - # font = "Lat2-Terminus16"; - # keyMap = "us"; - # useXkbConfig = true; # use xkbOptions in tty. - # }; - - # Enable the X11 windowing system. - services.xserver.enable = true; - - # Enable the Plasma 6 Desktop Environment. - services.displayManager.sddm.enable = true; - services.desktopManager.plasma6.enable = true; - - # Enable CUPS to print documents. - # services.printing.enable = true; - - environment.systemPackages = with pkgs; [ - qemu - ]; - - # Some programs need SUID wrappers, can be configured further or are - # started in user sessions. - programs.mtr.enable = true; - programs.gnupg.agent = { - enable = true; - enableSSHSupport = true; - }; - - # Enable the OpenSSH daemon. - services.openssh = { - enable = true; - settings.X11Forwarding = true; - }; - - # Open ports in the firewall. - # networking.firewall.allowedTCPPorts = [ ... ]; - # networking.firewall.allowedUDPPorts = [ ... ]; - # Or disable the firewall altogether. - # networking.firewall.enable = false; - - # Copy the NixOS configuration file and link it from the resulting system - # (/run/current-system/configuration.nix). This is useful in case you - # accidentally delete configuration.nix. - # system.copySystemConfiguration = true; - - # This value determines the NixOS release from which the default - # settings for stateful data, like file locations and database versions - # on your system were taken. It's perfectly fine and recommended to leave - # this value at the release version of the first install of this system. - # Before changing this value read the documentation for this option - # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "23.05"; # Did you read the comment? -} - diff --git a/machines/doretta/default.nix b/machines/doretta/default.nix new file mode 100644 index 0000000..2b79a99 --- /dev/null +++ b/machines/doretta/default.nix @@ -0,0 +1,98 @@ +# Edit this configuration file to define what should be installed on +# your system. Help is available in the configuration.nix(5) man page +# and in the NixOS manual (accessible by running `nixos-help`). + +{ config, pkgs, ... }: + +{ + imports = + [ # Include the results of the hardware scan. + ./hardware-configuration.nix + + ../../modules/nixos/nix-common.nix + ../../modules/nixos/environment.nix + ../../modules/nixos/tailscale.nix + ../../modules/nixos/system-packages.nix + + ../../modules/users/defin.nix + ../../modules/users/git.nix + ../../modules/users/root.nix + ]; + + # Use the systemd-boot EFI boot loader. + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + boot.binfmt.emulatedSystems = ["aarch64-linux"]; + + networking.hostName = "doretta"; # Define your hostname. + + security.pam.sshAgentAuth.enable = true; + + virtualisation.libvirtd = { + enable = true; + }; + programs.virt-manager.enable = true; + + # Set your time zone. + time.timeZone = "US/Mountain"; + + # Configure network proxy if necessary + # networking.proxy.default = "http://user:password@proxy:port/"; + # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; + + # Select internationalisation properties. + # i18n.defaultLocale = "en_US.UTF-8"; + # console = { + # font = "Lat2-Terminus16"; + # keyMap = "us"; + # useXkbConfig = true; # use xkbOptions in tty. + # }; + + # Enable the X11 windowing system. + services.xserver.enable = true; + + # Enable the Plasma 6 Desktop Environment. + services.displayManager.sddm.enable = true; + services.desktopManager.plasma6.enable = true; + + # Enable CUPS to print documents. + # services.printing.enable = true; + + environment.systemPackages = with pkgs; [ + qemu + ]; + + # Some programs need SUID wrappers, can be configured further or are + # started in user sessions. + programs.mtr.enable = true; + programs.gnupg.agent = { + enable = true; + enableSSHSupport = true; + }; + + # Enable the OpenSSH daemon. + services.openssh = { + enable = true; + settings.X11Forwarding = true; + }; + + # Open ports in the firewall. + # networking.firewall.allowedTCPPorts = [ ... ]; + # networking.firewall.allowedUDPPorts = [ ... ]; + # Or disable the firewall altogether. + # networking.firewall.enable = false; + + # Copy the NixOS configuration file and link it from the resulting system + # (/run/current-system/configuration.nix). This is useful in case you + # accidentally delete configuration.nix. + # system.copySystemConfiguration = true; + + # This value determines the NixOS release from which the default + # settings for stateful data, like file locations and database versions + # on your system were taken. It's perfectly fine and recommended to leave + # this value at the release version of the first install of this system. + # Before changing this value read the documentation for this option + # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). + system.stateVersion = "23.05"; # Did you read the comment? +} + -- cgit v1.2.3