lytedev/nix
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Stuff

Browse source
This commit is contained in:
Daniel Flanagan 2024-02-16 14:57:52 -06:00
parent 06887379d4
commit 3135d7b4ab
Signed by: lytedev
GPG key ID: 5B2020A0F9921EF4
8 changed files with 81 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
flake.lock
View file

@ -137,9 +137,7 @@
"inputs": {
"crane": "crane",
"flake-utils": "flake-utils_3",
"nixpkgs": [
"nixpkgs"
],
"nixpkgs": "nixpkgs",
"rust-overlay": "rust-overlay"
},
"locked": {
@ -229,7 +227,7 @@
},
"hyprlang": {
"inputs": {
"nixpkgs": "nixpkgs"
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1704287638,
@ -268,6 +266,22 @@
}
},
"nixpkgs": {
"locked": {
"lastModified": 1707689078,
"narHash": "sha256-UUGmRa84ZJHpGZ1WZEBEUOzaPOWG8LZ0yPg1pdDF/yM=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "f9d39fb9aff0efee4a3d5f4a6d7c17701d38a1d8",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_2": {
"locked": {
"lastModified": 1702645756,
"narHash": "sha256-qKI6OR3TYJYQB3Q8mAZ+DG4o/BR9ptcv9UnRV2hzljc=",
@ -283,7 +297,7 @@
"type": "github"
}
},
"nixpkgs_2": {
"nixpkgs_3": {
"locked": {
"lastModified": 1704722960,
"narHash": "sha256-mKGJ3sPsT6//s+Knglai5YflJUF2DGj7Ai6Ynopz0kI=",
@ -299,6 +313,22 @@
"type": "github"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1707689078,
"narHash": "sha256-UUGmRa84ZJHpGZ1WZEBEUOzaPOWG8LZ0yPg1pdDF/yM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "f9d39fb9aff0efee4a3d5f4a6d7c17701d38a1d8",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"api-lyte-dev": "api-lyte-dev",
@ -307,7 +337,7 @@
"helix": "helix",
"home-manager": "home-manager",
"hyprland": "hyprland",
"nixpkgs": "nixpkgs_2",
"nixpkgs": "nixpkgs_3",
"sops-nix": "sops-nix",
"ssbm": "ssbm"
}
@ -378,9 +408,7 @@
},
"ssbm": {
"inputs": {
"nixpkgs": [
"nixpkgs"
],
"nixpkgs": "nixpkgs_4",
"slippi-desktop": "slippi-desktop"
},
"locked": {

10
flake.nix
View file

@ -6,7 +6,8 @@
home-manager.inputs.nixpkgs.follows = "nixpkgs";
helix.url = "github:helix-editor/helix/master";
helix.inputs.nixpkgs.follows = "nixpkgs";
# I think if I force this to follow nixpkgs, I won't get caching benefits
# helix.inputs.nixpkgs.follows = "nixpkgs";
disko.url = "github:nix-community/disko/master";
disko.inputs.nixpkgs.follows = "nixpkgs";
@ -25,9 +26,10 @@
api-lyte-dev.inputs.nixpkgs.follows = "nixpkgs";
ssbm.url = "github:lytedev/ssbm-nix";
ssbm.inputs.nixpkgs.follows = "nixpkgs";
# I think if I force this to follow nixpkgs, I won't get caching benefits
# ssbm.inputs.nixpkgs.follows = "nixpkgs";
# TODO: doesn't support the forge mod loader yet
# TODO: doesn't (can't?) support the forge mod loader yet
# nix-minecraft.url = "github:Infinidoge/nix-minecraft";
};
@ -156,6 +158,7 @@
extra-substituters = [
"https://cache.nixos.org/"
"https://helix.cachix.org"
"https://ssbm-nix.cachix.org"
"https://nix-community.cachix.org"
"https://nix.h.lyte.dev"
];
@ -163,6 +166,7 @@
extra-trusted-public-keys = [
"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
"helix.cachix.org-1:ejp9KQpR1FBI2onstMQ34yogDm4OgU2ru6lIwPvuCVs="
"ssbm-nix.cachix.org-1:YN104LKAWaKQIecOphkftXgXlYZVK/IRHM1UD7WAIew="
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"h.lyte.dev:HeVWtne31ZG8iMf+c15VY3/Mky/4ufXlfTpT8+4Xbs0="
];

20
modules/home-manager/helix.nix
View file

@ -69,6 +69,26 @@
unit = "\t";
};
}
{
name = "javascript";
auto-format = true;
}
{
name = "typescript";
auto-format = true;
}
{
name = "jsx";
auto-format = true;
}
{
name = "tsx";
auto-format = true;
}
{
name = "jsonc";
auto-format = true;
}
# {
# name = "javascript";

4
modules/nixos/common.nix
View file

@ -84,10 +84,10 @@
zellij
# zstd
]
++ (with inputs.home-manager.packages.${system}; [
++ (with inputs.home-manager.packages.${pkgs.system}; [
home-manager
])
++ (with inputs.helix.packages.${system}; [
++ (with inputs.helix.packages.${pkgs.system}; [
helix
]);
};

11
modules/nixos/hyprland.nix
View file

@ -1,9 +1,8 @@
{
outputs,
pkgs,
...
}: {
imports = [outputs.nixosModules.ewwbar outputs.nixosModules.pipewire];
{pkgs, ...}: {
imports = [
./ewwbar.nix
./pipewire.nix
];
programs.hyprland.enable = true;
environment.systemPackages = with pkgs; [hyprpaper];
}

10
modules/nixos/sway.nix
View file

@ -1,9 +1,7 @@
{
pkgs,
outputs,
...
}: {
imports = with outputs.nixosModules; [pipewire];
{pkgs, ...}: {
imports = [
./pipewire.nix
];
# services.xserver.libinput.enable = true;

11
modules/nixos/wifi.nix
View file

@ -1,9 +1,10 @@
{lib, ...}: {
networking.networkmanager.enable = lib.mkDefault true;
systemd.services.NetworkManager-wait-online.enable = lib.mkDefault false;
{pkgs, ...}: let
inherit (pkgs.lib) mkDefault;
in {
networking.networkmanager.enable = mkDefault true;
systemd.services.NetworkManager-wait-online.enable = mkDefault false;
# TODO: networking.networkmanager.wifi.backend = "iwd"; ?
# TODO: powersave?
# TODO: can I pre-configure my usual wifi networks with SSIDs and PSKs loaded from secrets?
}

1
nixos/dragon.nix
View file

@ -1,6 +1,5 @@
{
config,
flake,
inputs,
outputs,
lib,