From eb78bdc73c2b8866c4fe3c2597b727a83e5238f3 Mon Sep 17 00:00:00 2001 From: Eli Ribble Date: Sat, 27 Jul 2024 20:27:57 -0700 Subject: [PATCH] Move to the right location --- nalai/configuration.nix | 190 ------------------------------ nalai/etc/nixos/configuration.nix | 56 ++++++++- 2 files changed, 53 insertions(+), 193 deletions(-) delete mode 100644 nalai/configuration.nix diff --git a/nalai/configuration.nix b/nalai/configuration.nix deleted file mode 100644 index 2839610..0000000 --- a/nalai/configuration.nix +++ /dev/null @@ -1,190 +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, lib, pkgs, ... }: - -{ - imports = - [ # Include the results of the hardware scan. - ./hardware-configuration.nix - ]; - - # Bootloader. - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; - - # Bluetooth - hardware.bluetooth.enable = true; # enables support for Bluetooth - hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot - hardware.printers = { - ensureDefaultPrinter = "Brother_HLL8250CDW"; - ensurePrinters = [{ - name = "Brother_HLL8250CDW"; - deviceUri = "ipp://192.168.1.10/ipp"; - model = "everywhere"; - description = "Brother HL-L8250CDW"; - location = "study"; - }]; - }; - - networking.extraHosts = '' - 192.168.1.5 pihole.home.arpa - ''; - networking.hostName = "nalai"; # Define your hostname. - # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. - - # Configure network proxy if necessary - # networking.proxy.default = "http://user:password@proxy:port/"; - # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; - - # Enable networking - networking.networkmanager.enable = true; - - # Set your time zone. - time.timeZone = "America/Phoenix"; - - # Select internationalisation properties. - i18n.defaultLocale = "en_US.UTF-8"; - - i18n.extraLocaleSettings = { - LC_ADDRESS = "en_US.UTF-8"; - LC_IDENTIFICATION = "en_US.UTF-8"; - LC_MEASUREMENT = "en_US.UTF-8"; - LC_MONETARY = "en_US.UTF-8"; - LC_NAME = "en_US.UTF-8"; - LC_NUMERIC = "en_US.UTF-8"; - LC_PAPER = "en_US.UTF-8"; - LC_TELEPHONE = "en_US.UTF-8"; - LC_TIME = "en_US.UTF-8"; - }; - - # Enable the X11 windowing system. - # You can disable this if you're only using the Wayland session. - services.xserver.enable = true; - - # Enable the KDE Plasma Desktop Environment. - services.displayManager.sddm.enable = true; - services.desktopManager.plasma6.enable = true; - - # Configure keymap in X11 - services.xserver.xkb = { - layout = "us"; - variant = "dvorak"; - }; - - # Configure console keymap - console.keyMap = "dvorak"; - - # Enable CUPS to print documents. - services.printing.enable = true; - - # Enable sound with pipewire. - hardware.pulseaudio.enable = false; - security.rtkit.enable = true; - services.pipewire = { - enable = true; - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - # If you want to use JACK applications, uncomment this - #jack.enable = true; - - # use the example session manager (no others are packaged yet so this is enabled by default, - # no need to redefine it in your config for now) - #media-session.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.eliribble = { - isNormalUser = true; - description = "Eli Ribble"; - extraGroups = [ "adbusers" "networkmanager" "wheel" ]; - packages = with pkgs; [ - kdePackages.kate - # thunderbird - ]; - }; - - # Set up Android dev tools - programs.adb.enable = true; - - # Install firefox. - programs.firefox.enable = true; - - # Set neovim as the default editor - programs.neovim.enable = true; - programs.neovim.defaultEditor = true; - - nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ - "bluemail" "spotify" - ]; - - # List packages installed in system profile. To search, run: - # $ nix search wget - environment.systemPackages = with pkgs; [ - bluemail - cargo - chezmoi - cups-filters - dig - fish - fractal - gcc - gimp-with-plugins - git - gnumake - keychain - mosh - neovim - om4 - python3 - rustc - signal-desktop - spotify - thunderbird - tmux - wget - ]; - - # 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; - services.avahi = { - enable = true; - nssmdns4 = true; - publish.enable = true; - publish.workstation = true; - publish.addresses = true; - }; - services.tailscale.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 = "24.05"; # Did you read the comment? - - virtualisation.docker.enable = false; - virtualisation.podman.enable = true; -} diff --git a/nalai/etc/nixos/configuration.nix b/nalai/etc/nixos/configuration.nix index 395b312..2839610 100644 --- a/nalai/etc/nixos/configuration.nix +++ b/nalai/etc/nixos/configuration.nix @@ -2,7 +2,7 @@ # your system. Help is available in the configuration.nix(5) man page # and in the NixOS manual (accessible by running ‘nixos-help’). -{ config, pkgs, ... }: +{ config, lib, pkgs, ... }: { imports = @@ -14,6 +14,23 @@ boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; + # Bluetooth + hardware.bluetooth.enable = true; # enables support for Bluetooth + hardware.bluetooth.powerOnBoot = true; # powers up the default Bluetooth controller on boot + hardware.printers = { + ensureDefaultPrinter = "Brother_HLL8250CDW"; + ensurePrinters = [{ + name = "Brother_HLL8250CDW"; + deviceUri = "ipp://192.168.1.10/ipp"; + model = "everywhere"; + description = "Brother HL-L8250CDW"; + location = "study"; + }]; + }; + + networking.extraHosts = '' + 192.168.1.5 pihole.home.arpa + ''; networking.hostName = "nalai"; # Define your hostname. # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. @@ -85,13 +102,16 @@ users.users.eliribble = { isNormalUser = true; description = "Eli Ribble"; - extraGroups = [ "networkmanager" "wheel" ]; + extraGroups = [ "adbusers" "networkmanager" "wheel" ]; packages = with pkgs; [ kdePackages.kate # thunderbird ]; }; + # Set up Android dev tools + programs.adb.enable = true; + # Install firefox. programs.firefox.enable = true; @@ -99,15 +119,35 @@ programs.neovim.enable = true; programs.neovim.defaultEditor = true; + nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ + "bluemail" "spotify" + ]; + # List packages installed in system profile. To search, run: # $ nix search wget environment.systemPackages = with pkgs; [ + bluemail + cargo chezmoi + cups-filters + dig fish + fractal + gcc + gimp-with-plugins git - python3 + gnumake + keychain + mosh neovim + om4 + python3 + rustc + signal-desktop + spotify + thunderbird tmux + wget ]; # Some programs need SUID wrappers, can be configured further or are @@ -122,6 +162,14 @@ # Enable the OpenSSH daemon. # services.openssh.enable = true; + services.avahi = { + enable = true; + nssmdns4 = true; + publish.enable = true; + publish.workstation = true; + publish.addresses = true; + }; + services.tailscale.enable = true; # Open ports in the firewall. # networking.firewall.allowedTCPPorts = [ ... ]; @@ -137,4 +185,6 @@ # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). system.stateVersion = "24.05"; # Did you read the comment? + virtualisation.docker.enable = false; + virtualisation.podman.enable = true; }