This commit is contained in:
randomuser 2024-01-09 08:05:49 -06:00
parent 66f4e6a7b0
commit b36b585db3
10 changed files with 75 additions and 29 deletions

View File

@ -9,6 +9,8 @@
../../modules/tlp.nix ../../modules/tlp.nix
]; ];
hardware.pulseaudio.enable = true;
boot.loader.grub.enable = true; boot.loader.grub.enable = true;
boot.loader.grub.device = "/dev/sda"; boot.loader.grub.device = "/dev/sda";

View File

@ -14,7 +14,7 @@
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" =
{ device = "/dev/disk/by-uuid/99d9f4ba-5781-4f2d-aa15-f1f911658913"; { device = "/dev/disk/by-uuid/772f67d6-9434-42f1-aa3e-153e41affe4c";
fsType = "ext4"; fsType = "ext4";
}; };

View File

@ -16,6 +16,7 @@
st = pkgs.callPackage ./st.nix { }; st = pkgs.callPackage ./st.nix { };
rebuild = pkgs.callPackage ./rebuild.nix { }; rebuild = pkgs.callPackage ./rebuild.nix { };
utils = pkgs.callPackage ./utils.nix { }; utils = pkgs.callPackage ./utils.nix { };
xbattmon = pkgs.callPackage ./xbattmon.nix { };
}; };
in in
withSystem ( withSystem (

View File

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
sha256 = "sha256-zdID1SUnTO/zl90EG8TguBNYYCnrnqFnSLz32kQZbng="; sha256 = "sha256-zdID1SUnTO/zl90EG8TguBNYYCnrnqFnSLz32kQZbng=";
}; };
nativeBuildInputs = [ pkg-config fontconfig freetype ncurses]; nativeBuildInputs = [ pkg-config fontconfig freetype ncurses ];
buildInputs = [ libX11 libXft ] ++ extraLibs; buildInputs = [ libX11 libXft ] ++ extraLibs;
buildPhase = '' buildPhase = ''

View File

@ -27,7 +27,8 @@ stdenv.mkDerivation rec {
for i in $(ls $src/sh); do for i in $(ls $src/sh); do
cp $src/sh/$i $out/bin cp $src/sh/$i $out/bin
wrapProgram $out/bin/$i --prefix PATH : ${lib.makeBinPath [ sxhkd bash feh xrandr jq figlet curl ]} ln -sf $out/bin/tmenu_run $out/bin/regenerate
wrapProgram $out/bin/$i --prefix PATH : ${lib.makeBinPath [ sxhkd bash feh xrandr jq figlet curl fzy ]}
done done
''; '';

41
builds/xbattmon.nix Normal file
View File

@ -0,0 +1,41 @@
{ stdenv
, lib
, fetchgit
, pkg-config
, libX11
, libXft
, libXinerama
, fontconfig
, freetype
, ncurses
, extraLibs ? [ ]
}:
stdenv.mkDerivation rec {
pname = "xbattmon";
version = "69.19";
src = fetchgit {
url = "https://git.beepboop.systems/rndusr/xbattmon";
sha256 = "sha256-mM5pjyBw+1lJoaXt0BNiXmqGRt0U2ABENitA8K/EZ9E=";
};
nativeBuildInputs = [ pkg-config fontconfig freetype ncurses ];
buildInputs = [ libX11 libXft libXinerama ] ++ extraLibs;
buildPhase = ''
./configure
make
'';
installPhase = ''
mkdir -p $out/bin
cp ${pname} $out/bin
'';
meta = with lib; {
description = "Customized builds of the st terminal emulator";
homepage = "https://git.beepboop.systems/rndusr/st";
license = licenses.mit;
};
}

View File

@ -91,12 +91,12 @@
}, },
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-PYg0MoGsZWtACHUwF/teZJ96wUhDs3rHgTe2A0sMQ/A=", "narHash": "sha256-B6H6Z595aKacBDVAbEc8gXeEr2YLZNm6JK43XPSKo10=",
"path": "/nix/store/lnr366wiqiliymnv4j8h8j01m7mvcb5w-source/builds", "path": "/nix/store/q8dkdvbif26q9vnvh19prj5qdlk8qrny-source/builds",
"type": "path" "type": "path"
}, },
"original": { "original": {
"path": "/nix/store/lnr366wiqiliymnv4j8h8j01m7mvcb5w-source/builds", "path": "/nix/store/q8dkdvbif26q9vnvh19prj5qdlk8qrny-source/builds",
"type": "path" "type": "path"
} }
} }

View File

@ -24,6 +24,13 @@
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
modules = [ modules = [
./boxes/virtbox ./boxes/virtbox
home-manager.nixosModules.home-manager {
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = { inherit inputs; };
home-manager.users.usr = import ./boxes/virtbox/home.nix;
}
]; ];
}; };
x230t = nixpkgs.lib.nixosSystem { x230t = nixpkgs.lib.nixosSystem {
@ -31,6 +38,13 @@
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
modules = [ modules = [
./boxes/x230t ./boxes/x230t
home-manager.nixosModules.home-manager {
home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true;
home-manager.extraSpecialArgs = { inherit inputs; };
home-manager.users.usr = import ./boxes/x230t/home.nix;
}
]; ];
}; };
mainsail = nixpkgs.lib.nixosSystem { mainsail = nixpkgs.lib.nixosSystem {
@ -38,29 +52,13 @@
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
modules = [ modules = [
./boxes/mainsail ./boxes/mainsail
];
}; home-manager.nixosModules.home-manager {
}; home-manager.useGlobalPkgs = true;
homeConfigurations = { home-manager.useUserPackages = true;
"usr@x230t" = home-manager.lib.homeManagerConfiguration { home-manager.extraSpecialArgs = { inherit inputs; };
pkgs = nixpkgs.legacyPackages.x86_64-linux; home-manager.users.usr = import ./boxes/mainsail/home.nix;
extraSpecialArgs = { inherit inputs; }; }
modules = [
./boxes/x230t/home.nix
];
};
"usr@mainsail" = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages.x86_64-linux;
extraSpecialArgs = { inherit inputs; };
modules = [
./boxes/x230t/home.nix
];
};
"usr@virtbox" = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages.x86_64-linux;
extraSpecialArgs = { inherit inputs; };
modules = [
./boxes/x230t/home.nix
]; ];
}; };
}; };

View File

@ -10,6 +10,7 @@
inputs.utilpkg.packages.x86_64-linux.st inputs.utilpkg.packages.x86_64-linux.st
inputs.utilpkg.packages.x86_64-linux.rebuild inputs.utilpkg.packages.x86_64-linux.rebuild
inputs.utilpkg.packages.x86_64-linux.utils inputs.utilpkg.packages.x86_64-linux.utils
inputs.utilpkg.packages.x86_64-linux.xbattmon
pkgs.man-pages pkgs.man-pages
]; ];

View File

@ -3,4 +3,6 @@
{ {
sound.enable = true; sound.enable = true;
hardware.pulseaudio.enable = true; hardware.pulseaudio.enable = true;
users.extraUsers.usr.extraGroups = [ "audio" ];
} }