From 0727235af7060016d03a2e91ce42f169ea8c40a3 Mon Sep 17 00:00:00 2001 From: Florian Schmitt Date: Wed, 20 Dec 2023 22:28:06 +0300 Subject: [PATCH] add dragon desktop computer, gitignore, and mini fixes --- .gitignore | 1 + README.md | 3 +- ...iguration.nix => configuration.example.nix | 0 .../Segotep-desktop-tower-configuration.nix | 95 +++++++++++++++++++ ...p-desktop-tower-hardware-configuration.nix | 38 ++++++++ modules/home-config.nix | 1 + modules/nixos.nix | 4 +- 7 files changed, 139 insertions(+), 3 deletions(-) create mode 100644 .gitignore rename configuration.nix => configuration.example.nix (100%) create mode 100644 machines/Segotep-desktop-tower-configuration.nix create mode 100644 machines/Segotep-desktop-tower-hardware-configuration.nix diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..40c7108 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +configuration.nix diff --git a/README.md b/README.md index 0e0b504..2e438d4 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,7 @@ On a fresh NixOS installation - copy the NixOS generated configuration to the `machines` folder `cp /etc/hardware-configuration.nix ~/nixos-config/machines/-hardware-configuration.nix` - copy the example configuration file in the `machines` folder `cp ~/nixos-config/machines/example-configuration.nix ~/nixos-config/machines/-configuration.nix` - edit your machine configuration file `~/nixos-config/machines/-configuration.nix`, make changes and uncomment modules according to your needs for this machine +- copy the example configuration file `~/nixos-config/configuration.example.nix` to `~/nixos-config/configuration.nix` - edit the main configuration file `~/nixos-config/configuration.nix` and point to the right files ```nix # NixOS config entry point @@ -23,4 +24,4 @@ On a fresh NixOS installation ``` - move the old `/etc/nixos` folder `sudo mv /etc/nixos /etc/nixos.old` and symlink your custom one `sudo ln -s ~/nixos-config /etc/nixos` - run the install `sudo nixos-rebuild switch` -- if all good don't forget to commit your changes \ No newline at end of file +- if all good don't forget to commit your changes diff --git a/configuration.nix b/configuration.example.nix similarity index 100% rename from configuration.nix rename to configuration.example.nix diff --git a/machines/Segotep-desktop-tower-configuration.nix b/machines/Segotep-desktop-tower-configuration.nix new file mode 100644 index 0000000..d37678a --- /dev/null +++ b/machines/Segotep-desktop-tower-configuration.nix @@ -0,0 +1,95 @@ +# 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, ... }: + +{ + + # Bootloader. + boot.loader.systemd-boot.enable = true; + boot.loader.efi.canTouchEfiVariables = true; + + networking.hostName = "dragon"; # 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 = "Europe/Moscow"; + + # Select internationalisation properties. + i18n.defaultLocale = "fr_FR.UTF-8"; + + i18n.extraLocaleSettings = { + LC_ADDRESS = "fr_FR.UTF-8"; + LC_IDENTIFICATION = "fr_FR.UTF-8"; + LC_MEASUREMENT = "fr_FR.UTF-8"; + LC_MONETARY = "fr_FR.UTF-8"; + LC_NAME = "fr_FR.UTF-8"; + LC_NUMERIC = "fr_FR.UTF-8"; + LC_PAPER = "fr_FR.UTF-8"; + LC_TELEPHONE = "fr_FR.UTF-8"; + LC_TIME = "fr_FR.UTF-8"; + }; + + # Enable the X11 windowing system. + services.xserver.enable = true; + + # Enable the KDE Plasma Desktop Environment. + services.xserver.displayManager.sddm.enable = true; + services.xserver.desktopManager.plasma5.enable = true; + + # Configure keymap in X11 + services.xserver = { + layout = "us"; + xkbVariant = ""; + }; + + # Enable CUPS to print documents. + services.printing.enable = true; + + # 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; + }; + + # Enable touchpad support (enabled default in most desktopManager). + # services.xserver.libinput.enable = true; + + imports = [ + ../modules/console.nix + ../modules/desktop.nix + ../modules/fonts.nix + ../modules/home-config.nix +# ../modules/laptop.nix +# ../modules/local-dev.nix + ../modules/nixos.nix + ]; + + # 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.11"; # Did you read the comment? + +} diff --git a/machines/Segotep-desktop-tower-hardware-configuration.nix b/machines/Segotep-desktop-tower-hardware-configuration.nix new file mode 100644 index 0000000..7915bec --- /dev/null +++ b/machines/Segotep-desktop-tower-hardware-configuration.nix @@ -0,0 +1,38 @@ +# 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 + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "uas" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/65b2e400-b6f1-4158-9586-1f5bab13f664"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/685D-B6DB"; + 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.enp2s0.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp0s20f0u1.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/modules/home-config.nix b/modules/home-config.nix index e0650e4..1650d74 100644 --- a/modules/home-config.nix +++ b/modules/home-config.nix @@ -83,6 +83,7 @@ extraConfig = { pull.rebase = true; init.defaultBranch = "main"; + core.fileMode = false; }; }; diff --git a/modules/nixos.nix b/modules/nixos.nix index e436db3..64254bd 100644 --- a/modules/nixos.nix +++ b/modules/nixos.nix @@ -13,6 +13,6 @@ # TODO : find what is installing this, probably obsidian? nixpkgs.config.permittedInsecurePackages = [ - "electron-24.8.6" + "electron-25.9.0" ]; -} \ No newline at end of file +}