eRgo35/nix-config
1
0
Fork 0
mirror of https://github.com/eRgo35/nix-config.git synced 2026-02-04 12:46:11 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

alejandra format

Browse Source
This commit is contained in:
Michał Czyż
2024-04-24 11:35:08 +02:00
parent 5109d8a821
commit 12f5a36ca1
7 changed files with 49 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
home-manager/features/desktop/dwm/default.nix
View File

@@ -87,7 +87,7 @@
# text = '' # text = ''
# Xcursor.theme: "Bibata-Modern-Classic" # Xcursor.theme: "Bibata-Modern-Classic"
# Xcursor.size: 18 # Xcursor.size: 18
# ''; # '';
# }; # };
}; };
} }

10
home-manager/features/tmux.nix
View File

@@ -16,18 +16,18 @@
# history limit # history limit
set -g history-limit 5000 set -g history-limit 5000
# increase repeat time # increase repeat time
set -g repeat-time 1000 set -g repeat-time 1000
# decrese command delay # decrese command delay
set -sg escape-time 1 set -sg escape-time 1
# faster key repetition # faster key repetition
set -s escape-time 0 set -s escape-time 0
setw -g aggressive-resize on setw -g aggressive-resize on
# reload tmux while using tmux # reload tmux while using tmux
bind r source-file ~/.config/tmux/tmux.conf \; display "Reloaded!" bind r source-file ~/.config/tmux/tmux.conf \; display "Reloaded!"
# Shift Alt vim keys to switch windows # Shift Alt vim keys to switch windows

4
hosts/thor/bluetooth.nix
View File

@@ -17,6 +17,6 @@
}; };
services.blueman.enable = true; services.blueman.enable = true;
environment.systemPackages = with pkgs; [ bluez ]; environment.systemPackages = with pkgs; [bluez];
} }

2
overlays/default.nix
View File

@@ -1,7 +1,7 @@
# This file defines overlays # This file defines overlays
{inputs, ...}: { {inputs, ...}: {
# This one brings our custom packages from the 'pkgs' directory # This one brings our custom packages from the 'pkgs' directory
additions = final: _prev: additions = final: _prev:
import ../pkgs {pkgs = final;}; import ../pkgs {pkgs = final;};
# This one contains whatever you want to overlay # This one contains whatever you want to overlay

3
pkgs/default.nix
View File

@@ -1,7 +1,6 @@
# Custom packages, that can be defined similarly to ones from nixpkgs # Custom packages, that can be defined similarly to ones from nixpkgs
# You can build them using 'nix build .#example' # You can build them using 'nix build .#example'
{ {pkgs ? import <nixpkgs> {}}: rec {
pkgs ? import <nixpkgs> {}}: rec {
# example = pkgs.callPackage ./example { }; # example = pkgs.callPackage ./example { };
dwm-customized = pkgs.callPackage ./dwm-customized {}; dwm-customized = pkgs.callPackage ./dwm-customized {};
lmstudio = pkgs.callPackage ./lmstudio {}; lmstudio = pkgs.callPackage ./lmstudio {};

24
pkgs/dwm-customized/default.nix
View File

@@ -1,10 +1,10 @@
{ {
stdenv, stdenv,
pkgs, pkgs,
libX11, libX11,
libXinerama, libXinerama,
libXft, libXft,
... ...
}: }:
stdenv.mkDerivation { stdenv.mkDerivation {
pname = "dwm-customized"; pname = "dwm-customized";
@@ -12,16 +12,16 @@ stdenv.mkDerivation {
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "eRgo35"; owner = "eRgo35";
repo = "dwm"; repo = "dwm";
rev = "d4fed3cac603ea386d57b8c96f6bc49b3c2eec64"; rev = "d4fed3cac603ea386d57b8c96f6bc49b3c2eec64";
sha256 = "sha256-pQMoxKbvWJLznpzcl91yPuB4ugxXW1PnslDM/877ZqA="; sha256 = "sha256-pQMoxKbvWJLznpzcl91yPuB4ugxXW1PnslDM/877ZqA=";
}; };
# unpackPhase = ''tar -xf $src''; # unpackPhase = ''tar -xf $src'';
buildInputs = [ libX11 libXinerama libXft ];
buildPhase = ''make''; buildInputs = [libX11 libXinerama libXft];
buildPhase = ''make'';
installPhase = ''make PREFIX=$out DESTDIR="" install''; installPhase = ''make PREFIX=$out DESTDIR="" install'';
} }

55
pkgs/lmstudio/default.nix
View File

@@ -1,9 +1,8 @@
{ lib {
, appimageTools lib,
, fetchurl appimageTools,
}: fetchurl,
}: let
let
pname = "lmstudio"; pname = "lmstudio";
version = "0.2.18"; version = "0.2.18";
src = fetchurl { src = fetchurl {
@@ -11,29 +10,29 @@ let
hash = "sha256-cUa0fjV7xx6+2tnGVP7uLG0QQb44LhP2nYsn6Qn0al4="; hash = "sha256-cUa0fjV7xx6+2tnGVP7uLG0QQb44LhP2nYsn6Qn0al4=";
}; };
appimageContents = appimageTools.extractType2 { inherit pname version src; }; appimageContents = appimageTools.extractType2 {inherit pname version src;};
in in
appimageTools.wrapType2 { appimageTools.wrapType2 {
inherit pname version src; inherit pname version src;
extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.ocl-icd ]; extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [pkgs.ocl-icd];
extraInstallCommands = '' extraInstallCommands = ''
mkdir -p $out/share/applications mkdir -p $out/share/applications
mv $out/bin/lmstudio-${version} $out/bin/lmstudio mv $out/bin/lmstudio-${version} $out/bin/lmstudio
cp -r ${appimageContents}/usr/share/icons $out/share cp -r ${appimageContents}/usr/share/icons $out/share
install -m 444 -D ${appimageContents}/lm-studio.desktop -t $out/share/applications install -m 444 -D ${appimageContents}/lm-studio.desktop -t $out/share/applications
substituteInPlace $out/share/applications/lm-studio.desktop \ substituteInPlace $out/share/applications/lm-studio.desktop \
--replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=lmstudio' --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=lmstudio'
''; '';
meta = { meta = {
description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)"; description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)";
homepage = "https://lmstudio.ai/"; homepage = "https://lmstudio.ai/";
license = lib.licenses.unfree; license = lib.licenses.unfree;
mainProgram = "lmstudio"; mainProgram = "lmstudio";
maintainers = with lib.maintainers; [ drupol ]; maintainers = with lib.maintainers; [drupol];
platforms = lib.platforms.linux; platforms = lib.platforms.linux;
sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; sourceProvenance = with lib.sourceTypes; [binaryNativeCode];
}; };
} }