From b36b585db3c7e6fe3913605073ef748686c39078 Mon Sep 17 00:00:00 2001 From: randomuser Date: Tue, 9 Jan 2024 08:05:49 -0600 Subject: [PATCH] changes --- boxes/x230t/default.nix | 2 ++ boxes/x230t/hardware-configuration.nix | 2 +- builds/flake.nix | 1 + builds/st.nix | 2 +- builds/utils.nix | 3 +- builds/xbattmon.nix | 41 ++++++++++++++++++++++++ flake.lock | 6 ++-- flake.nix | 44 ++++++++++++-------------- modules/common.nix | 1 + modules/pulse.nix | 2 ++ 10 files changed, 75 insertions(+), 29 deletions(-) create mode 100644 builds/xbattmon.nix diff --git a/boxes/x230t/default.nix b/boxes/x230t/default.nix index b5a8048..f54f806 100644 --- a/boxes/x230t/default.nix +++ b/boxes/x230t/default.nix @@ -9,6 +9,8 @@ ../../modules/tlp.nix ]; + hardware.pulseaudio.enable = true; + boot.loader.grub.enable = true; boot.loader.grub.device = "/dev/sda"; diff --git a/boxes/x230t/hardware-configuration.nix b/boxes/x230t/hardware-configuration.nix index 8cdbf9a..d6f6f3c 100644 --- a/boxes/x230t/hardware-configuration.nix +++ b/boxes/x230t/hardware-configuration.nix @@ -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"; }; diff --git a/builds/flake.nix b/builds/flake.nix index 350b96a..cf86ae5 100644 --- a/builds/flake.nix +++ b/builds/flake.nix @@ -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 ( diff --git a/builds/st.nix b/builds/st.nix index fefa83b..12229c8 100644 --- a/builds/st.nix +++ b/builds/st.nix @@ -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 = '' diff --git a/builds/utils.nix b/builds/utils.nix index 715de15..0c893ad 100644 --- a/builds/utils.nix +++ b/builds/utils.nix @@ -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 ''; diff --git a/builds/xbattmon.nix b/builds/xbattmon.nix new file mode 100644 index 0000000..f7116b5 --- /dev/null +++ b/builds/xbattmon.nix @@ -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; + }; +} diff --git a/flake.lock b/flake.lock index 975aab9..39d781e 100644 --- a/flake.lock +++ b/flake.lock @@ -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" } } diff --git a/flake.nix b/flake.nix index 6ec0836..aca8ed7 100644 --- a/flake.nix +++ b/flake.nix @@ -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 - ]; - }; - }; }; } diff --git a/modules/common.nix b/modules/common.nix index 784ebf0..663f337 100644 --- a/modules/common.nix +++ b/modules/common.nix @@ -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 ]; diff --git a/modules/pulse.nix b/modules/pulse.nix index ed477eb..631f21a 100644 --- a/modules/pulse.nix +++ b/modules/pulse.nix @@ -3,4 +3,6 @@ { sound.enable = true; hardware.pulseaudio.enable = true; + + users.extraUsers.usr.extraGroups = [ "audio" ]; }