From 89ab766ecb11513b3fa6dde30fcfb9f2e1afd704 Mon Sep 17 00:00:00 2001 From: Forestcat Date: Sat, 25 Nov 2023 15:37:36 +0100 Subject: [PATCH] Updated flake --- flake.lock | 27 +++++ flake.nix | 37 +++++-- nixos/configuration.nix | 176 +++++++++++++++++++++++++++++++ nixos/hardware-configuration.nix | 37 +++++++ 4 files changed, 269 insertions(+), 8 deletions(-) create mode 100644 flake.lock create mode 100644 nixos/configuration.nix create mode 100644 nixos/hardware-configuration.nix diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..06f6ba3 --- /dev/null +++ b/flake.lock @@ -0,0 +1,27 @@ +{ + "nodes": { + "nixpkgs": { + "locked": { + "lastModified": 1700851152, + "narHash": "sha256-3PWITNJZyA3jz5IGREJRfSykM6xSLmD8u5A3WpBCyDM=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "1216a5ba22a93a4a3a3bfdb4bff0f4727c576fcc", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "nixpkgs": "nixpkgs" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix index f0591e5..a9f1175 100644 --- a/flake.nix +++ b/flake.nix @@ -1,12 +1,33 @@ { - inputs.nixpkgs.url = "github:NixOS/nixpkgs"; - inputs.home-manager.url = "github:nix-community/home-manager"; + description = "First main nixos flake"; - outputs = { self, nixpkgs, ... }@attrs: { - nixosConfigurations.fnord = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = attrs; - modules = [ ./configuration.nix ]; - }; + inputs = { + nixpkgs.url = "github:nixos/nixpkgs/nixos-23.05"; }; + + outputs = { self, nixpkgs }: + let + system = "x86_64-linux"; + + pkgs = import nixpkgs { + inherit system; + + config = { + allowUnfree = true; + }; + }; +in +{ + +nixosConfigurations = { + myNixos = nixpkgs.lib.nixosSystem { + specialArgs = { inherit system; }; + + modules = [ + ./nixos/configuration.nix + ]; + }; + }; + + }; } \ No newline at end of file diff --git a/nixos/configuration.nix b/nixos/configuration.nix new file mode 100644 index 0000000..d53e7af --- /dev/null +++ b/nixos/configuration.nix @@ -0,0 +1,176 @@ +# 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 + ]; + + # Bootloader. + boot.loader.grub.enable = true; + boot.loader.grub.device = "/dev/sda"; + boot.loader.grub.useOSProber = true; + + boot.initrd.luks.devices."luks-1a4418a8-689c-4826-b589-c574f25c8ba5".device = "/dev/disk/by-uuid/1a4418a8-689c-4826-b589-c574f25c8ba5"; + # Setup keyfile + boot.initrd.secrets = { + "/crypto_keyfile.bin" = null; + }; + + boot.loader.grub.enableCryptodisk=true; + + boot.initrd.luks.devices."luks-955d08e0-c2b1-4cc1-9318-24baa423d4d2".keyFile = "/crypto_keyfile.bin"; + boot.initrd.luks.devices."luks-1a4418a8-689c-4826-b589-c574f25c8ba5".keyFile = "/crypto_keyfile.bin"; + networking.hostName = "hydra"; # 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/Berlin"; + + # Select internationalisation properties. + i18n.defaultLocale = "en_US.UTF-8"; + + i18n.extraLocaleSettings = { + LC_ADDRESS = "de_DE.UTF-8"; + LC_IDENTIFICATION = "de_DE.UTF-8"; + LC_MEASUREMENT = "de_DE.UTF-8"; + LC_MONETARY = "de_DE.UTF-8"; + LC_NAME = "de_DE.UTF-8"; + LC_NUMERIC = "de_DE.UTF-8"; + LC_PAPER = "de_DE.UTF-8"; + LC_TELEPHONE = "de_DE.UTF-8"; + LC_TIME = "de_DE.UTF-8"; + }; + + # Configure keymap in X11 + services.xserver.enable = true; + services.xserver = { + layout = "de"; + xkbVariant = ""; + }; + + # Configure console keymap + console.keyMap = "de"; + + # Enabling xbindkeys service for special media keys + systemd.user.services.xbindkeys.enable = true; + + # Enabling Audio + sound.enable = true; + hardware.pulseaudio.enable = true; + hardware.pulseaudio.support32Bit = true; + hardware.pulseaudio.package = pkgs.pulseaudioFull; + + + + # Define a user account. Don't forget to set a password with ‘passwd’. + users.users.forestcat = { + isNormalUser = true; + description = "forestcat"; + extraGroups = [ "networkmanager" "wheel" "audio" ]; + packages = with pkgs; []; + }; + users.defaultUserShell = pkgs.nushell; + + # Allow unfree packages + nixpkgs.config.allowUnfree = true; + + # List packages installed in system profile. To search, run: + # $ nix search wget + environment.systemPackages = with pkgs; [ + # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. + # wget + pkgs.brave + pkgs.firefox + pkgs.lf + pkgs.networkmanagerapplet + pkgs.discord + pkgs.element-desktop + pkgs.wget + pkgs.helix + pkgs.unzip + pkgs.tldr + pkgs.steam + pkgs.git + pkgs.awesome + pkgs.lightdm + pkgs.neofetch + pkgs.pulseaudioFull + pkgs.toybox + pkgs.pavucontrol + pkgs.lxappearance + pkgs.lxappearance-gtk2 + pkgs.xorg.xev + pkgs.xfce.xfce4-pulseaudio-plugin + pkgs.xbindkeys + pkgs.xbindkeys-config + pkgs.traceroute + pkgs.xorg.xinit + pkgs.nil + + ]; + + # 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? + + # Enabling wayland + # programs.sway.enable = true; + # xdg.portal.wlr.enable = true; + # services.xserver.wayland.enable = true; + + # Enabling awesome WM + # services.xserver.windowManager.awesome.enable = true; + services.xserver.desktopManager.xfce.enable = true; + + # Enabling LightDM + # services.xserver.displayManager.lightdm.enable = true; + + # Configuring lighdm greeter + + + # Enabling Pipewire for Audio Support + # services.pipewire.enable = true; + nix.settings.experimental-features = [ "nix-command" "flakes" ]; + + #Hardwarebeschleunigung f@r wayland + # hardware.opengl = { + # enable = true; + # driSupport = true; + # extraPackages = with pkgs; [ libva libva-utils libva-intel-driver ]; + # }; +} diff --git a/nixos/hardware-configuration.nix b/nixos/hardware-configuration.nix new file mode 100644 index 0000000..27f1d46 --- /dev/null +++ b/nixos/hardware-configuration.nix @@ -0,0 +1,37 @@ +# 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" "sd_mod" "sr_mod" "sdhci_pci" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/9e8fa989-bc21-4d9c-a75e-4a3185b21cb4"; + fsType = "ext4"; + }; + + boot.initrd.luks.devices."luks-955d08e0-c2b1-4cc1-9318-24baa423d4d2".device = "/dev/disk/by-uuid/955d08e0-c2b1-4cc1-9318-24baa423d4d2"; + + swapDevices = + [ { device = "/dev/disk/by-uuid/ce4a07bd-466b-4efe-85bd-35161f2f354c"; } + ]; + + # 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.wlp3s0.useDHCP = lib.mkDefault true; + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; +}