This commit is contained in:
alsaiduq-lab 2025-03-28 00:47:30 -06:00
parent e854d2515d
commit 90d8370b82
34 changed files with 39 additions and 131 deletions

View file

@ -1,7 +1,5 @@
{ {
config,
pkgs, pkgs,
lib,
... ...
}: { }: {
imports = [ imports = [

View file

@ -1,7 +1,5 @@
{ {
config,
pkgs, pkgs,
lib,
... ...
}: { }: {
home.packages = with pkgs; [ home.packages = with pkgs; [

View file

@ -1,7 +1,5 @@
{ {
config,
pkgs, pkgs,
lib,
... ...
}: { }: {
home.packages = with pkgs; [ home.packages = with pkgs; [

View file

@ -1,7 +1,5 @@
{ {
config,
pkgs, pkgs,
lib,
... ...
}: { }: {
home.packages = with pkgs; [ home.packages = with pkgs; [

View file

@ -1,7 +1,5 @@
{ {
config,
pkgs, pkgs,
lib,
... ...
}: { }: {
home.packages = with pkgs; [ home.packages = with pkgs; [

View file

@ -1,5 +1,8 @@
{ config, pkgs, lib, ... }:
{ {
config,
pkgs,
...
}: {
home.packages = with pkgs; [ home.packages = with pkgs; [
neovim neovim
gnugrep gnugrep

View file

@ -1,7 +1,5 @@
{ {
config,
pkgs, pkgs,
lib,
... ...
}: { }: {
home.packages = with pkgs; [ home.packages = with pkgs; [

View file

@ -1,7 +1,5 @@
{ {
config,
pkgs, pkgs,
lib,
... ...
}: { }: {
home.packages = with pkgs; [ home.packages = with pkgs; [

View file

@ -1,7 +1,5 @@
{ {
config,
pkgs, pkgs,
lib,
... ...
}: { }: {
home.packages = with pkgs; [ home.packages = with pkgs; [

View file

@ -1,7 +1,5 @@
{ {
config,
pkgs, pkgs,
lib,
... ...
}: { }: {
home.packages = with pkgs; [ home.packages = with pkgs; [

View file

@ -1,7 +1,5 @@
{ {
config,
pkgs, pkgs,
lib,
... ...
}: { }: {
home.packages = with pkgs; [ home.packages = with pkgs; [

View file

@ -2,10 +2,6 @@
# your system. Help is available in the configuration.nix(5) man page # your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running 'nixos-help'). # and in the NixOS manual (accessible by running 'nixos-help').
{ {
config,
pkgs,
lib,
inputs,
... ...
}: { }: {
imports = [ imports = [

View file

@ -1,5 +1,8 @@
{ config, pkgs, lib, ... }: {
let pkgs,
lib,
...
}: let
customPkgs = import ../pkgs {inherit pkgs lib;}; customPkgs = import ../pkgs {inherit pkgs lib;};
in { in {
imports = [ imports = [
@ -7,7 +10,8 @@ in {
]; ];
python.enable = true; python.enable = true;
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
(python311.withPackages (pyPkgs: with pyPkgs; [ (python311.withPackages (pyPkgs:
with pyPkgs; [
requests requests
pip pip
virtualenv virtualenv
@ -15,7 +19,6 @@ in {
])) ]))
python3Packages.pip python3Packages.pip
black black
ruff
brave # TODO: make a module to save browser stuff brave # TODO: make a module to save browser stuff
vesktop vesktop
git git
@ -43,6 +46,7 @@ in {
gawk gawk
obs-studio obs-studio
lazygit lazygit
lazydocker
jdk17 jdk17
bun bun
maven maven

View file

@ -1,7 +1,5 @@
{ {
config,
pkgs, pkgs,
lib,
... ...
}: { }: {
security.rtkit.enable = true; security.rtkit.enable = true;

View file

@ -1,7 +1,5 @@
{ {
config,
pkgs, pkgs,
lib,
... ...
}: { }: {
hardware.bluetooth = { hardware.bluetooth = {

View file

@ -1,7 +1,5 @@
{ {
config,
pkgs, pkgs,
lib,
... ...
}: { }: {
# Bootloader # Bootloader

View file

@ -1,7 +1,5 @@
{ {
config,
pkgs, pkgs,
lib,
... ...
}: { }: {
imports = [ imports = [

View file

@ -1,7 +1,5 @@
{ {
config,
pkgs, pkgs,
lib,
... ...
}: { }: {
virtualisation.docker = { virtualisation.docker = {

View file

@ -1,5 +1,4 @@
{ {
config,
pkgs, pkgs,
lib, lib,
... ...

View file

@ -1,7 +1,5 @@
{ {
config,
pkgs, pkgs,
lib,
... ...
}: let }: let
clear-sans = pkgs.stdenv.mkDerivation { clear-sans = pkgs.stdenv.mkDerivation {

View file

@ -1,7 +1,4 @@
{ {
config,
pkgs,
lib,
inputs, inputs,
... ...
}: { }: {

View file

@ -1,5 +1,4 @@
{ {
config,
pkgs, pkgs,
lib, lib,
... ...

View file

@ -1,7 +1,5 @@
{ {
config,
pkgs, pkgs,
lib,
... ...
}: { }: {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [

View file

@ -1,7 +1,4 @@
{ {
config,
pkgs,
lib,
... ...
}: { }: {
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;

View file

@ -1,7 +1,6 @@
{ {
config, config,
pkgs, pkgs,
lib,
... ...
}: { }: {
services.xserver.videoDrivers = ["nvidia"]; services.xserver.videoDrivers = ["nvidia"];

View file

@ -1,5 +1,4 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
let let
customPkgs = pkgs.callPackage ../pkgs { inherit pkgs lib; }; customPkgs = pkgs.callPackage ../pkgs { inherit pkgs lib; };
pipConf = pkgs.writeText "pip.conf" '' pipConf = pkgs.writeText "pip.conf" ''
@ -29,13 +28,14 @@ let
pkgs.python311Packages.pynvml pkgs.python311Packages.pynvml
pkgs.python311Packages.pyqtgraph pkgs.python311Packages.pyqtgraph
pkgs.python311Packages.pyqt6 pkgs.python311Packages.pyqt6
pkgs.python311Packages.cppcheck
pkgs.python311Packages.click pkgs.python311Packages.click
pkgs.python311Packages.typer pkgs.python311Packages.typer
pkgs.python311Packages.rich pkgs.python311Packages.rich
pkgs.python311Packages.pyyaml pkgs.python311Packages.pyyaml
pkgs.python311Packages.pytz pkgs.python311Packages.pytz
pkgs.python311Packages.pillow pkgs.python311Packages.pillow
pkgs.python311Packages.jedi
pkgs.python311Packages.libcst
]; ];
}; };
in { in {
@ -47,14 +47,13 @@ in {
pythonEnv pythonEnv
python3Packages.pip python3Packages.pip
black black
ruff isort
uv uv
stdenv.cc.cc.lib stdenv.cc.cc.lib
]; ];
# Environment variables
environment.variables = { environment.variables = {
PIP_PREFIX = "$HOME/.local"; PIP_PREFIX = "$HOME/.local";
PIP_CONFIG_FILE = "${pipConf}"; # Force pip to use our config PIP_CONFIG_FILE = "${pipConf}";
PYTHONPATH = "$HOME/.local/lib/python3.11/site-packages"; PYTHONPATH = "$HOME/.local/lib/python3.11/site-packages";
}; };
system.userActivationScripts.removeNumpy2 = '' system.userActivationScripts.removeNumpy2 = ''

View file

@ -1,9 +1,5 @@
{ {
config,
pkgs, pkgs,
lib,
inputs,
system,
... ...
}: { }: {
programs.steam = { programs.steam = {

View file

@ -1,7 +1,4 @@
{ {
config,
pkgs,
lib,
... ...
}: { }: {
time.timeZone = "America/Edmonton"; time.timeZone = "America/Edmonton";

View file

@ -1,7 +1,5 @@
{ {
config,
pkgs, pkgs,
lib,
... ...
}: let }: let
fish-rust = pkgs.callPackage ../pkgs/fish-rust {}; fish-rust = pkgs.callPackage ../pkgs/fish-rust {};

View file

@ -1,6 +1,7 @@
{ pkgs ? import <nixpkgs> {}, lib ? pkgs.lib }: {
pkgs ? import <nixpkgs> {},
let lib ? pkgs.lib,
}: let
numpy-1 = pkgs.python311Packages.numpy.overridePythonAttrs (oldAttrs: rec { numpy-1 = pkgs.python311Packages.numpy.overridePythonAttrs (oldAttrs: rec {
version = "1.26.4"; version = "1.26.4";
src = pkgs.fetchPypi { src = pkgs.fetchPypi {
@ -16,9 +17,7 @@ let
numpy = numpy-1; numpy = numpy-1;
}; };
}; };
in { in {
fish-rust = pkgs.callPackage ./fish-rust {}; fish-rust = pkgs.callPackage ./fish-rust {};
python-pymatting = pkgs.callPackage ./python-pymatting { python-pymatting = pkgs.callPackage ./python-pymatting {

View file

@ -1,10 +1,10 @@
{ lib { lib,
, python311Packages python311Packages,
, fetchPypi fetchPypi,
, stdenv stdenv,
, makeWrapper makeWrapper,
, cmake cmake,
, pkg-config pkg-config
}: }:
python311Packages.buildPythonPackage rec { python311Packages.buildPythonPackage rec {

View file

@ -1,8 +1,8 @@
{ lib { lib,
, python311Packages python311Packages,
, fetchPypi fetchPypi,
, python-pymatting python-pymatting,
, python-opencv-headless python-opencv-headless
}: }:
python311Packages.buildPythonPackage rec { python311Packages.buildPythonPackage rec {
pname = "rembg"; pname = "rembg";

View file

@ -1,41 +0,0 @@
{
lib,
stdenv,
fetchFromGitHub,
gtk-engine-murrine,
gnome-themes-extra,
bash,
sassc,
}:
stdenv.mkDerivation {
pname = "tokyo-night-gtk";
version = "main";
src = fetchFromGitHub {
owner = "Fausto-Korpsvart";
repo = "Tokyonight-GTK-Theme";
rev = "4dc45d60bf35f50ebd9ee41f16ab63783f80dd64";
sha256 = "0c7sp9n2pc70yy9msmbmcyhqbr63v1ssnsxk6vg10zwwc3wl19h0";
};
nativeBuildInputs = [bash sassc];
buildInputs = [gtk-engine-murrine gnome-themes-extra];
propagatedUserEnvPkgs = [gtk-engine-murrine];
buildPhase = ''
bash ./install.sh --dest $out/share/themes -n Tokyonight
bash ./install.sh --dest $out/share/themes -n Tokyonight --tweaks storm
bash ./install.sh --dest $out/share/themes -n Tokyonight --tweaks storm black
bash ./install.sh --dest $out/share/themes -n Tokyonight --tweaks storm black outline
'';
installPhase = "";
meta = with lib; {
description = "Tokyo Night GTK Theme";
homepage = "https://github.com/Fausto-Korpsvart/Tokyonight-GTK-Theme";
license = licenses.gpl3;
platforms = platforms.all;
maintainers = ["Cobray"];
};
}