commit 4bbea9b95448170e3ef321d1601b241c1a220330 Author: TheThomaas Date: Tue Jul 25 22:11:00 2023 +0200 Initialize repository https://github.com/raymondgh/nix-config diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e2f5dd2 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +result \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..54d3b66 --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +# nix-config + diff --git a/common-configuration.nix b/common-configuration.nix new file mode 100644 index 0000000..1aa18f2 --- /dev/null +++ b/common-configuration.nix @@ -0,0 +1,96 @@ +# NixOS Configuration common to both of my machines + +{ config, pkgs, ...}: + +{ + # Set your time zone. + time.timeZone = "Europe/Zurich"; + + # 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 = "fr_CH.UTF-8"; + + # Enable the X11 windowing system. + services.xserver.enable = true; + + # Enable the GNOME Desktop Environment. + services.xserver.displayManager.gdm.enable = true; + services.xserver.desktopManager.gnome.enable = true; + + # Configure keymap in X11 + services.xserver.layout = "ch"; + + # Enable CUPS to print documents. + services.printing.enable = true; + services.avahi.enable = true; + services.avahi.nssmdns = true; + # for a WiFi printer + services.avahi.openFirewall = true; + + # Configure console keymap + console.keyMap = "sg"; + + # Enable sound with pipewire. + sound.enable = true; + 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; + }; + + # Define a user account. Don't forget to set a password with ‘passwd’. + users.users.thomas = { + isNormalUser = true; + description = "Thomas"; + extraGroups = [ "networkmanager" "wheel" ]; + packages = with pkgs; [ + firefox + ]; + }; + + # Bootloader. + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + + # Allow unfree packages + nixpkgs.config.allowUnfree = true; + + # 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 = "23.05"; # Did you read the comment? +} \ No newline at end of file diff --git a/common-packages.nix b/common-packages.nix new file mode 100644 index 0000000..39dd4ca --- /dev/null +++ b/common-packages.nix @@ -0,0 +1,12 @@ +# common packages + +{ pkgs }: with pkgs; [ + git + (vscode-with-extensions.override { + vscode = vscodium; + vscodeExtensions = with vscode-extensions; [ + bbenoist.nix + ]; + }) + github-desktop +] \ No newline at end of file diff --git a/nixos-mbp/configuration.nix b/nixos-mbp/configuration.nix new file mode 100644 index 0000000..dee7a36 --- /dev/null +++ b/nixos-mbp/configuration.nix @@ -0,0 +1,33 @@ +# 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, ... }: + +let + commonPackages = import ../common-packages.nix { inherit pkgs; }; + +in +{ + networking.hostName = "nixos-mpb"; # Define your hostname. + + imports = + [ # Common configuration + ../common-configuration.nix + # Include the results of the hardware scan. + ./hardware-configuration.nix + ]; + + # Configure keymap in X11 + services.xserver.xkbVariant = "fr_mac"; + + # Enable touchpad support (enabled default in most desktopManager). + services.xserver.libinput.enable = true; + + nixpkgs.config.permittedInsecurePackages = [ + "openssl-1.1.1u" + ]; + + environment.systemPackages = with pkgs; [ + ] ++ commonPackages; +} diff --git a/nixos-mbp/hardware-configuration.nix b/nixos-mbp/hardware-configuration.nix new file mode 100644 index 0000000..6a08839 --- /dev/null +++ b/nixos-mbp/hardware-configuration.nix @@ -0,0 +1,39 @@ +# Do not modify this file! It was generated by ‘nixos-generate-config’ +# and may be overwritten by future invocations. Please make changes +# to /etc/nixos/configuration.nix instead. +{ config, lib, pkgs, modulesPath, ... }: + +{ + imports = + [ (modulesPath + "/hardware/network/broadcom-43xx.nix") + (modulesPath + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "nvme" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/c5bf82e0-cd6f-420d-bef6-943fc5890ced"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/70AD-35D9"; + fsType = "vfat"; + }; + + swapDevices = [ ]; + + # Enables DHCP on each ethernet and wireless interface. In case of scripted networking + # (the default) this is the recommended approach. When using systemd-networkd it's + # still possible to use this option, but it's recommended to use it in conjunction + # with explicit per-interface declarations with `networking.interfaces..useDHCP`. + networking.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +}