From 306fa556e281ba500aa4edadceac05ad286c9da8 Mon Sep 17 00:00:00 2001 From: Wesley Irvin Date: Thu, 29 Jun 2023 17:44:33 -0400 Subject: [PATCH] Steiner Configuration Ported over the configuration for steiner into the flake. Have tested the deployment in a VM and am writing this commit from the flake itself. Everything came up and this should be good to pass issue #4 and move this to a Done status. --- flake.nix | 16 ++++ hardware/steiner.nix | 48 +++++++++++ home/wesley-steiner.nix | 180 ++++++++++++++++++++++++++++++++++++++++ hosts/steiner.nix | 5 ++ 4 files changed, 249 insertions(+) create mode 100644 hardware/steiner.nix create mode 100644 home/wesley-steiner.nix create mode 100644 hosts/steiner.nix diff --git a/flake.nix b/flake.nix index 3cd235e..a06cac7 100644 --- a/flake.nix +++ b/flake.nix @@ -25,6 +25,22 @@ ./updates/no-restart.nix ]; }; + "steiner" = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + modules = [ + ./hardware/steiner.nix + ./configs/desktop.nix + ./hosts/steiner.nix + ./users/wesley.nix + home-manager.nixosModules.home-manager + { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages=true; + home-manager.users.wesley = import ./home/wesley-steiner.nix; + } + ./updates/no-restart.nix + ]; + }; }; }; } diff --git a/hardware/steiner.nix b/hardware/steiner.nix new file mode 100644 index 0000000..a2dbcde --- /dev/null +++ b/hardware/steiner.nix @@ -0,0 +1,48 @@ +# 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" "usb_storage" "sd_mod" "rtsx_pci_sdmmc" ]; + boot.initrd.kernelModules = [ ]; + boot.kernelModules = [ "kvm-intel" ]; + boot.extraModulePackages = [ ]; + + fileSystems."/" = + { device = "/dev/disk/by-uuid/e6e56cd8-a5ee-45d6-bc88-0edc03bfc004"; + fsType = "btrfs"; + options = [ "subvol=@" ]; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/8357-3C1B"; + fsType = "vfat"; + }; + + fileSystems."/home" = + { device = "/dev/disk/by-uuid/e6e56cd8-a5ee-45d6-bc88-0edc03bfc004"; + fsType = "btrfs"; + options = [ "subvol=@home" ]; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/fb41410e-80cd-427b-8040-e9acb57b3ce5"; } + ]; + + # 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.enp0s31f6.useDHCP = lib.mkDefault true; + # networking.interfaces.wlp1s0.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/home/wesley-steiner.nix b/home/wesley-steiner.nix new file mode 100644 index 0000000..096fc80 --- /dev/null +++ b/home/wesley-steiner.nix @@ -0,0 +1,180 @@ +{ config, pkgs, ... }: + +{ + # Home Manager needs a bit of information about you and the paths it should + # manage. + home.username = "wesley"; + home.homeDirectory = "/home/wesley"; + + # 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 should not change this value, even if you update Home Manager. If you do + # want to update the value, then make sure to first check the Home Manager + # release notes. + home.stateVersion = "23.05"; # Please read the comment before changing. + + # The home.packages option allows you to install Nix packages into your + # environment. + home.packages = [ + # # Adds the 'hello' command to your environment. It prints a friendly + # # "Hello, world!" when run. + # pkgs.hello + + # # It is sometimes useful to fine-tune packages, for example, by applying + # # overrides. You can do that directly here, just don't forget the + # # parentheses. Maybe you want to install Nerd Fonts with a limited number of + # # fonts? + # (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; }) + + # # You can also create simple shell scripts directly inside your + # # configuration. For example, this adds a command 'my-hello' to your + # # environment: + # (pkgs.writeShellScriptBin "my-hello" '' + # echo "Hello, ${config.home.username}!" + # '') + ]; + + # Home Manager is pretty good at managing dotfiles. The primary way to manage + # plain files is through 'home.file'. + home.file = { + # # Building this configuration will create a copy of 'dotfiles/screenrc' in + # # the Nix store. Activating the configuration will then make '~/.screenrc' a + # # symlink to the Nix store copy. + # ".screenrc".source = dotfiles/screenrc; + + # # You can also set the file content immediately. + # ".gradle/gradle.properties".text = '' + # org.gradle.console=verbose + # org.gradle.daemon.idletimeout=3600000 + # ''; + }; + + # You can also manage environment variables but you will have to manually + # source + # + # ~/.nix-profile/etc/profile.d/hm-session-vars.sh + # + # or + # + # /etc/profiles/per-user/wesley/etc/profile.d/hm-session-vars.sh + # + # if you don't want to manage your shell through Home Manager. + home.sessionVariables = { + EDITOR = "nvim"; + }; + + # Let Home Manager install and manage itself. + programs.home-manager.enable = true; + + # Let home manager take over and manage our zsh install + programs.zsh = { + enable = true; + enableAutosuggestions = true; + enableSyntaxHighlighting = true; + shellAliases = { + btm = "btm --color=nord"; + }; + oh-my-zsh = { + enable = true; + plugins = [ "git" ]; + theme = "eastwood"; + }; + initExtra = '' + neofetch + ''; + }; + + # Let Home Manager install and manage starship + programs.starship = { + enable = true; + enableZshIntegration = true; + }; + + # Let Home Manager take over and manage git + programs.git = { + enable = true; + userName = "Wesley Irvin"; + userEmail = "wesley.irvin@gmail.com"; + }; + + # Let Home Manager take over and manage alacritty + programs.alacritty = { + enable = true; + settings = { + window.dimensions = { + columns = 115; + lines = 30; + }; + window.opacity = 0.95; + + ### BEGIN THEME ### + ### Nord ### + + # Copyright (c) 2016-present Sven Greb + # This source code is licensed under the MIT license found in the license file. + + colors = { + primary = { + background = "#2e3440"; + foreground = "#d8dee9"; + dim_foreground = "#a5abb6"; + }; + cursor = { + text = "#2e3440"; + cursor = "#d8dee9"; + }; + vi_mode_cursor = { + text = "#2e3440"; + cursor = "#d8dee9"; + }; + selection = { + text = "CellForeground"; + background = "#4c566a"; + }; + search = { + matches = { + foreground = "CellBackground"; + background = "#4c566a"; + }; + footer_bar = { + background = "#434c5e"; + foreground = "#d8dee9"; + }; + }; + normal = { + black = "#3b4252"; + red = "#bf616a"; + green = "#a3be8c"; + yellow = "#ebcb8b"; + blue = "#81a1c1"; + magenta = "#b48ead"; + cyan = "#88c0d0"; + white = "#e5e9f0"; + }; + bright = { + black = "#4c566a"; + red = "#bf616a"; + green = "#a3be8c"; + yellow = "#ebdb8b"; + blue = "#81a1c1"; + magenta = "#b48ead"; + cyan = "#8fbcbb"; + white = "#eceff4"; + }; + dim = { + black = "#373e4d"; + red = "#94545d"; + green = "#809575"; + yellow = "#b29e75"; + blue = "#68809a"; + magenta = "#8c739c"; + cyan = "#6d96a5"; + white = "#aeb3bb"; + }; + }; + ### END THEME ### + }; + }; +} diff --git a/hosts/steiner.nix b/hosts/steiner.nix new file mode 100644 index 0000000..86ef814 --- /dev/null +++ b/hosts/steiner.nix @@ -0,0 +1,5 @@ +{ config, pkgs, ... }: + +{ + networking.hostName = "steiner"; # Define your hostname. +} -- 2.49.1