diff --git a/boxes/desktop/configuration.nix b/boxes/desktop/configuration.nix index 79cbe38..19ec55a 100644 --- a/boxes/desktop/configuration.nix +++ b/boxes/desktop/configuration.nix @@ -80,7 +80,7 @@ in boot.loader.grub.efiSupport = true; boot.loader.grub.useOSProber = true; boot.loader.grub.efiInstallAsRemovable = true; - boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; + # boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; # add user to "openrazer" group hardware.openrazer.enable = true; hardware.openrazer.users = [ "meyer" ]; diff --git a/boxes/desktop/home.nix b/boxes/desktop/home.nix index 315f4da..803a732 100644 --- a/boxes/desktop/home.nix +++ b/boxes/desktop/home.nix @@ -1,31 +1,25 @@ { config, lib, pkgs, inputs, ... }: let - flameshot = import ../../common/programs/flameshot.nix {inherit config;}; - arrpc = import ../../common/programs/arrpc.nix {}; + flameshot = import ../../common/programs/flameshot.nix { inherit config; }; + arrpc = import ../../common/programs/arrpc.nix { }; + zsh = import ../../common/programs/zsh.nix { inherit lib pkgs; }; _s1 = import ../../common/sops.nix { inherit config; }; files = import ../../common/files.nix { inherit config; }; shell = import ../../common/shell.nix { inherit config pkgs; }; p = import ../../common/pkgs.nix { inherit pkgs config; }; _p1 = p.dev ++ p.gui ++ p.general ++ p.scripts ++ p.gaming; - zshInitArgs = [ - "source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme" - "source ${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh" - "[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh" - "setopt globstarshort" - ]; - _z1 = lib.concatMapStrings (x: x + "\n") zshInitArgs; - DES = import ../../common/desktopEntries.nix {}; + DES = import ../../common/desktopEntries.nix { }; in { -nixpkgs.config.allowInsecurePredicate = (pkg: true); + nixpkgs.config.allowInsecurePredicate = (pkg: true); imports = [ inputs.sops-nix.homeManagerModules.sops ]; sops = _s1; - programs.zsh.enable = true; - programs.zsh.oh-my-zsh.enable = true; - programs.zsh.initExtra = builtins.trace _z1 _z1; + programs = { + inherit zsh; + }; programs.java.enable = true; programs.java.package = pkgs.temurin-bin-17; programs.zoxide.enable = true; diff --git a/common/pinned.nix b/common/pinned.nix index 33e52d4..5e672f8 100644 --- a/common/pinned.nix +++ b/common/pinned.nix @@ -1,10 +1,23 @@ # https://lazamar.co.uk/nix-versions/ -{}: -let - # 1.89.1 - vsc_pkgs = import (builtins.fetchTarball { - url = "https://github.com/NixOS/nixpkgs/archive/0c19708cf035f50d28eb4b2b8e7a79d4dc52f6bb.tar.gz"; - }) {}; -in { - vscode = vsc_pkgs.vscode; +{ pkgs, config }: +let + # 1.89.1 + vsc_pkgs = import + (builtins.fetchGit { + # Descriptive name to make the store path easier to identify + name = "my-old-revision"; + url = "https://github.com/NixOS/nixpkgs/"; + ref = "refs/heads/nixpkgs-unstable"; + rev = "0c19708cf035f50d28eb4b2b8e7a79d4dc52f6bb"; + }) + { + system = pkgs.system; + config = { + allowUnfree = true; + }; + }; + a = vsc_pkgs.vscode; +in +{ + vscode = a; } diff --git a/common/pkgs.nix b/common/pkgs.nix index f46dd73..20eadcb 100644 --- a/common/pkgs.nix +++ b/common/pkgs.nix @@ -1,7 +1,7 @@ { pkgs, config }: let cpkg = import ../customPackages { inherit pkgs; }; - pinned = import ./pinned {}; + pinned = import ./pinned.nix { inherit pkgs config; }; in { dev = with pkgs;[ diff --git a/common/programs/zsh.nix b/common/programs/zsh.nix index e69de29..10fddbe 100644 --- a/common/programs/zsh.nix +++ b/common/programs/zsh.nix @@ -0,0 +1,16 @@ +{ lib, pkgs }: +let + + _ = [ + "source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme" + "source ${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh" + "[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh" + "setopt globstarshort" + ]; + zshInitArgs = lib.concatMapStrings (x: x + "\n") _; +in +{ + enable = true; + oh-my-zsh.enable = true; + initExtra = zshInitArgs; +}