stupidcomputer
/
dot_testing
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

changes

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boxes/x230t/default.nix
View File

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

2
boxes/x230t/hardware-configuration.nix
View File

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

1
builds/flake.nix
View File

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

2
builds/st.nix
View File

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

3
builds/utils.nix
View File

@ -27,7 +27,8 @@ stdenv.mkDerivation rec {
for i in $(ls $src/sh); do
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
'';

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

6
flake.lock
View File

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

44
flake.nix
View File

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

1
modules/common.nix
View File

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

2
modules/pulse.nix
View File

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