Compare commits

...

4 commits

Author SHA1 Message Date
5f4ab1664e
noop 2024-06-10 22:01:01 -05:00
79c0ab2d5f
go back to latest kernel on othalan 2024-06-10 21:50:30 -05:00
3352344ef1
flake.lock: Update
Flake lock file updates:

• Updated input 'hyprland':
    'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=121c6ac3eae1601a1498e52a9be7030ebfed242c' (2024-06-09)
  → 'git+https://github.com/hyprwm/Hyprland/?ref=refs/heads/main&rev=811429bfd4a46f33c7788580f72038b0c3c1c2b1' (2024-06-10)
• Updated input 'nix-index-database':
    'github:nix-community/nix-index-database/a157a81d0a4bc909b2b6666dd71909bcdc8cd0d6' (2024-06-09)
  → 'github:nix-community/nix-index-database/88ad3d7501e22b2401dd72734b032b7baa794434' (2024-06-10)
• Updated input 'nixos-wsl':
    'github:nix-community/NixOS-WSL/ccf99bcaa34f3d020ce9c68fafb0dda2a7afa5df' (2024-06-09)
  → 'github:nix-community/NixOS-WSL/e3f215e518d52f6f2e68cf713cefe773284e1aa6' (2024-06-09)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/cd18e2ae9ab8e2a0a8d715b60c91b54c0ac35ff9' (2024-06-08)
  → 'github:nixos/nixpkgs/3bcedce9f4de37570242faf16e1e143583407eab' (2024-06-09)
• Updated input 'nixpkgs-wayland':
    'github:nix-community/nixpkgs-wayland/44bb02ce43e73723a360c57d41208f1da6bf6b03' (2024-06-09)
  → 'github:nix-community/nixpkgs-wayland/e12fbee8584f0ad7a41d3c2c132e6ed0585630de' (2024-06-10)
• Updated input 'zig2nix':
    'github:Cloudef/zig2nix/e0fdcda76ab2fe0ebbb3c6c9b46e844370a834ea' (2024-06-09)
  → 'github:Cloudef/zig2nix/c8704bb3d3db94c2084615965898941698ec6033' (2024-06-11)
2024-06-10 21:45:21 -05:00
b163a34633
promote dev/cli to essentials 2024-06-10 15:13:51 -05:00
5 changed files with 31 additions and 34 deletions

View file

