From d2e29dba7a89b72fc71959ef893093b0272cb542 Mon Sep 17 00:00:00 2001 From: Alex Stan <90788596+Ultra980@users.noreply.github.com> Date: Sat, 6 May 2023 19:00:07 +0000 Subject: [PATCH] WHY IS IT NOT WORKING??? Signed-off-by: Alex S --- flake.nix | 33 ++- hosts/ultrapc/cachix.nix | 13 ++ hosts/ultrapc/cachix/helix.nix | 13 ++ hosts/ultrapc/configuration.nix | 249 +++++++++++++++++++++++ hosts/ultrapc/doom.d/config.el | 0 hosts/ultrapc/doom.d/init.el | 191 +++++++++++++++++ hosts/ultrapc/doom.d/packages.el | 0 hosts/ultrapc/hardware-configuration.nix | 39 ++++ hosts/ultrapi/configuration.nix | 86 ++++++++ 9 files changed, 614 insertions(+), 10 deletions(-) create mode 100644 hosts/ultrapc/cachix.nix create mode 100644 hosts/ultrapc/cachix/helix.nix create mode 100644 hosts/ultrapc/configuration.nix create mode 100644 hosts/ultrapc/doom.d/config.el create mode 100644 hosts/ultrapc/doom.d/init.el create mode 100644 hosts/ultrapc/doom.d/packages.el create mode 100644 hosts/ultrapc/hardware-configuration.nix create mode 100644 hosts/ultrapi/configuration.nix diff --git a/flake.nix b/flake.nix index e828d9e..0f1452b 100644 --- a/flake.nix +++ b/flake.nix @@ -13,16 +13,29 @@ }; outputs = { self, nixpkgs, home-manager, ... }@inputs: { - nixosConfigurations.ultrapc = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - specialArgs = { inherit inputs; }; - modules = [ - ./hosts/ultrapc/configuration.nix - { - environment.etc."nix/inputs/nixpkgs".source = nixpkgs.outPath; - nix.nixPath = [ "nixpkgs=/etc/nix/inputs/nixpkgs" ]; - } - ]; + nixosConfigurations = { + ultrapc = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + specialArgs = { inherit inputs; }; + modules = [ + ./hosts/ultrapc/configuration.nix + { + environment.etc."nix/inputs/nixpkgs".source = nixpkgs.outPath; + nix.nixPath = [ "nixpkgs=/etc/nix/inputs/nixpkgs" ]; + } + ]; + }; + ultrapi = nixpkgs.lib.nixosSystem { + system = "aarch64-linux"; + specialArgs = { inherit inputs; }; + modules = [ + ./hosts/ultrapi/configuration.nix + { + environment.etc."nix/inputs/nixpkgs".source = nixpkgs.outPath; + nix.nixPath = [ "nixpkgs=/etc/nix/inputs/nixpkgs" ]; + } + ]; + }; }; defaultPackage.x86_64-linux = home-manager.defaultPackage.x86_64-linux; defaultPackage.aarch64-linux = home-manager.defaultPackage.aarch64-linux; diff --git a/hosts/ultrapc/cachix.nix b/hosts/ultrapc/cachix.nix new file mode 100644 index 0000000..ecd2d39 --- /dev/null +++ b/hosts/ultrapc/cachix.nix @@ -0,0 +1,13 @@ + +# WARN: this file will get overwritten by $ cachix use +{ pkgs, lib, ... }: + +let + folder = ./cachix; + toImport = name: value: folder + ("/" + name); + filterCaches = key: value: value == "regular" && lib.hasSuffix ".nix" key; + imports = lib.mapAttrsToList toImport (lib.filterAttrs filterCaches (builtins.readDir folder)); +in { + inherit imports; + nix.settings.substituters = ["https://cache.nixos.org/"]; +} diff --git a/hosts/ultrapc/cachix/helix.nix b/hosts/ultrapc/cachix/helix.nix new file mode 100644 index 0000000..6fda109 --- /dev/null +++ b/hosts/ultrapc/cachix/helix.nix @@ -0,0 +1,13 @@ + +{ + nix = { + settings = { + substituters = [ + "https://helix.cachix.org" + ]; + trusted-public-keys = [ + "helix.cachix.org-1:ejp9KQpR1FBI2onstMQ34yogDm4OgU2ru6lIwPvuCVs=" + ]; + }; + }; +} diff --git a/hosts/ultrapc/configuration.nix b/hosts/ultrapc/configuration.nix new file mode 100644 index 0000000..b61823d --- /dev/null +++ b/hosts/ultrapc/configuration.nix @@ -0,0 +1,249 @@ +# 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, lib, inputs, ... }: +let + nix-software-center = inputs.nix-software-center.packages.${pkgs.system}.nix-software-center; + doom-emacs = inputs.nix-doom-emacs.packages.${pkgs.system}.default; +in { + imports = + [ # Include the results of the hardware scan. + ./hardware-configuration.nix + ./cachix.nix + ]; + + nix.settings.trusted-users = [ "root" "ultra" ]; + + boot = { + kernelPackages = pkgs.linuxPackages_latest; # Use the latest kernel + loader = { + systemd-boot.enable = true; + efi = { + canTouchEfiVariables = true; + efiSysMountPoint = "/boot/efi"; + }; + }; + + plymouth.enable = true; + }; + + networking = { + hostName = "ultrapc"; # Define your hostname. + + # Enable networking + networkmanager.enable = true; + + hosts = { + "192.168.1.221" = [ "pi" "pi-master" ]; + }; + }; + # 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"; + + + # Set your time zone. + time.timeZone = "Europe/Bucharest"; + + # Select internationalisation properties. + i18n.defaultLocale = "en_GB.utf8"; + + i18n.extraLocaleSettings = { + LC_ADDRESS = "ro_RO.utf8"; + LC_IDENTIFICATION = "ro_RO.utf8"; + LC_MEASUREMENT = "ro_RO.utf8"; + LC_MONETARY = "ro_RO.utf8"; + LC_NAME = "ro_RO.utf8"; + LC_NUMERIC = "ro_RO.utf8"; + LC_PAPER = "ro_RO.utf8"; + LC_TELEPHONE = "ro_RO.utf8"; + LC_TIME = "ro_RO.utf8"; + }; + + + # 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; + + # Define a user account. Don't forget to set a password with ‘passwd’. + users.users.ultra = { + isNormalUser = true; + description = "Alex S."; + extraGroups = [ + "networkmanager" + "wheel" + "vboxusers" + ]; + shell = pkgs.fish; + hashedPassword = "$6$OBjnSQhhJgHsr5LE$jFtUz.2qv0l2viv86exXmfHWC0fDFXKD3rqH41NmqgkdoBrwY2rPkDBCPjdq7PSoeudYcQ0nXxJvh1N7EIUs90"; + }; + + # Allow unfree packages + nixpkgs.config.allowUnfree = true; + + # List packages installed in system profile. To search, run: + # $ nix search wget + environment = { + systemPackages = with pkgs; [ + wget + neovim + neofetch + podman + distrobox + cargo + nushell + nerdfonts + steam-run + packagekit + nix-software-center + fish + libsForQt5.yakuake + libsForQt5.discover + wacomtablet + git + starship + plymouth + ]; + variables = { + NIX_AUTO_RUN = "!"; + }; + }; + programs.fish.enable = true; + # programs.nushell.enable = true; + # users.defaultUserShell = pkgs.zsh; + + # 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 = "22.11"; # Did you read the comment? + + system.autoUpgrade.enable = true; + system.autoUpgrade.allowReboot = false; + + security.sudo.extraConfig = '' + Defaults insults + Defaults pwfeedback + ''; + + virtualisation = { + podman = { + enable = true; + dockerCompat = true; + # defaultNetwork.settings.dns_enabled = true; + }; + waydroid.enable = true; + lxd.enable = true; + virtualbox = { + host = { + enable = false; # it takes a REALLY long time (and a lot of CPU) to build, and it still doesn't work. + enableExtensionPack = false; # false because this might build it (idk) + }; + + }; + }; + + + services = { + emacs = { + enable = false; # takes a lot of time to compile + package = doom-emacs.override { + doomPrivateDir = ./doom.d; + }; + }; + flatpak.enable = true; + packagekit.enable = true; + xserver = { + # videoDrivers = [ "nvidia" ]; + wacom.enable = true; + + enable = true; + + # Enable KDE Plasma 5 + displayManager = { + + # Enable autologin + autoLogin = { + enable = true; + user = "ultra"; + }; + + sddm = { + enable = true; + }; + }; + desktopManager.plasma5.enable = true; + + # Keymap + layout = "ro"; + xkbVariant = ""; + }; + apcupsd = { + enable = true; + }; + + # Enable CUPS to print documents. + printing = { + enable = true; + }; + }; + nix.settings.experimental-features = [ "nix-command" "flakes" ]; + + + # NVIDIA config +# services.xserver.videoDrivers = [ "nvidia" ]; +hardware = { + opengl = { + enable = true; + driSupport = true; + driSupport32Bit = true; + }; + /* + nvidia = { + package = config.boot.kernelPackages.nvidiaPackages.latest; + modesetting.enable = true; + }; + */ +}; + +} diff --git a/hosts/ultrapc/doom.d/config.el b/hosts/ultrapc/doom.d/config.el new file mode 100644 index 0000000..e69de29 diff --git a/hosts/ultrapc/doom.d/init.el b/hosts/ultrapc/doom.d/init.el new file mode 100644 index 0000000..818999e --- /dev/null +++ b/hosts/ultrapc/doom.d/init.el @@ -0,0 +1,191 @@ +;;; init.el -*- lexical-binding: t; -*- + +;; This file controls what Doom modules are enabled and what order they load +;; in. Remember to run 'doom sync' after modifying it! + +;; NOTE Press 'SPC h d h' (or 'C-h d h' for non-vim users) to access Doom's +;; documentation. There you'll find a "Module Index" link where you'll find +;; a comprehensive list of Doom's modules and what flags they support. + +;; NOTE Move your cursor over a module's name (or its flags) and press 'K' (or +;; 'C-c c k' for non-vim users) to view its documentation. This works on +;; flags as well (those symbols that start with a plus). +;; +;; Alternatively, press 'gd' (or 'C-c c d') on a module to browse its +;; directory (for easy access to its source code). + +(doom! :input + ;;chinese + ;;japanese + ;;layout ; auie,ctsrnm is the superior home row + + :completion + company ; the ultimate code completion backend + ;;helm ; the *other* search engine for love and life + ;;ido ; the other *other* search engine... + ;;ivy ; a search engine for love and life + vertico ; the search engine of the future + + :ui + ;;deft ; notational velocity for Emacs + doom ; what makes DOOM look the way it does + doom-dashboard ; a nifty splash screen for Emacs + doom-quit ; DOOM quit-message prompts when you quit Emacs + ;;(emoji +unicode) ; 🙂 + hl-todo ; highlight TODO/FIXME/NOTE/DEPRECATED/HACK/REVIEW + ;;hydra + ;;indent-guides ; highlighted indent columns + ;;ligatures ; ligatures and symbols to make your code pretty again + ;;minimap ; show a map of the code on the side + modeline ; snazzy, Atom-inspired modeline, plus API + ;;nav-flash ; blink cursor line after big motions + ;;neotree ; a project drawer, like NERDTree for vim + ophints ; highlight the region an operation acts on + (popup +defaults) ; tame sudden yet inevitable temporary windows + ;;tabs ; a tab bar for Emacs + ;;treemacs ; a project drawer, like neotree but cooler + ;;unicode ; extended unicode support for various languages + vc-gutter ; vcs diff in the fringe + vi-tilde-fringe ; fringe tildes to mark beyond EOB + ;;window-select ; visually switch windows + workspaces ; tab emulation, persistence & separate workspaces + ;;zen ; distraction-free coding or writing + + :editor + (evil +everywhere); come to the dark side, we have cookies + file-templates ; auto-snippets for empty files + fold ; (nigh) universal code folding + ;;(format +onsave) ; automated prettiness + ;;god ; run Emacs commands without modifier keys + ;;lispy ; vim for lisp, for people who don't like vim + ;;multiple-cursors ; editing in many places at once + ;;objed ; text object editing for the innocent + ;;parinfer ; turn lisp into python, sort of + ;;rotate-text ; cycle region at point between text candidates + snippets ; my elves. They type so I don't have to + ;;word-wrap ; soft wrapping with language-aware indent + + :emacs + dired ; making dired pretty [functional] + electric ; smarter, keyword-based electric-indent + ;;ibuffer ; interactive buffer management + undo ; persistent, smarter undo for your inevitable mistakes + vc ; version-control and Emacs, sitting in a tree + + :term + ;;eshell ; the elisp shell that works everywhere + ;;shell ; simple shell REPL for Emacs + ;;term ; basic terminal emulator for Emacs + ;;vterm ; the best terminal emulation in Emacs + + :checkers + syntax ; tasing you for every semicolon you forget + ;;(spell +flyspell) ; tasing you for misspelling mispelling + ;;grammar ; tasing grammar mistake every you make + + :tools + ;;ansible + ;;biblio ; Writes a PhD for you (citation needed) + ;;debugger ; FIXME stepping through code, to help you add bugs + ;;direnv + ;;docker + ;;editorconfig ; let someone else argue about tabs vs spaces + ;;ein ; tame Jupyter notebooks with emacs + (eval +overlay) ; run code, run (also, repls) + ;;gist ; interacting with github gists + lookup ; navigate your code and its documentation + ;;lsp ; M-x vscode + magit ; a git porcelain for Emacs + ;;make ; run make tasks from Emacs + ;;pass ; password manager for nerds + ;;pdf ; pdf enhancements + ;;prodigy ; FIXME managing external services & code builders + ;;rgb ; creating color strings + ;;taskrunner ; taskrunner for all your projects + ;;terraform ; infrastructure as code + ;;tmux ; an API for interacting with tmux + ;;upload ; map local to remote projects via ssh/ftp + + :os + (:if IS-MAC macos) ; improve compatibility with macOS + ;;tty ; improve the terminal Emacs experience + + :lang + ;;agda ; types of types of types of types... + ;;beancount ; mind the GAAP + cc ; C > C++ == 1 + ;;clojure ; java with a lisp + ;;common-lisp ; if you've seen one lisp, you've seen them all + ;;coq ; proofs-as-programs + ;;crystal ; ruby at the speed of c + ;;csharp ; unity, .NET, and mono shenanigans + ;;data ; config/data formats + ;;(dart +flutter) ; paint ui and not much else + ;;dhall + ;;elixir ; erlang done right + ;;elm ; care for a cup of TEA? + emacs-lisp ; drown in parentheses + ;;erlang ; an elegant language for a more civilized age + ;;ess ; emacs speaks statistics + ;;factor + ;;faust ; dsp, but you get to keep your soul + ;;fortran ; in FORTRAN, GOD is REAL (unless declared INTEGER) + ;;fsharp ; ML stands for Microsoft's Language + ;;fstar ; (dependent) types and (monadic) effects and Z3 + ;;gdscript ; the language you waited for + ;;(go +lsp) ; the hipster dialect + ;;(haskell +lsp) ; a language that's lazier than I am + ;;hy ; readability of scheme w/ speed of python + ;;idris ; a language you can depend on + json ; At least it ain't XML + ;;(java +meghanada) ; the poster child for carpal tunnel syndrome + javascript ; all(hope(abandon(ye(who(enter(here)))))) + ;;julia ; a better, faster MATLAB + kotlin ; a better, slicker Java(Script) + ;;latex ; writing papers in Emacs has never been so fun + ;;lean ; for folks with too much to prove + ;;ledger ; be audit you can be + ;;lua ; one-based indices? one-based indices + markdown ; writing docs for people to ignore + ;;nim ; python + lisp at the speed of c + nix ; I hereby declare "nix geht mehr!" + ;;ocaml ; an objective camel + org ; organize your plain life in plain text + ;;php ; perl's insecure younger brother + ;;plantuml ; diagrams for confusing people more + ;;purescript ; javascript, but functional + python ; beautiful is better than ugly + ;;qt ; the 'cutest' gui framework ever + ;;racket ; a DSL for DSLs + ;;raku ; the artist formerly known as perl6 + ;;rest ; Emacs as a REST client + ;;rst ; ReST in peace + ;;(ruby +rails) ; 1.step {|i| p "Ruby is #{i.even? ? 'love' : 'life'}"} + rust ; Fe2O3.unwrap().unwrap().unwrap().unwrap() + ;;scala ; java, but good + ;;(scheme +guile) ; a fully conniving family of lisps + sh ; she sells {ba,z,fi}sh shells on the C xor + ;;sml + ;;solidity ; do you need a blockchain? No. + ;;swift ; who asked for emoji variables? + ;;terra ; Earth and Moon in alignment for performance. + ;;web ; the tubes + yaml ; JSON, but readable + ;;zig ; C, but simpler + + :email + ;;(mu4e +org +gmail) + ;;notmuch + ;;(wanderlust +gmail) + + :app + ;;calendar + ;;emms + ;;everywhere ; *leave* Emacs!? You must be joking + ;;irc ; how neckbeards socialize + ;;(rs+org) ; emacs as an RSS reader + ;;twitter ; twitter client https://twitter.com/vnought + + :config + ;;literate + (default +bindings +smartparens)) diff --git a/hosts/ultrapc/doom.d/packages.el b/hosts/ultrapc/doom.d/packages.el new file mode 100644 index 0000000..e69de29 diff --git a/hosts/ultrapc/hardware-configuration.nix b/hosts/ultrapc/hardware-configuration.nix new file mode 100644 index 0000000..55d0d06 --- /dev/null +++ b/hosts/ultrapc/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" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/2fe6c12f-ed04-40ce-8873-dedcac4d7e28"; + fsType = "ext4"; + }; + + fileSystems."/boot/efi" = + { device = "/dev/disk/by-uuid/C258-287E"; + 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.enp4s0.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp5s0.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; +} diff --git a/hosts/ultrapi/configuration.nix b/hosts/ultrapi/configuration.nix new file mode 100644 index 0000000..d981552 --- /dev/null +++ b/hosts/ultrapi/configuration.nix @@ -0,0 +1,86 @@ + + { config, pkgs, lib, inputs, ... }: + + let + user = "ultra"; + hashedPassword = "$6$OBjnSQhhJgHsr5LE$jFtUz.2qv0l2viv86exXmfHWC0fDFXKD3rqH41NmqgkdoBrwY2rPkDBCPjdq7PSoeudYcQ0nXxJvh1N7EIUs90"; + hostname = "ultrapi"; + + helix = inputs.helix.packages.${pkgs.system}.default; + + + nixosHardware = pkgs.fetchFromGitHub { + owner = "NixOS"; + repo = "nixos-hardware"; + rev = "51559e691f1493a26f94f1df1aaf516bb507e78b"; + sha256 = "0spswivyk006h5xr0a0yhr7wr9fh0kg7cfyxqmk521svf3x1pnr8"; + }; + in { + + # imports = ["${fetchTarball "https://github.com/NixOS/nixos-hardware/archive/936e4649098d6a5e0762058cb7687be1b2d90550.tar.gz" }/raspberry-pi/4"]; + + imports = [ + "${nixosHardware}/raspberry-pi/4" + ]; + + fileSystems = { + "/" = { + device = "/dev/disk/by-label/NIXOS_SD"; + fsType = "ext4"; + options = [ "noatime" ]; + }; + }; + + networking = { + hostName = hostname; + }; + + environment.systemPackages = with pkgs; [ + vim + helix + docker + ]; + + services.openssh.enable = true; + + users = { + mutableUsers = false; + users."${user}" = { + isNormalUser = true; + hashedPassword = "${hashedPassword}"; + extraGroups = [ "wheel" ]; + }; + }; + + # Enable GPU acceleration + hardware.raspberry-pi."4".fkms-3d.enable = true; + + services.xserver = { + enable = false; + }; + + virtualisation = { + docker = { + enable = true; + enableOnBoot = true; + rootless = { + enable = true; + }; + }; + }; + + + security = { + sudo = { + extraConfig = '' + Defaults insults,pwfeedback + ''; + }; + }; + + nixpkgs = { + config = { + allowUnfree = true; + }; + }; + }