diff --git a/home-manager/features/desktop/dwm/default.nix b/home-manager/features/desktop/dwm/default.nix index 1cb8517..9e7e26a 100644 --- a/home-manager/features/desktop/dwm/default.nix +++ b/home-manager/features/desktop/dwm/default.nix @@ -87,7 +87,7 @@ # text = '' # Xcursor.theme: "Bibata-Modern-Classic" # Xcursor.size: 18 - # ''; + # ''; # }; }; } diff --git a/home-manager/features/tmux.nix b/home-manager/features/tmux.nix index 3acf961..a3ece19 100644 --- a/home-manager/features/tmux.nix +++ b/home-manager/features/tmux.nix @@ -16,18 +16,18 @@ # history limit set -g history-limit 5000 - # increase repeat time + # increase repeat time set -g repeat-time 1000 # decrese command delay - set -sg escape-time 1 + set -sg escape-time 1 # 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!" # Shift Alt vim keys to switch windows diff --git a/hosts/thor/bluetooth.nix b/hosts/thor/bluetooth.nix index d409ab6..ad03e6b 100644 --- a/hosts/thor/bluetooth.nix +++ b/hosts/thor/bluetooth.nix @@ -17,6 +17,6 @@ }; services.blueman.enable = true; - - environment.systemPackages = with pkgs; [ bluez ]; + + environment.systemPackages = with pkgs; [bluez]; } diff --git a/overlays/default.nix b/overlays/default.nix index e2ec906..f327936 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,7 +1,7 @@ # This file defines overlays {inputs, ...}: { # This one brings our custom packages from the 'pkgs' directory - additions = final: _prev: + additions = final: _prev: import ../pkgs {pkgs = final;}; # This one contains whatever you want to overlay diff --git a/pkgs/default.nix b/pkgs/default.nix index f4f9d53..2b435f3 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,7 +1,6 @@ # Custom packages, that can be defined similarly to ones from nixpkgs # You can build them using 'nix build .#example' -{ - pkgs ? import {}}: rec { +{pkgs ? import {}}: rec { # example = pkgs.callPackage ./example { }; dwm-customized = pkgs.callPackage ./dwm-customized {}; lmstudio = pkgs.callPackage ./lmstudio {}; diff --git a/pkgs/dwm-customized/default.nix b/pkgs/dwm-customized/default.nix index baf1bff..2e1b7d4 100644 --- a/pkgs/dwm-customized/default.nix +++ b/pkgs/dwm-customized/default.nix @@ -1,10 +1,10 @@ -{ - stdenv, - pkgs, - libX11, - libXinerama, - libXft, - ... +{ + stdenv, + pkgs, + libX11, + libXinerama, + libXft, + ... }: stdenv.mkDerivation { pname = "dwm-customized"; @@ -12,16 +12,16 @@ stdenv.mkDerivation { src = pkgs.fetchFromGitHub { owner = "eRgo35"; - repo = "dwm"; - rev = "d4fed3cac603ea386d57b8c96f6bc49b3c2eec64"; + repo = "dwm"; + rev = "d4fed3cac603ea386d57b8c96f6bc49b3c2eec64"; sha256 = "sha256-pQMoxKbvWJLznpzcl91yPuB4ugxXW1PnslDM/877ZqA="; }; # unpackPhase = ''tar -xf $src''; - - buildInputs = [ libX11 libXinerama libXft ]; - buildPhase = ''make''; + buildInputs = [libX11 libXinerama libXft]; + + buildPhase = ''make''; installPhase = ''make PREFIX=$out DESTDIR="" install''; } diff --git a/pkgs/lmstudio/default.nix b/pkgs/lmstudio/default.nix index f1edf4d..83e9b59 100644 --- a/pkgs/lmstudio/default.nix +++ b/pkgs/lmstudio/default.nix @@ -1,9 +1,8 @@ -{ lib -, appimageTools -, fetchurl -}: - -let +{ + lib, + appimageTools, + fetchurl, +}: let pname = "lmstudio"; version = "0.2.18"; src = fetchurl { @@ -11,29 +10,29 @@ let hash = "sha256-cUa0fjV7xx6+2tnGVP7uLG0QQb44LhP2nYsn6Qn0al4="; }; - appimageContents = appimageTools.extractType2 { inherit pname version src; }; + appimageContents = appimageTools.extractType2 {inherit pname version src;}; in -appimageTools.wrapType2 { - inherit pname version src; + appimageTools.wrapType2 { + inherit pname version src; - extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.ocl-icd ]; + extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [pkgs.ocl-icd]; - extraInstallCommands = '' - mkdir -p $out/share/applications - mv $out/bin/lmstudio-${version} $out/bin/lmstudio - cp -r ${appimageContents}/usr/share/icons $out/share - install -m 444 -D ${appimageContents}/lm-studio.desktop -t $out/share/applications - substituteInPlace $out/share/applications/lm-studio.desktop \ - --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=lmstudio' - ''; + extraInstallCommands = '' + mkdir -p $out/share/applications + mv $out/bin/lmstudio-${version} $out/bin/lmstudio + cp -r ${appimageContents}/usr/share/icons $out/share + install -m 444 -D ${appimageContents}/lm-studio.desktop -t $out/share/applications + substituteInPlace $out/share/applications/lm-studio.desktop \ + --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=lmstudio' + ''; - meta = { - 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/"; - license = lib.licenses.unfree; - mainProgram = "lmstudio"; - maintainers = with lib.maintainers; [ drupol ]; - platforms = lib.platforms.linux; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - }; -} + meta = { + 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/"; + license = lib.licenses.unfree; + mainProgram = "lmstudio"; + maintainers = with lib.maintainers; [drupol]; + platforms = lib.platforms.linux; + sourceProvenance = with lib.sourceTypes; [binaryNativeCode]; + }; + }