auto lint

This commit is contained in:
alsaiduq-lab 2025-03-17 16:10:17 -06:00
parent a765516271
commit 6a9932451c
35 changed files with 262 additions and 205 deletions

View file

@ -1,6 +1,9 @@
{ config, pkgs, lib, ... }:
{ {
config,
pkgs,
lib,
...
}: {
imports = [ imports = [
./modules/dunst.nix ./modules/dunst.nix
./modules/fish.nix ./modules/fish.nix

View file

@ -1,6 +1,9 @@
{ config, pkgs, lib, ... }:
{ {
config,
pkgs,
lib,
...
}: {
home.packages = with pkgs; [ home.packages = with pkgs; [
dunst dunst
]; ];

View file

@ -1,6 +1,9 @@
{ config, pkgs, lib, ... }:
{ {
config,
pkgs,
lib,
...
}: {
home.packages = with pkgs; [ home.packages = with pkgs; [
fish-rust fish-rust
starship starship
@ -10,5 +13,4 @@
fd fd
ripgrep ripgrep
]; ];
} }

View file

@ -1,7 +1,11 @@
{ config, pkgs, lib, ... }:
{ {
config,
pkgs,
lib,
...
}: {
home.packages = with pkgs; [ home.packages = with pkgs; [
ghostty ghostty
fastfetch
]; ];
} }

View file

@ -1,6 +1,9 @@
{ config, pkgs, lib, ... }:
{ {
config,
pkgs,
lib,
...
}: {
home.packages = with pkgs; [ home.packages = with pkgs; [
lazygit lazygit
]; ];

View file

@ -2,7 +2,7 @@
{ {
home.packages = with pkgs; [ home.packages = with pkgs; [
neovim neovim
ripgrep gnugrep
fd fd
fzf fzf
nodejs nodejs
@ -18,7 +18,7 @@
]; ];
home.sessionVariables = { home.sessionVariables = {
LUA_PATH = "${pkgs.luajit}/share/lua/5.1/?.lua;;"; LUA_PATH = "${pkgs.luajit}/share/lua/5.1/?.lua;${pkgs.luajit}/share/lua/5.1/?/init.lua;;";
LUA_CPATH = "${pkgs.luajit}/lib/lua/5.1/?.so;;"; LUA_CPATH = "${pkgs.luajit}/lib/lua/5.1/?.so;;";
}; };
@ -26,15 +26,23 @@
"$HOME/.local/share/nvim/mason/bin" "$HOME/.local/share/nvim/mason/bin"
]; ];
xdg.configFile."nvim" = xdg.configFile."nvim" = let
if !builtins.pathExists "${config.home.homeDirectory}/.config/nvim" nvimConfigPath = "${config.home.homeDirectory}/.config/nvim";
then { # nvimDotfiles = builtins.fetchGit {
source = builtins.fetchGit { # url = "https://github.com/alsaiduq-lab/nvim-dotfiles.git";
url = "https://github.com/alsaiduq-lab/nvim-dotfiles.git"; # ref = "master";
ref = "master"; # rev = "71155b4a4b63d9974f1bc3b66303d6f7e5e06871";
rev = "71155b4a4b63d9974f1bc3b66303d6f7e5e06871"; # };
}; in {
source = pkgs.emptyDirectory;
recursive = true; recursive = true;
} enable = !builtins.pathExists nvimConfigPath;
else null; onChange = ''
echo "Neovim config at ${nvimConfigPath} was ${
if builtins.pathExists nvimConfigPath
then "skipped (already exists)"
else "installed"
}"
'';
};
} }

View file

@ -1,6 +1,9 @@
{ config, pkgs, lib, ... }:
{ {
config,
pkgs,
lib,
...
}: {
home.packages = with pkgs; [ home.packages = with pkgs; [
picom picom
]; ];

View file

@ -1,6 +1,9 @@
{ config, pkgs, lib, ... }:
{ {
config,
pkgs,
lib,
...
}: {
home.packages = with pkgs; [ home.packages = with pkgs; [
polybar polybar
]; ];

View file

@ -1,6 +1,9 @@
{ config, pkgs, lib, ... }:
{ {
config,
pkgs,
lib,
...
}: {
home.packages = with pkgs; [ home.packages = with pkgs; [
rofi rofi
]; ];

View file

@ -1,6 +1,9 @@
{ config, pkgs, lib, ... }:
{ {
config,
pkgs,
lib,
...
}: {
home.packages = with pkgs; [ home.packages = with pkgs; [
starship starship
]; ];

View file

@ -1,6 +1,9 @@
{ config, pkgs, lib, ... }:
{ {
config,
pkgs,
lib,
...
}: {
home.packages = with pkgs; [ home.packages = with pkgs; [
zellij zellij
]; ];

View file

@ -1,10 +1,13 @@
# Edit this configuration file to define what should be installed on # Edit this configuration file to define what should be installed on
# 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, ... }:
{ {
config,
pkgs,
lib,
inputs,
...
}: {
imports = [ imports = [
# Include the results of the hardware scan. # Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-configuration.nix

View file

@ -8,13 +8,9 @@
in { in {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# Applications # Applications
brave brave # TODO: make a module to save browser stuff
ghostty
vesktop vesktop
neovim
git git
fastfetch
# Development tools
nodejs nodejs
wget wget
curl curl
@ -34,7 +30,6 @@ in {
gawk gawk
obs-studio obs-studio
lazygit lazygit
# Java ecosystem
jdk17 jdk17
maven maven
gradle gradle
@ -85,7 +80,6 @@ in {
deno deno
redis redis
cloudflared cloudflared
# Rust ecosystem
rustup rustup
cargo-edit cargo-edit
cargo-watch cargo-watch
@ -96,19 +90,15 @@ in {
pkg-config pkg-config
libxml2 libxml2
zlib zlib
# Haskell ecosystem
ghc ghc
cabal-install cabal-install
stack stack
haskell-language-server haskell-language-server
# Database tools
postgresql postgresql
sqlite sqlite
# Version control tools
git-lfs git-lfs
gitAndTools.gh gitAndTools.gh
gitAndTools.diff-so-fancy gitAndTools.diff-so-fancy
# misc
ani-cli ani-cli
yt-dlp yt-dlp
nmap nmap

View file

@ -1,6 +1,9 @@
{ config, pkgs, lib, ... }:
{ {
config,
pkgs,
lib,
...
}: {
security.rtkit.enable = true; security.rtkit.enable = true;
services.pipewire = { services.pipewire = {
enable = true; enable = true;

View file

@ -1,6 +1,9 @@
{ config, pkgs, lib, ... }:
{ {
config,
pkgs,
lib,
...
}: {
hardware.bluetooth = { hardware.bluetooth = {
enable = true; enable = true;
powerOnBoot = true; powerOnBoot = true;

View file

@ -1,6 +1,9 @@
{ config, pkgs, lib, ... }:
{ {
config,
pkgs,
lib,
...
}: {
# Bootloader # Bootloader
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;

View file

@ -1,6 +1,9 @@
{ config, pkgs, lib, ... }:
{ {
config,
pkgs,
lib,
...
}: {
imports = [ imports = [
./audio.nix ./audio.nix
./bluetooth.nix ./bluetooth.nix
@ -16,7 +19,6 @@
./steam.nix ./steam.nix
./timezone.nix ./timezone.nix
./user.nix ./user.nix
./man.nix
]; ];
# Enable CUPS to print documents. # Enable CUPS to print documents.

View file

@ -1,6 +1,9 @@
{ config, pkgs, lib, ... }:
{ {
config,
pkgs,
lib,
...
}: {
virtualisation.docker = { virtualisation.docker = {
enable = true; enable = true;
enableOnBoot = true; enableOnBoot = true;

View file

@ -1,6 +1,9 @@
{ config, pkgs, lib, ... }:
{ {
config,
pkgs,
lib,
...
}: {
environment.shellInit = '' environment.shellInit = ''
if [ -d $HOME/.cargo/bin ]; then if [ -d $HOME/.cargo/bin ]; then
export PATH=$PATH:$HOME/.cargo/bin export PATH=$PATH:$HOME/.cargo/bin

View file

@ -1,6 +1,9 @@
{ config, pkgs, lib, ... }: {
config,
let pkgs,
lib,
...
}: let
clear-sans = pkgs.stdenv.mkDerivation { clear-sans = pkgs.stdenv.mkDerivation {
name = "clear-sans"; name = "clear-sans";
src = pkgs.fetchurl { src = pkgs.fetchurl {
@ -13,9 +16,7 @@ let
cp $src $out/share/fonts/truetype/ClearSans-Regular.ttf cp $src $out/share/fonts/truetype/ClearSans-Regular.ttf
''; '';
}; };
in in {
{
fonts = { fonts = {
packages = with pkgs; [ packages = with pkgs; [
noto-fonts noto-fonts

View file

@ -1,5 +1,10 @@
{ config, pkgs, lib, inputs, ... }:
{ {
config,
pkgs,
lib,
inputs,
...
}: {
imports = [ imports = [
inputs.home-manager.nixosModules.home-manager inputs.home-manager.nixosModules.home-manager
]; ];

View file

@ -1,9 +1,11 @@
{ config, pkgs, lib, ... }:
let
customPkgs = import ../pkgs { inherit pkgs lib; };
in
{ {
config,
pkgs,
lib,
...
}: let
customPkgs = import ../pkgs {inherit pkgs lib;};
in {
services.xserver.enable = true; services.xserver.enable = true;
services.xserver.xkb = { services.xserver.xkb = {
layout = "us"; layout = "us";
@ -118,7 +120,8 @@ in
GTK2_RC_FILES = "$HOME/.gtkrc-2.0"; GTK2_RC_FILES = "$HOME/.gtkrc-2.0";
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs;
[
arandr arandr
nitrogen nitrogen
xclip xclip
@ -132,7 +135,8 @@ in
papirus-icon-theme papirus-icon-theme
numix-icon-theme-circle numix-icon-theme-circle
candy-icons candy-icons
] ++ (with customPkgs; [ ]
++ (with customPkgs; [
tokyo-night-gtk tokyo-night-gtk
vivid-icons vivid-icons
]); ]);

View file

@ -1,42 +0,0 @@
{ config, pkgs, lib, ... }:
{
documentation = {
enable = true;
dev.enable = true;
doc.enable = true;
info.enable = true;
man = {
enable = true;
generateCaches = true;
};
nixos.enable = true;
};
environment.pathsToLink = [ "/share/man" "/share/doc" ];
environment.systemPackages = with pkgs; [
man-pages
man-pages-posix
stdmanpages
docutils
python311Packages.docutils
python311Packages.docstr-coverage
python310Packages.docutils
python310Packages.docstr-coverage
texlivePackages.documentation
docbook5
docbook-xsl-ns
docbook-xsl-nons
doctoc
doctave
documentation-highlighter
];
environment.variables = {
MANPATH = [
"${config.system.path}/share/man"
"${pkgs.man-pages}/share/man"
"${pkgs.man-pages-posix}/share/man"
];
};
}

View file

@ -1,6 +1,9 @@
{ config, pkgs, lib, ... }:
{ {
config,
pkgs,
lib,
...
}: {
networking.wireless.enable = false; # Enables wireless support via wpa_supplicant. networking.wireless.enable = false; # Enables wireless support via wpa_supplicant.
networking.hostName = "nixos"; networking.hostName = "nixos";
# Configure network proxy if necessary # Configure network proxy if necessary

View file

@ -1,6 +1,9 @@
{ config, pkgs, lib, ... }:
{ {
config,
pkgs,
lib,
...
}: {
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
programs.nix-index.enable = true; programs.nix-index.enable = true;
programs.command-not-found.enable = false; programs.command-not-found.enable = false;

View file

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

View file

@ -1,6 +1,11 @@
{ config, pkgs, lib, inputs, system, ... }:
{ {
config,
pkgs,
lib,
inputs,
system,
...
}: {
programs.steam = { programs.steam = {
enable = true; enable = true;
remotePlay.openFirewall = true; remotePlay.openFirewall = true;

View file

@ -1,6 +1,9 @@
{ config, pkgs, lib, ... }:
{ {
config,
pkgs,
lib,
...
}: {
time.timeZone = "America/Edmonton"; time.timeZone = "America/Edmonton";
i18n.defaultLocale = "en_CA.UTF-8"; i18n.defaultLocale = "en_CA.UTF-8";
} }

View file

@ -1,10 +1,11 @@
{ config, pkgs, lib, ... }:
let
fish-rust = pkgs.callPackage ../pkgs/fish-rust { };
in
{ {
config,
pkgs,
lib,
...
}: let
fish-rust = pkgs.callPackage ../pkgs/fish-rust {};
in {
# Define a user account. Don't forget to set a password with 'passwd'. # Define a user account. Don't forget to set a password with 'passwd'.
users.users.cobray = { users.users.cobray = {
isNormalUser = true; isNormalUser = true;

View file

@ -1,11 +1,12 @@
{ pkgs ? import <nixpkgs> {}, lib ? pkgs.lib }: {
let pkgs ? import <nixpkgs> {},
lib ? pkgs.lib,
}: let
python-pymatting = pkgs.callPackage ./python-pymatting { python-pymatting = pkgs.callPackage ./python-pymatting {
inherit (pkgs) lib fetchPypi; inherit (pkgs) lib fetchPypi;
python310Packages = pkgs.python310.pkgs; python310Packages = pkgs.python310.pkgs;
}; };
in in {
{
fish-rust = pkgs.callPackage ./fish-rust {}; fish-rust = pkgs.callPackage ./fish-rust {};
python-pymatting = python-pymatting; python-pymatting = python-pymatting;
python-rembg = pkgs.callPackage ./python-rembg { python-rembg = pkgs.callPackage ./python-rembg {

View file

@ -1,5 +1,11 @@
{ lib, rustPlatform, fetchgit, ncurses, python3Packages, gettext }: {
lib,
rustPlatform,
fetchgit,
ncurses,
python3Packages,
gettext,
}:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "fish"; pname = "fish";
version = "4.1-2025-03-16-rust"; version = "4.1-2025-03-16-rust";

View file

@ -7,7 +7,7 @@ python310Packages.buildPythonPackage rec {
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "sha256-LNt8S++s3e9Netwt6ONKJy3mOdYIrlwKCGE9+kJTgQE="; # Updated hash sha256 = "sha256-LNt8S++s3e9Netwt6ONKJy3mOdYIrlwKCGE9+kJTgQE=";
}; };
propagatedBuildInputs = with python310Packages; [ propagatedBuildInputs = with python310Packages; [

View file

@ -1,5 +1,9 @@
{ lib, python310Packages, fetchPypi, python-pymatting }: {
lib,
python310Packages,
fetchPypi,
python-pymatting,
}:
python310Packages.buildPythonPackage rec { python310Packages.buildPythonPackage rec {
pname = "rembg"; pname = "rembg";
version = "2.0.50"; version = "2.0.50";

View file

@ -1,5 +1,12 @@
{ lib, stdenv, fetchFromGitHub, gtk-engine-murrine, gtk_engines, bash, sassc }: {
lib,
stdenv,
fetchFromGitHub,
gtk-engine-murrine,
gtk_engines,
bash,
sassc,
}:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "tokyo-night-gtk"; pname = "tokyo-night-gtk";
version = "2025-03-16"; version = "2025-03-16";

View file

@ -1,4 +1,9 @@
{ lib, stdenv, fetchFromGitHub, hicolor-icon-theme }: {
lib,
stdenv,
fetchFromGitHub,
hicolor-icon-theme,
}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "vivid-icons"; pname = "vivid-icons";
version = "2025-03-16"; version = "2025-03-16";