From 2faa6c750a652353638c3927efd16639448038f1 Mon Sep 17 00:00:00 2001 From: Niten Date: Wed, 4 Aug 2021 17:12:06 -0700 Subject: [PATCH] Trying to fix live-disk.nix --- config/host-config/zbox.nix | 2 +- flake.nix | 12 +++--- home-manager/niten.nix | 73 ++++++++++++++++--------------------- live-disk.nix | 7 +++- 4 files changed, 44 insertions(+), 50 deletions(-) diff --git a/config/host-config/zbox.nix b/config/host-config/zbox.nix index d26ad7c..1b8e6f6 100644 --- a/config/host-config/zbox.nix +++ b/config/host-config/zbox.nix @@ -10,7 +10,7 @@ fudo.slynk.enable = true; - environment.systemPackages = with pkgs; [ opencv-java worther ]; + environment.systemPackages = with pkgs; [ opencv-java ]; networking = { interfaces = { diff --git a/flake.nix b/flake.nix index 134d22a..2b740d3 100644 --- a/flake.nix +++ b/flake.nix @@ -11,21 +11,21 @@ in { }; outputs = { nixpkgs, home-manager, ... }: - with nixpkgs.lib; let + lib = nixpkgs.lib; is-nix-file = filename: type: (builtins.match ".+.nix$" filename) != null; is-regular-file = filename: type: type == "regular" || type == "link"; hostname-from-file = filename: builtins.replaceStrings [ ".nix" ] [ "" ] filename; - hosts = map hostname-from-file (attrNames (filterAttrs is-nix-file - (filterAttrs is-regular-file (builtins.readDir ./config/hosts)))); + hosts = map hostname-from-file (lib.attrNames (lib.filterAttrs is-nix-file + (lib.filterAttrs is-regular-file (builtins.readDir ./config/hosts)))); pkgs = import nixpkgs { }; in { - nixConfigurations = mapAttrs (hostname: hostOpts: + nixConfigurations = lib.mapAttrs (hostname: hostOpts: lib.nixosSystem { - inherit system; + system = hostOpts.architecture; modules = [ (import ./initialize.nix { hostname = hostname; @@ -34,6 +34,6 @@ in { include-secrets = true; }) ]; - }) host-configs; + }) hosts; }; } diff --git a/home-manager/niten.nix b/home-manager/niten.nix index 7503f0d..3f8a2ab 100644 --- a/home-manager/niten.nix +++ b/home-manager/niten.nix @@ -1,45 +1,40 @@ -{ config, lib, pkgs, homedir, ... }: +{ config, lib, pkgs, homedir, enable-gui ? true, ... }: with lib; let name = "Niten"; email = "niten@fudo.org"; - hostname = config.instance.hostname; - host-config = config.fudo.hosts.${hostname}; + # doom-emacs-config = pkgs.fetchgit { + # url = "https://git.fudo.org/niten/doom-emacs.git"; + # rev = "6fdc2b5d0d97e49b59e1fc06cf7930b4e488e70b"; + # sha256 = "06zj8r000m8bjfpgwljaz5s563xg6cfva85i75ianh97209p1j0a"; + # }; - enable-gui = host-config.enable-gui; - - doom-emacs-config = pkgs.fetchgit { - url = "https://git.fudo.org/niten/doom-emacs.git"; - rev = "6fdc2b5d0d97e49b59e1fc06cf7930b4e488e70b"; - sha256 = "06zj8r000m8bjfpgwljaz5s563xg6cfva85i75ianh97209p1j0a"; - }; - - doom-emacs = pkgs.callPackage (pkgs.fetchgit { - url = "https://github.com/vlaci/nix-doom-emacs.git"; - rev = "fee14d217b7a911aad507679dafbeaa8c1ebf5ff"; - sha256 = "1g0izscjh5nv4n0n1m58jc6z27i9pkbxs17mnb05a83ffdbmmva6"; - }) { - doomPrivateDir = "${pkgs.doom-emacs-config}"; - extraPackages = with pkgs.emacsPackages; [ elpher use-package ]; - emacsPackagesOverlay = self: super: { - irony = super.irony.overrideAttrs (esuper: { - buildInputs = esuper.buildInputs - ++ [ pkgs.cmake pkgs.libclang pkgs.clang ]; - }); - spinner = let version = "1.7.4"; - in pkgs.emacsPackages.trivialBuild { - inherit version; - pname = "spinner"; - src = builtins.fetchTarball { - url = "https://elpa.gnu.org/packages/spinner-${version}.tar"; - sha256 = "1jj40d68lmz91ynzwqg0jqdjpa9cn5md1hmvjfhy0cr3l16qpfw5"; - }; - buildPhase = ":"; - }; - }; - }; + # doom-emacs = pkgs.callPackage (pkgs.fetchgit { + # url = "https://github.com/vlaci/nix-doom-emacs.git"; + # rev = "fee14d217b7a911aad507679dafbeaa8c1ebf5ff"; + # sha256 = "1g0izscjh5nv4n0n1m58jc6z27i9pkbxs17mnb05a83ffdbmmva6"; + # }) { + # doomPrivateDir = "${pkgs.doom-emacs-config}"; + # extraPackages = with pkgs.emacsPackages; [ elpher use-package ]; + # emacsPackagesOverlay = self: super: { + # irony = super.irony.overrideAttrs (esuper: { + # buildInputs = esuper.buildInputs + # ++ [ pkgs.cmake pkgs.libclang pkgs.clang ]; + # }); + # spinner = let version = "1.7.4"; + # in pkgs.emacsPackages.trivialBuild { + # inherit version; + # pname = "spinner"; + # src = builtins.fetchTarball { + # url = "https://elpa.gnu.org/packages/spinner-${version}.tar"; + # sha256 = "1jj40d68lmz91ynzwqg0jqdjpa9cn5md1hmvjfhy0cr3l16qpfw5"; + # }; + # buildPhase = ":"; + # }; + # }; + # }; gui-packages = with pkgs; let @@ -73,7 +68,7 @@ let clj2nix cmake curl - doom-emacs + # doom-emacs # doom-emacs-config # doomEmacsInit enca @@ -133,8 +128,6 @@ let castor ]; - hm = (import { inherit lib; }); - ensure-directories = [ ".emacs.d/.local/etc/eshell" ]; in { @@ -162,7 +155,7 @@ in { services = { emacs = { enable = true; - package = doom-emacs; + # package = doom-emacs; client = { enable = true; arguments = [ "-t" ]; @@ -179,8 +172,6 @@ in { ".local/share/openttd/baseset" = mkIf enable-gui { source = "${pkgs.openttd-data}/data"; }; - ".doom.d" = { source = pkgs.doom-emacs-config; }; - # For nixified emacs ".emacs.d/init.el".text = '' (load "default.el") diff --git a/live-disk.nix b/live-disk.nix index db86fee..67625ea 100644 --- a/live-disk.nix +++ b/live-disk.nix @@ -36,6 +36,8 @@ in { permitRootLogin = mkDefault "prohibit-password"; }; + nixpkgs.config.permittedInsecurePackages = [ "openssh-with-gssapi-8.4p1" ]; + users = { users = { niten = { @@ -47,7 +49,7 @@ in { }; root = { - authorizedKeys.keys = [ + openssh.authorizedKeys.keys = [ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDPwh522lvafTJYA0X2uFdP7Ws+Um1f8gZsARK1Y5nMzf6ZcWBF1jplTOKUVSOl4isMWni0Tu0TnX4zqCcgocWUVbwIwXSIRYqdiCPvVOH+/Ibc97n1/dYxk5JPMtbrsEw6/gWZxVg0qwe0J3dQWldEMiDY7iWhlrmIr7YL+Y3PUd7DOwp3PbfWfNyzTfE1kXcz5YvTeN+txFhbbXT0oS2R2wtc1vYXFZ/KbNstjqd+i8jszAq3ZkbbwL3aNR0RO4n8+GoIILGw8Ya4eP7D6+mYk608IhAoxpGyMrUch2TC2uvOK3rd/rw1hsTxf4AKjAZbrfd/FJaYru9ZeoLjD4bRGMdVp56F1m7pLvRiWRK62pV2Q/fjx+4KjHUrgyPd601eUIP0ayS/Rfuq8ijLpBJgO5/Y/6mFus/kjZIfRR9dXfLM67IMpyEzEITYrc/R2sedWf+YHxSh6eguAZ/kLzioar1nHLR7Wzgeu0tgWkD78WQGjpXGoefAz3xHeBg3Et0=" ]; }; @@ -62,6 +64,7 @@ in { users = { niten = import ./home-manager/niten.nix { inherit config lib pkgs; + enable-gui = false; homedir = "/home/niten"; }; }; @@ -70,7 +73,7 @@ in { i18n.defaultLocale = "en_US.UTF-8"; console.useXkbConfig = true; - service.xserver = { + services.xserver = { layout = "us"; xkbVariant = "dvp"; xkbOptions = "ctrl:nocaps";