From 25f9bb20fe2bb16e420565c477f11b401c7a147d Mon Sep 17 00:00:00 2001 From: fleaz Date: Sun, 5 Jun 2022 02:16:30 +0200 Subject: [PATCH] more cleanup. added cups module --- machines/cray/configuration.nix | 17 ------- machines/jimbo/configuration.nix | 47 ------------------ machines/milhouse/configuration.nix | 75 ----------------------------- modules/cups.nix | 5 ++ roles/all.nix | 6 +++ 5 files changed, 11 insertions(+), 139 deletions(-) create mode 100644 modules/cups.nix diff --git a/machines/cray/configuration.nix b/machines/cray/configuration.nix index cfa5e4d..351ee53 100644 --- a/machines/cray/configuration.nix +++ b/machines/cray/configuration.nix @@ -1,7 +1,3 @@ -# 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’). - { pkgs, ... }: { imports = [ @@ -16,9 +12,6 @@ time.hardwareClockInLocalTime = true; #Be compatible with Windows Dualboot - # The global useDHCP flag is deprecated, therefore explicitly set to false here. - # Per-interface useDHCP will be mandatory in the future, so this generated config - # replicates the default behaviour. networking.useDHCP = false; networking.hostName = "cray"; # Define your hostname. networking.interfaces.enp4s0.useDHCP = true; @@ -28,16 +21,6 @@ services.printing.enable = true; services.printing.drivers = with pkgs; [ splix ]; - # List packages installed in system profile. To search, run: - environment.systemPackages = with pkgs; [ vim wget curl git ]; - - - # 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 = "21.11"; # Did you read the comment? } diff --git a/machines/jimbo/configuration.nix b/machines/jimbo/configuration.nix index 9508695..9eaae77 100644 --- a/machines/jimbo/configuration.nix +++ b/machines/jimbo/configuration.nix @@ -1,7 +1,3 @@ -# 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, lib, ... }: { imports = [ @@ -19,7 +15,6 @@ networking.networkmanager.enable = true; programs.nm-applet.enable = true; - hardware.opengl = { enable = true; driSupport = true; @@ -27,51 +22,9 @@ hardware.bluetooth.enable = true; - # Enable CUPS to print documents. - services.printing.enable = true; - services.printing.drivers = [ pkgs.splix ]; - - # Enable sound. - security.rtkit.enable = true; - services.pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - }; - - # Enable touchpad support (enabled default in most desktopManager). - # services.xserver.libinput.enable = true; - - # List packages installed in system profile. To search, run: - environment.systemPackages = with pkgs; [ - vim - wget - curl - git - ]; - services.openssh.enable = true; programs.ssh.startAgent = true; - - # List services that you want to enable: - - # Enable the OpenSSH daemon. - # services.openssh.enable = true; - - # Open ports in the firewall. - # networking.firewall.allowedTCPPorts = [ ... ]; - # networking.firewall.allowedUDPPorts = [ ... ]; - # Or disable the firewall altogether. - # networking.firewall.enable = false; - - # 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 = "21.11"; # Did you read the comment? } diff --git a/machines/milhouse/configuration.nix b/machines/milhouse/configuration.nix index 2096848..1e692a9 100644 --- a/machines/milhouse/configuration.nix +++ b/machines/milhouse/configuration.nix @@ -1,7 +1,3 @@ -# 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 = @@ -13,82 +9,11 @@ ]; networking.hostName = "milhouse"; # Define your hostname. - # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - # The global useDHCP flag is deprecated, therefore explicitly set to false here. - # Per-interface useDHCP will be mandatory in the future, so this generated config - # replicates the default behaviour. networking.useDHCP = false; networking.networkmanager.enable = true; programs.nm-applet.enable = true; - # 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"; - # }; - - # Enable the X11 windowing system. - # services.xserver.enable = true; - - # Configure keymap in X11 - # services.xserver.layout = "us"; - # services.xserver.xkbOptions = "eurosign:e"; - - # Enable CUPS to print documents. - # services.printing.enable = true; - - # Enable sound. - # sound.enable = true; - # hardware.pulseaudio.enable = true; - - # Enable touchpad support (enabled default in most desktopManager). - # services.xserver.libinput.enable = true; - - # Define a user account. Don't forget to set a password with ‘passwd’. - # users.users.jane = { - # isNormalUser = true; - # extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. - # }; - - # List packages installed in system profile. To search, run: - # $ nix search wget - # environment.systemPackages = with pkgs; [ - # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. - # wget - # firefox - # ]; - - # 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; - # }; - - # List services that you want to enable: - - # Enable the OpenSSH daemon. - # services.openssh.enable = true; - - # Open ports in the firewall. - # networking.firewall.allowedTCPPorts = [ ... ]; - # networking.firewall.allowedUDPPorts = [ ... ]; - # Or disable the firewall altogether. - # networking.firewall.enable = false; - - # 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 = "21.11"; # Did you read the comment? } diff --git a/modules/cups.nix b/modules/cups.nix new file mode 100644 index 0000000..af5b3d9 --- /dev/null +++ b/modules/cups.nix @@ -0,0 +1,5 @@ +{ + # Enable CUPS to print documents. + services.printing.enable = true; + services.printing.drivers = [ pkgs.splix ]; +} diff --git a/roles/all.nix b/roles/all.nix index e704784..c4504e4 100644 --- a/roles/all.nix +++ b/roles/all.nix @@ -1,7 +1,9 @@ { imports = [ ../home-manager/default.nix + ../modules/avahi.nix + ../modules/cups.nix ../modules/docker.nix ../modules/earlyoom.nix ../modules/fonts.nix @@ -13,7 +15,9 @@ ../modules/via.nix ../modules/virtualbox.nix ../modules/borgbackup.nix + ../secrets/remote-builder.nix + ../users/fleaz.nix ]; @@ -26,5 +30,7 @@ # GTK settings stuff for e.g. themes programs.dconf.enable = true; + # List packages installed in system profile. To search, run: + environment.systemPackages = with pkgs; [ vim wget curl git ]; }