@ -270,11 +270,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1717960589, "lastModified": 1718051463,
"narHash": "sha256-0fPh9sFwzWbvDTTY6omTrYk2r9nBz7e4AzGH6HlRLCo=", "narHash": "sha256-ZB7Ov9pbyOUl6Up8o3Kvb/4bghhcbBk0JILLS/L7LUM=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "121c6ac3eae1601a1498e52a9be7030ebfed242c", "rev": "811429bfd4a46f33c7788580f72038b0c3c1c2b1",
"revCount": 4788, "revCount": 4795,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland/" "url": "https://github.com/hyprwm/Hyprland/"
@ -521,11 +521,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717919703, "lastModified": 1718011381,
"narHash": "sha256-4i/c31+dnpv6KdUA3BhbMDS9Lvg/CDin78caYJlq0bY=", "narHash": "sha256-sFXI+ZANp/OC+MwfJoZgPSf4xMdtzQMe1pS3FGti4C8=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "a157a81d0a4bc909b2b6666dd71909bcdc8cd0d6", "rev": "88ad3d7501e22b2401dd72734b032b7baa794434",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -541,11 +541,11 @@
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_5"
}, },
"locked": { "locked": {
"lastModified": 1717950035, "lastModified": 1717976391,
"narHash": "sha256-DQv1ys0NQonNtlKK573kQ+alEk0FfNKxfw5Szn8Qki0=", "narHash": "sha256-STKlWaiiFKDybexvQCg5U1+DSLRaxT93NwVaiBSEvTI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "ccf99bcaa34f3d020ce9c68fafb0dda2a7afa5df", "rev": "e3f215e518d52f6f2e68cf713cefe773284e1aa6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -593,11 +593,11 @@
"nixpkgs": "nixpkgs_8" "nixpkgs": "nixpkgs_8"
}, },
"locked": { "locked": {
"lastModified": 1717957281, "lastModified": 1718050700,
"narHash": "sha256-rjYIvR9DDuPbBBPALDjULzPEzBWY9OjUegc/jHYk9QE=", "narHash": "sha256-Ld1gCiO3wjwlAdg3wOehTNdTe4qJt1t0idlE07I+Gzk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs-wayland", "repo": "nixpkgs-wayland",
"rev": "44bb02ce43e73723a360c57d41208f1da6bf6b03", "rev": "e12fbee8584f0ad7a41d3c2c132e6ed0585630de",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -672,11 +672,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1717868076, "lastModified": 1717893485,
"narHash": "sha256-c83Y9t815Wa34khrux81j8K8ET94ESmCuwORSKm2bQY=", "narHash": "sha256-WMU6ZRZrBgEUDIF0siu2aIyVAXcxfElSwzZtS/mSpN4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "cd18e2ae9ab8e2a0a8d715b60c91b54c0ac35ff9", "rev": "3bcedce9f4de37570242faf16e1e143583407eab",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1015,11 +1015,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1717896262, "lastModified": 1718068727,
"narHash": "sha256-NlzMzWpIbRv55fn0bu0/ymIIjH81oC4YwgRtBrvcmk4=", "narHash": "sha256-xfkhBwlket05Du/i6zOyZ+vLhvq/cwsZEYOSx7S2C74=",
"owner": "Cloudef", "owner": "Cloudef",
"repo": "zig2nix", "repo": "zig2nix",
"rev": "e0fdcda76ab2fe0ebbb3c6c9b46e844370a834ea", "rev": "c8704bb3d3db94c2084615965898941698ec6033",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -30,10 +30,7 @@
"vt.default_blu=46,168,161,175,250,231,213,222,112,168,161,175,250,231,213,200" "vt.default_blu=46,168,161,175,250,231,213,222,112,168,161,175,250,231,213,200"
]; ];
# Virtual Box doesn't compile with latest kernel boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_latest;
# try latest after this PR is merged
# https://github.com/NixOS/nixpkgs/pull/311362
# boot.kernelPackages = pkgs.linuxPackagesFor pkgs.linux_latest;
boot.loader = { boot.loader = {
systemd-boot = enabled // { systemd-boot = enabled // {

View file

@ -1,7 +1,12 @@
{ pkgs, self, ... }: {
pkgs,
self,
enabled,
...
}:
{ {
imports = with self.nixosModules; [ git ]; imports = with self.nixosModules; [ git ];
programs.zsh.enable = true; programs.zsh = enabled;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
tmux tmux
unzip unzip
@ -9,6 +14,7 @@
less less
gnumake gnumake
gcc gcc
file
jq jq

View file

@ -2,6 +2,7 @@
inputs, inputs,
self, self,
pkgs, pkgs,
enabled,
... ...
}: }:
{ {
@ -26,7 +27,7 @@
self.packages.${pkgs.system}.default self.packages.${pkgs.system}.default
]; ];
programs.nix-index-database.comma.enable = true; programs.nix-index-database.comma = enabled;
# nix-index didn't like this being enabled? # nix-index didn't like this being enabled?
programs.command-not-found.enable = false; programs.command-not-found.enable = false;
@ -34,12 +35,5 @@
nix.settings = { nix.settings = {
trusted-users = [ "@wheel" ]; trusted-users = [ "@wheel" ];
accept-flake-config = true; accept-flake-config = true;
# substituters = [
# "https://daylin.cachix.org"
# ];
# trusted-public-keys = [
# "daylin.cachix.org-1:fLdSnbhKjtOVea6H9KqXeir+PyhO+sDSPhEW66ClE/k="
# ];
}; };
} }

View file

@ -13,8 +13,8 @@ in
runes runes
nix nix
essentials
cli cli
dev
nvim nvim
vpn vpn
gpg gpg