257 current 2024-09-17 21:56:50 24.11.20240916.99dc878 6.11.0 *

This commit is contained in:
sadan 2024-10-01 21:28:05 -04:00
parent fc395fd6a7
commit 288306a9a1
No known key found for this signature in database
5 changed files with 47 additions and 24 deletions

View file

@ -80,7 +80,7 @@ in
boot.loader.grub.efiSupport = true; boot.loader.grub.efiSupport = true;
boot.loader.grub.useOSProber = true; boot.loader.grub.useOSProber = true;
boot.loader.grub.efiInstallAsRemovable = true; boot.loader.grub.efiInstallAsRemovable = true;
boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; # boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
# add user to "openrazer" group # add user to "openrazer" group
hardware.openrazer.enable = true; hardware.openrazer.enable = true;
hardware.openrazer.users = [ "meyer" ]; hardware.openrazer.users = [ "meyer" ];

View file

@ -1,31 +1,25 @@
{ config, lib, pkgs, inputs, ... }: { config, lib, pkgs, inputs, ... }:
let let
flameshot = import ../../common/programs/flameshot.nix {inherit config;}; flameshot = import ../../common/programs/flameshot.nix { inherit config; };
arrpc = import ../../common/programs/arrpc.nix {}; arrpc = import ../../common/programs/arrpc.nix { };
zsh = import ../../common/programs/zsh.nix { inherit lib pkgs; };
_s1 = import ../../common/sops.nix { inherit config; }; _s1 = import ../../common/sops.nix { inherit config; };
files = import ../../common/files.nix { inherit config; }; files = import ../../common/files.nix { inherit config; };
shell = import ../../common/shell.nix { inherit config pkgs; }; shell = import ../../common/shell.nix { inherit config pkgs; };
p = import ../../common/pkgs.nix { inherit pkgs config; }; p = import ../../common/pkgs.nix { inherit pkgs config; };
_p1 = p.dev ++ p.gui ++ p.general ++ p.scripts ++ p.gaming; _p1 = p.dev ++ p.gui ++ p.general ++ p.scripts ++ p.gaming;
zshInitArgs = [ DES = import ../../common/desktopEntries.nix { };
"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 {};
in in
{ {
nixpkgs.config.allowInsecurePredicate = (pkg: true); nixpkgs.config.allowInsecurePredicate = (pkg: true);
imports = [ imports = [
inputs.sops-nix.homeManagerModules.sops inputs.sops-nix.homeManagerModules.sops
]; ];
sops = _s1; sops = _s1;
programs.zsh.enable = true; programs = {
programs.zsh.oh-my-zsh.enable = true; inherit zsh;
programs.zsh.initExtra = builtins.trace _z1 _z1; };
programs.java.enable = true; programs.java.enable = true;
programs.java.package = pkgs.temurin-bin-17; programs.java.package = pkgs.temurin-bin-17;
programs.zoxide.enable = true; programs.zoxide.enable = true;

View file

@ -1,10 +1,23 @@
# https://lazamar.co.uk/nix-versions/ # https://lazamar.co.uk/nix-versions/
{}: { pkgs, config }:
let let
# 1.89.1 # 1.89.1
vsc_pkgs = import (builtins.fetchTarball { vsc_pkgs = import
url = "https://github.com/NixOS/nixpkgs/archive/0c19708cf035f50d28eb4b2b8e7a79d4dc52f6bb.tar.gz"; (builtins.fetchGit {
}) {}; # Descriptive name to make the store path easier to identify
in { name = "my-old-revision";
vscode = vsc_pkgs.vscode; 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;
} }

View file

@ -1,7 +1,7 @@
{ pkgs, config }: { pkgs, config }:
let let
cpkg = import ../customPackages { inherit pkgs; }; cpkg = import ../customPackages { inherit pkgs; };
pinned = import ./pinned {}; pinned = import ./pinned.nix { inherit pkgs config; };
in in
{ {
dev = with pkgs;[ dev = with pkgs;[

View file

@ -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;
}