From ba885cb236542c7c8f3a9f6e2f48aef38d46480e Mon Sep 17 00:00:00 2001 From: tdpeuter Date: Mon, 6 Mar 2023 20:01:20 +0100 Subject: [PATCH] Fix git submodule --- nixos | 1 - nixos/apply-system.sh | 4 + nixos/apply-users.sh | 4 + nixos/system/configuration.nix | 129 ++++++++++++++++++++++++ nixos/system/hardware-configuration.nix | 39 +++++++ nixos/update-system.sh | 2 + nixos/update-users.sh | 2 + nixos/users/tdpeuter/home.nix | 38 +++++++ 8 files changed, 218 insertions(+), 1 deletion(-) delete mode 160000 nixos create mode 100755 nixos/apply-system.sh create mode 100755 nixos/apply-users.sh create mode 100644 nixos/system/configuration.nix create mode 100644 nixos/system/hardware-configuration.nix create mode 100755 nixos/update-system.sh create mode 100755 nixos/update-users.sh create mode 100644 nixos/users/tdpeuter/home.nix diff --git a/nixos b/nixos deleted file mode 160000 index c35c2d9..0000000 --- a/nixos +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c35c2d9da454b1411f92a54ae590637afb77f337 diff --git a/nixos/apply-system.sh b/nixos/apply-system.sh new file mode 100755 index 0000000..240309f --- /dev/null +++ b/nixos/apply-system.sh @@ -0,0 +1,4 @@ +#!/bin/sh +pushd ~/projects/sisyphus/nixos +sudo nixos-rebuild switch -I nixos-config=./system/configuration.nix +popd diff --git a/nixos/apply-users.sh b/nixos/apply-users.sh new file mode 100755 index 0000000..67d872a --- /dev/null +++ b/nixos/apply-users.sh @@ -0,0 +1,4 @@ +#!/bin/sh +pushd ~/projects/sisyphus/nixos +home-manager switch -f ./users/tdpeuter/home.nix +popd diff --git a/nixos/system/configuration.nix b/nixos/system/configuration.nix new file mode 100644 index 0000000..15a0361 --- /dev/null +++ b/nixos/system/configuration.nix @@ -0,0 +1,129 @@ +# 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 = + [ # Include the results of the hardware scan. + ./hardware-configuration.nix + ]; + + # Use the systemd-boot EFI boot loader.] + boot.loader = { + systemd-boot.enable = true; + + efi = { + canTouchEfiVariables = true; + efiSysMountPoint = "/boot/efi"; + }; + }; + + networking.hostName = "Tibo-NixTest"; # Define your hostname. + # Pick only one of the below networking options. + # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + networking.networkmanager.enable = true; # Easiest to use and most distros use this by default. + + # Set your time zone. + time.timeZone = "Europe/Brussels"; + + # 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_GB.UTF-8"; + # console = { + # font = "Lat2-Terminus16"; + # keyMap = "us"; + # useXkbConfig = true; # use xkbOptions in tty. + # }; + + # Enable the X11 windowing system. + services.xserver.enable = true; + + + # Enable the Plasma 5 Desktop Environment. + services.xserver.displayManager.sddm.enable = true; + services.xserver.desktopManager.plasma5.enable = true; + + + # Configure keymap in X11 + # services.xserver.layout = "us"; + # services.xserver.xkbOptions = { + # "eurosign:e"; + # "caps:escape" # map caps to escape. + # }; + + # Enable CUPS to print documents. + # services.printing.enable = true; + + # Enable sound. + sound.enable = true; + hardware.pulseaudio.enable = true; + + # Enable Bluetooth. + hardware.bluetooth.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.tdpeuter = { + description = "Tibo De Peuter"; + isNormalUser = true; + extraGroups = [ "wheel" "networkmanager" ]; + initialPassword = "ChangeMe"; + packages = with pkgs; [ + home-manager + ]; + }; + + # List packages installed in system profile. To search, run: + # $ nix search wget + environment.systemPackages = with pkgs; [ + firefox + git + vim + wget + ]; + + 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; + + # Copy the NixOS configuration file and link it from the resulting system + # (/run/current-system/configuration.nix). This is useful in case you + # accidentally delete configuration.nix. + # system.copySystemConfiguration = true; + + # 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 = "22.11"; # Did you read the comment? + +} + diff --git a/nixos/system/hardware-configuration.nix b/nixos/system/hardware-configuration.nix new file mode 100644 index 0000000..d2edd76 --- /dev/null +++ b/nixos/system/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 + "/installer/scan/not-detected.nix") + ]; + + boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" "sdhci_pci" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-label/NIXROOT"; + fsType = "ext4"; + }; + + fileSystems."/boot/efi" = + { device = "/dev/disk/by-label/NIXBOOT"; + fsType = "vfat"; + }; + + swapDevices = + [ { device = "/dev/disk/by-label/SWAP"; } + ]; + + # 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.enp0s25.useDHCP = lib.mkDefault true; + # networking.interfaces.wlo1.useDHCP = lib.mkDefault true; + + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +} diff --git a/nixos/update-system.sh b/nixos/update-system.sh new file mode 100755 index 0000000..0a7262f --- /dev/null +++ b/nixos/update-system.sh @@ -0,0 +1,2 @@ +#!/bin/sh +sudo nix-channel --update diff --git a/nixos/update-users.sh b/nixos/update-users.sh new file mode 100755 index 0000000..aadccd6 --- /dev/null +++ b/nixos/update-users.sh @@ -0,0 +1,2 @@ +#!/bin/sh +nix-channel --update diff --git a/nixos/users/tdpeuter/home.nix b/nixos/users/tdpeuter/home.nix new file mode 100644 index 0000000..7c01e8f --- /dev/null +++ b/nixos/users/tdpeuter/home.nix @@ -0,0 +1,38 @@ +{ config, pkgs, ... }: + +{ + # Home Manager needs a bit of information about you and the + # paths it should manage. + home.username = "tdpeuter"; + home.homeDirectory = "/home/tdpeuter"; + + # This value determines the Home Manager release that your + # configuration is compatible with. This helps avoid breakage + # when a new Home Manager release introduces backwards + # incompatible changes. + # + # You can update Home Manager without changing this value. See + # the Home Manager release notes for a list of state version + # changes in each release. + home.stateVersion = "22.11"; + + # Let Home Manager install and manage itself. + programs.home-manager.enable = true; + + programs.gpg.enable = true; + services.gpg-agent = { + enable = true; + pinentryFlavor = "qt"; + }; + + home.packages = with pkgs; [ + alacritty + duf + git-crypt + gnupg + pinentry_qt + zellij + zenith + ]; + +}