From 3e37b535d5db400a850617e25420bcd48901e7e1 Mon Sep 17 00:00:00 2001 From: Norbert Melzer Date: Tue, 3 Jan 2023 15:35:06 +0100 Subject: [PATCH] hyperion home manager --- home/configurations/default.nix | 1 + home/configurations/nmelzer@hyperion.nix | 42 +++++++++++++++++++++ home/modules/misc/home/default.nix | 2 +- home/modules/profiles/base/default.nix | 10 ++--- home/modules/profiles/browsing/default.nix | 2 +- home/modules/programs/advcp/default.nix | 2 +- nixos/configurations/hardware/hyperion.nix | 44 ++++++++++++---------- nixos/configurations/hyperion.nix | 2 +- 8 files changed, 76 insertions(+), 29 deletions(-) create mode 100644 home/configurations/nmelzer@hyperion.nix diff --git a/home/configurations/default.nix b/home/configurations/default.nix index 1d7de264..85dcb0f5 100644 --- a/home/configurations/default.nix +++ b/home/configurations/default.nix @@ -1,6 +1,7 @@ _: { nobbz.homeConfigurations."nmelzer@mimas".system = "x86_64-linux"; nobbz.homeConfigurations."nmelzer@enceladeus".system = "x86_64-linux"; + nobbz.homeConfigurations."nmelzer@hyperion".system = "aarch64-linux"; nobbz.homeConfigurations."nmelzer@Titan.local" = { system = "aarch64-darwin"; diff --git a/home/configurations/nmelzer@hyperion.nix b/home/configurations/nmelzer@hyperion.nix new file mode 100644 index 00000000..e82a8b05 --- /dev/null +++ b/home/configurations/nmelzer@hyperion.nix @@ -0,0 +1,42 @@ +{ + unstable, + self, + ... +}: { + config, + pkgs, + lib, + ... +}: { + config = { + nixpkgs.allowedUnfree = ["vscode"]; + # nixpkgs.config.allowBroken = true; + + activeProfiles = ["development"]; + + dconf.enable = true; + + enabledLanguages = []; + + xsession.enable = lib.mkForce false; + xsession.windowManager.awesome.enable = lib.mkForce false; + xsession.numlock.enable = lib.mkForce false; + + programs.emacs.splashScreen = false; + + home.packages = builtins.attrValues { + inherit (pkgs) handbrake vscode keepassxc nix-output-monitor; + inherit (pkgs.gnome) gnome-tweaks; + inherit (self.packages.aarch64-linux) gnucash-de; + }; + + programs.htop = { + settings = { + detailed_cpu_time = true; + }; + }; + }; + # environment.pathsToLink = [ "/share/zsh" ]; +} +# /nix/store/7skqa8vxfydq7w3cix55ffvkmjb3b5da-python-2.7.18 + diff --git a/home/modules/misc/home/default.nix b/home/modules/misc/home/default.nix index 6effd577..cd6251b6 100644 --- a/home/modules/misc/home/default.nix +++ b/home/modules/misc/home/default.nix @@ -9,7 +9,7 @@ lib, ... }: let - self' = self.packages.x86_64-linux; + self' = self.packages.${pkgs.system}; in { profiles.base.enable = true; fonts.fontconfig.enable = true; diff --git a/home/modules/profiles/base/default.nix b/home/modules/profiles/base/default.nix index e7205570..85d7ea1b 100644 --- a/home/modules/profiles/base/default.nix +++ b/home/modules/profiles/base/default.nix @@ -6,7 +6,7 @@ }: let cfg = config.profiles.base; - inherit (self.packages.x86_64-linux) emacs; + inherit (self.packages.${pkgs.system}) emacs; inherit (lib.hm) dag; # TODO: make these a bit more nice, so that repeating the hosts and individual config isn't necessary. @@ -44,10 +44,10 @@ in { home.keyboard.layout = "de"; home.packages = [pkgs.hydra-check] ++ lib.optionals pkgs.stdenv.isLinux [pkgs.dconf]; - dconf.enable = lib.mkMerge [ - (lib.mkIf pkgs.stdenv.isLinux true) - (lib.mkIf pkgs.stdenv.isDarwin false) - ]; + # dconf.enable = lib.mkMerge [ + # (lib.mkIf pkgs.stdenv.isLinux true) + # (lib.mkIf pkgs.stdenv.isDarwin false) + # ]; xsession = { enable = true; diff --git a/home/modules/profiles/browsing/default.nix b/home/modules/profiles/browsing/default.nix index 841737ce..04b39d19 100644 --- a/home/modules/profiles/browsing/default.nix +++ b/home/modules/profiles/browsing/default.nix @@ -14,6 +14,6 @@ in { config = lib.mkIf cfg.enable { nixpkgs.config = {google-chrome = {enableWideVine = true;};}; - home.packages = with pkgs; [self.packages.x86_64-linux.google-chrome lynx]; + home.packages = with pkgs; [self.packages.${pkgs.system}.google-chrome lynx]; }; } diff --git a/home/modules/programs/advcp/default.nix b/home/modules/programs/advcp/default.nix index 9be04a82..11aaab5a 100644 --- a/home/modules/programs/advcp/default.nix +++ b/home/modules/programs/advcp/default.nix @@ -11,7 +11,7 @@ in { }; config = lib.mkIf cfg.enable { - home.packages = [self.packages.x86_64-linux.advcp]; + home.packages = [self.packages.${pkgs.system}.advcp]; programs.zsh.shellAliases = { cp = "advcp -g"; diff --git a/nixos/configurations/hardware/hyperion.nix b/nixos/configurations/hardware/hyperion.nix index 8d425701..393ce0bb 100644 --- a/nixos/configurations/hardware/hyperion.nix +++ b/nixos/configurations/hardware/hyperion.nix @@ -1,31 +1,35 @@ # 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 + "/profiles/qemu-guest.nix") - ]; + config, + lib, + pkgs, + modulesPath, + ... +}: { + imports = [ + (modulesPath + "/profiles/qemu-guest.nix") + ]; - boot.initrd.availableKernelModules = [ "xhci_pci" "virtio_pci" "usbhid" "usb_storage" "sr_mod" ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ ]; - boot.extraModulePackages = [ ]; + boot.initrd.availableKernelModules = ["xhci_pci" "virtio_pci" "usbhid" "usb_storage" "sr_mod"]; + boot.initrd.kernelModules = []; + boot.kernelModules = []; + boot.extraModulePackages = []; - fileSystems."/" = - { device = "/dev/disk/by-uuid/1c2c9f5f-041a-400d-9bfb-7b25639dff4f"; - fsType = "ext4"; - }; + fileSystems."/" = { + device = "/dev/disk/by-uuid/1c2c9f5f-041a-400d-9bfb-7b25639dff4f"; + fsType = "ext4"; + }; - fileSystems."/boot/efi" = - { device = "/dev/disk/by-uuid/0A83-6143"; - fsType = "vfat"; - }; + fileSystems."/boot/efi" = { + device = "/dev/disk/by-uuid/0A83-6143"; + fsType = "vfat"; + }; - swapDevices = - [ { device = "/dev/disk/by-uuid/d0a59a01-aa79-4ec6-aec0-b299be6c1157"; } - ]; + swapDevices = [ + {device = "/dev/disk/by-uuid/d0a59a01-aa79-4ec6-aec0-b299be6c1157";} + ]; # 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 diff --git a/nixos/configurations/hyperion.nix b/nixos/configurations/hyperion.nix index 2ede9b6a..160a4ed1 100644 --- a/nixos/configurations/hyperion.nix +++ b/nixos/configurations/hyperion.nix @@ -1,4 +1,4 @@ -_: {pkgs,...}: { +_: {pkgs, ...}: { nix.allowedUnfree = ["zerotierone"]; networking.hostName = "hyperion"; -- 2.51.2