refactoring and etc

This commit is contained in:
Matt Nish-Lapidus 2025-05-21 13:23:32 -04:00
parent 65b5562502
commit e26f4e6826
4 changed files with 92 additions and 83 deletions

36
flake.lock generated
View file

@ -88,11 +88,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1747794124,
"narHash": "sha256-GVMQfAoLuoo7Fq3VuwnWthWNoM9di/dlQdP/YrCQCCs=",
"lastModified": 1747815851,
"narHash": "sha256-Ti5Xoc5nfjj9cEcqqipjAr8un5nRTTfHPUt96bkXdaA=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "3f5c585027ef7798de403e4b7093f3005679496f",
"rev": "dab8132d4a9bffeaadb5af2e5a04140439477b7b",
"type": "github"
},
"original": {
@ -376,11 +376,11 @@
]
},
"locked": {
"lastModified": 1747793476,
"narHash": "sha256-2qAOSixSrbb9l6MI+SI4zGineOzDcc2dgOOFK9Dx+IY=",
"lastModified": 1747834438,
"narHash": "sha256-AHJt79W8wADzur2htCx1U8FtEk4XjvrHb9/3iDfNedI=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "2468b2d35512d093aeb04972a1d8c20a0735793f",
"rev": "6c2eb1e24cd0e76d88bdd633ef4c50d6286586e0",
"type": "github"
},
"original": {
@ -785,11 +785,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable"
},
"locked": {
"lastModified": 1747765978,
"narHash": "sha256-o/bZ7UTnMFLoJeeBybyEN8P0oQpsUFAEqzujsAx7W/g=",
"lastModified": 1747842926,
"narHash": "sha256-1DUbdZgI1uLNF8L7cw5QC50npHmC0v0hdVkjK2ezj00=",
"owner": "sodiboo",
"repo": "niri-flake",
"rev": "bb0aeb469b88a5edf312ab3eb4515ce58514755b",
"rev": "dda83db99c3c6ca2c047183db19533ab6a34ce15",
"type": "github"
},
"original": {
@ -818,11 +818,11 @@
"niri-unstable": {
"flake": false,
"locked": {
"lastModified": 1747635487,
"narHash": "sha256-za7ctGh4MaW1h5Drm1WtwNZxiXvQK9yXZAeeIyY9b2Q=",
"lastModified": 1747837522,
"narHash": "sha256-6zDhnqL7PTK+w/58ZdLZ3+M8fl/zRbvILAIboC/nMMU=",
"owner": "YaLTeR",
"repo": "niri",
"rev": "3f2b7e63ba15cf33475116d32e8b7d22208a8438",
"rev": "2415346caaa4121ed202b8e376fb40b2a44eb61f",
"type": "github"
},
"original": {
@ -1638,11 +1638,11 @@
"rust-overlay": "rust-overlay_3"
},
"locked": {
"lastModified": 1747668756,
"narHash": "sha256-3alkUeAL27njtl9VdJP+MmHrOxdbIT3Sxewa4/BzpEU=",
"lastModified": 1747819961,
"narHash": "sha256-ZlXhPOAz/j3cte0K7uIr6+Qs/+4Y4c8N+d5W21E2eVY=",
"owner": "sxyazi",
"repo": "yazi",
"rev": "546920e0491975a8060f10f8cd5c8d401bbe3231",
"rev": "622ba09a803b4a38983339b027d420238affa3d6",
"type": "github"
},
"original": {
@ -1659,11 +1659,11 @@
]
},
"locked": {
"lastModified": 1747791592,
"narHash": "sha256-EirNZzeq+SLPHBzHlKI7FGyNWkTtIJGeaKRew1S9LuY=",
"lastModified": 1747826223,
"narHash": "sha256-6UmRXJYEA5EBwTBBVoo5eomW9vPRdddeNMqzAIlrwQ0=",
"owner": "0xc000022070",
"repo": "zen-browser-flake",
"rev": "28c8c65e1b2aa5c949cb959d228dd7bafe200a1e",
"rev": "76a162a24feb27ee242f1d1df72f71970abb52af",
"type": "github"
},
"original": {

View file

@ -6,6 +6,8 @@
./hardware-configuration.nix
./razer-speaker-fix.nix
users-emenel
nixld
niri
kanata
filesystems-filez
@ -539,44 +541,6 @@
};
};
programs.nix-ld.enable = true;
programs.nix-ld.libraries = with pkgs; [
zlib
zstd
stdenv.cc.cc
curlFull
openssl.out
attr
libssh
libxcrypt.out
bzip2
libxml2
acl
libsodium
util-linux
xz
systemd
fontconfig
freetype
gnutls
util-linux
libGL.dev
psutils
egl-wayland
eglexternalplatform
glfw-wayland
glfw
libGL.dev
libuv.out
libressl.out
libudev-zero.out
mesa.out
gst_all_1.gstreamer
gst_all_1.gst-plugins-base
glib
alsa-lib
];
fonts = {
enableDefaultPackages = true;
fontDir.enable = true;
@ -628,33 +592,6 @@
};
users.groups.uinput = { };
# add user accounts
users.users.emenel = {
isNormalUser = true;
description = "emenel";
extraGroups = [
"networkmanager"
"network"
"wheel"
"uinput"
"uucp"
"dialout"
"input"
"audio"
"video"
"libvirtd"
"nvidia"
"cups"
"openrazer"
"plugdev"
"i2c-dev"
"scanner"
"lp"
];
packages = with pkgs; [
git
];
};

41
modules/system/nixld.nix Normal file
View file

@ -0,0 +1,41 @@
{ config, lib, pkgs, ... }:
{
programs.nix-ld.enable = true;
programs.nix-ld.libraries = with pkgs; [
zlib
zstd
stdenv.cc.cc
curlFull
openssl.out
attr
libssh
libxcrypt.out
bzip2
libxml2
acl
libsodium
util-linux
xz
systemd
fontconfig
freetype
gnutls
util-linux
libGL.dev
psutils
egl-wayland
eglexternalplatform
glfw-wayland
glfw
libGL.dev
libuv.out
libressl.out
libudev-zero.out
mesa.out
gst_all_1.gstreamer
gst_all_1.gst-plugins-base
glib
alsa-lib
];
}

View file

@ -0,0 +1,31 @@
{ config, lib, pkgs, ... }:
{
# add user accounts
users.users.emenel = {
isNormalUser = true;
description = "emenel";
extraGroups = [
"networkmanager"
"network"
"wheel"
"uinput"
"uucp"
"dialout"
"input"
"audio"
"video"
"libvirtd"
"nvidia"
"cups"
"openrazer"
"plugdev"
"i2c-dev"
"scanner"
"lp"
];
packages = with pkgs; [
git
];
};
}