add dragon desktop computer, gitignore, and mini fixes
This commit is contained in:
parent
e7ca600305
commit
0727235af7
7 changed files with 139 additions and 3 deletions
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
|
@ -0,0 +1 @@
|
||||||
|
configuration.nix
|
|
@ -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/<machinename>-hardware-configuration.nix`
|
- copy the NixOS generated configuration to the `machines` folder `cp /etc/hardware-configuration.nix ~/nixos-config/machines/<machinename>-hardware-configuration.nix`
|
||||||
- copy the example configuration file in the `machines` folder `cp ~/nixos-config/machines/example-configuration.nix ~/nixos-config/machines/<machinename>-configuration.nix`
|
- copy the example configuration file in the `machines` folder `cp ~/nixos-config/machines/example-configuration.nix ~/nixos-config/machines/<machinename>-configuration.nix`
|
||||||
- edit your machine configuration file `~/nixos-config/machines/<machinename>-configuration.nix`, make changes and uncomment modules according to your needs for this machine
|
- edit your machine configuration file `~/nixos-config/machines/<machinename>-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
|
- edit the main configuration file `~/nixos-config/configuration.nix` and point to the right files
|
||||||
```nix
|
```nix
|
||||||
# NixOS config entry point
|
# 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`
|
- 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`
|
- run the install `sudo nixos-rebuild switch`
|
||||||
- if all good don't forget to commit your changes
|
- if all good don't forget to commit your changes
|
||||||
|
|
95
machines/Segotep-desktop-tower-configuration.nix
Normal file
95
machines/Segotep-desktop-tower-configuration.nix
Normal file
|
@ -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?
|
||||||
|
|
||||||
|
}
|
38
machines/Segotep-desktop-tower-hardware-configuration.nix
Normal file
38
machines/Segotep-desktop-tower-hardware-configuration.nix
Normal file
|
@ -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.<interface>.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;
|
||||||
|
}
|
|
@ -83,6 +83,7 @@
|
||||||
extraConfig = {
|
extraConfig = {
|
||||||
pull.rebase = true;
|
pull.rebase = true;
|
||||||
init.defaultBranch = "main";
|
init.defaultBranch = "main";
|
||||||
|
core.fileMode = false;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -13,6 +13,6 @@
|
||||||
|
|
||||||
# TODO : find what is installing this, probably obsidian?
|
# TODO : find what is installing this, probably obsidian?
|
||||||
nixpkgs.config.permittedInsecurePackages = [
|
nixpkgs.config.permittedInsecurePackages = [
|
||||||
"electron-24.8.6"
|
"electron-25.9.0"
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue