Compare commits

...

2 commits

Author SHA1 Message Date
sadan
288306a9a1
257 current 2024-09-17 21:56:50 24.11.20240916.99dc878 6.11.0 * 2024-10-01 21:28:05 -04:00
sadan
fc395fd6a7
things 2024-09-17 21:24:54 -04:00
6 changed files with 76 additions and 41 deletions

View file

@ -76,11 +76,11 @@ in
};
# Use the systemd-boot EFI boot loader.
boot.loader.grub.device = "nodev";
boot.kernelPackages = pkgs.linuxPackages_testing;
boot.kernelPackages = pkgs.linuxPackages_latest;
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" ];

View file

@ -3,18 +3,12 @@
let
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 { };
in
{
@ -23,9 +17,9 @@ nixpkgs.config.allowInsecurePredicate = (pkg: true);
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;

23
common/pinned.nix Normal file
View file

@ -0,0 +1,23 @@
# https://lazamar.co.uk/nix-versions/
{ 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;
}

View file

@ -1,6 +1,7 @@
{ pkgs, config }:
let
cpkg = import ../customPackages { inherit pkgs; };
pinned = import ./pinned.nix { inherit pkgs config; };
in
{
dev = with pkgs;[
@ -37,6 +38,7 @@ in
nodejs_22
];
gui = with pkgs;[
pinned.vscode
teamviewer
davinci-resolve
warp-terminal
@ -73,7 +75,7 @@ in
google-chrome
bitwarden
nerdfonts
vscodium
# vscodium
kitty
rofi
thunderbird

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

View file

@ -41,11 +41,11 @@
]
},
"locked": {
"lastModified": 1725180166,
"narHash": "sha256-fzssXuGR/mCeGbzM1ExaTqDz7QDGta3WA4jJsZyRruo=",
"lastModified": 1726611136,
"narHash": "sha256-H3XQ8DHc/wtEcztf34IzWW7CPk7RZHTdB6PZd++0yt8=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "471e3eb0a114265bcd62d11d58ba8d3421ee68eb",
"rev": "4974dfb26e1c84d22bfdf943d41a33c9e51209a8",
"type": "github"
},
"original": {
@ -61,11 +61,11 @@
]
},
"locked": {
"lastModified": 1725765290,
"narHash": "sha256-hwX53i24KyWzp2nWpQsn8lfGQNCP0JoW/bvQmcR1DPY=",
"lastModified": 1726449931,
"narHash": "sha256-1AX7MyYzP7sNgZiGF8jwehCCI75y2kBGwACeryJs+yE=",
"owner": "nix-community",
"repo": "nix-index-database",
"rev": "642275444c5a9defce57219c944b3179bf2adaa9",
"rev": "c1b0fa0bec5478185eae2fd3f39b9e906fc83995",
"type": "github"
},
"original": {
@ -81,11 +81,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1725298871,
"narHash": "sha256-+3GjkgCQ41dPiTc8egAs1vznQsj4w1+xE7RrDyXohLM=",
"lastModified": 1726477654,
"narHash": "sha256-nE34QJfnkLZyZIVOXd73iICyvYROVSOo4h7pVRs0mqg=",
"owner": "nix-community",
"repo": "nixos-wsl",
"rev": "e3328f01dcb99241ac5ae69d9ace84512acca340",
"rev": "20630a560fa658b1f4fc16e6ef2b6b3d6f8539f5",
"type": "github"
},
"original": {
@ -96,11 +96,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1724316499,
"narHash": "sha256-Qb9MhKBUTCfWg/wqqaxt89Xfi6qTD3XpTzQ9eXi3JmE=",
"lastModified": 1726320982,
"narHash": "sha256-RuVXUwcYwaUeks6h3OLrEmg14z9aFXdWppTWPMTwdQw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "797f7dc49e0bc7fab4b57c021cdf68f595e47841",
"rev": "8f7492cce28977fbf8bd12c72af08b1f6c7c3e49",
"type": "github"
},
"original": {
@ -112,11 +112,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1721524707,
"narHash": "sha256-5NctRsoE54N86nWd0psae70YSLfrOek3Kv1e8KoXe/0=",
"lastModified": 1725762081,
"narHash": "sha256-vNv+aJUW5/YurRy1ocfvs4q/48yVESwlC/yHzjkZSP8=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "556533a23879fc7e5f98dd2e0b31a6911a213171",
"rev": "dc454045f5b5d814e5862a6d057e7bb5c29edc05",
"type": "github"
},
"original": {
@ -128,11 +128,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1725103162,
"narHash": "sha256-Ym04C5+qovuQDYL/rKWSR+WESseQBbNAe5DsXNx5trY=",
"lastModified": 1726463316,
"narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "12228ff1752d7b7624a54e9c1af4b222b3c1073b",
"rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172",
"type": "github"
},
"original": {
@ -144,11 +144,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1721466660,
"narHash": "sha256-pFSxgSZqZ3h+5Du0KvEL1ccDZBwu4zvOil1zzrPNb3c=",
"lastModified": 1725534445,
"narHash": "sha256-Yd0FK9SkWy+ZPuNqUgmVPXokxDgMJoGuNpMEtkfcf84=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "6e14bbce7bea6c4efd7adfa88a40dac750d80100",
"rev": "9bb1e7571aadf31ddb4af77fc64b2d59580f9a39",
"type": "github"
},
"original": {
@ -173,11 +173,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1725201042,
"narHash": "sha256-lj5pxOwidP0W//E7IvyhbhXrnEUW99I07+QpERnzTS4=",
"lastModified": 1726524647,
"narHash": "sha256-qis6BtOOBBEAfUl7FMHqqTwRLB61OL5OFzIsOmRz2J4=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "5db5921e40ae382d6716dce591ea23b0a39d96f7",
"rev": "e2d404a7ea599a013189aa42947f66cede0645c8",
"type": "github"
},
"original": {