commit 28459ea44ce5eece05042f6ad9bf8a0137fc6781 · wiro.world/dotfiles

+4 -1

home-manager/modules/git.nix

···

       136
       136
        
             };

     

       137
       137
        
           };

     

       138
       138
        
       

     

       139
       139
       -
           home.packages = with pkgs; [ git-leave git-along radicle-node ];

     

       139
       139
       +
           home.packages = with pkgs; [

     

       140
       140
       +
             lpkgs.git-leave

     

       141
       141
       +
             radicle-node

     

       142
       142
       +
           ];

     

       140
       143
        
       

     

       141
       144
        
           programs.gh.enable = true;

     

       142
       145

+3 -2

home-manager/modules/helix.nix

···

       1
       1
        
       { self

     

       2
       2
        
       , config

     

       3
       3
        
       , pkgs

     

       4
       4
       +
       , lpkgs

     

       4
       5
        
       , upkgs

     

       5
       6
        
       , lib

     

       6
       7
        
       , ...

     
···

       18
       19
        
         config = {

     

       19
       20
        
           programs.helix = {

     

       20
       21
        
             enable = true;

     

       21
       21
       -
             package = pkgs.helix;

     

       22
       22
       +
             package = lpkgs.helix;

     

       22
       23
        
             defaultEditor = true;

     

       23
       24
        
       

     

       24
       25
        
             settings = {

     
···

       85
       86
        
               vscode-langservers-extracted

     

       86
       87
        
               upkgs.vue-language-server

     

       87
       88
        
               yaml-language-server

     

       88
       88
       -
               wakatime-lsp

     

       89
       89
       +
               lpkgs.wakatime-lsp

     

       89
       90
        
             ];

     

       90
       91
        
       

     

       91
       92
        
             languages = {

+2 -1

home-manager/modules/shell.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , pkgs

     

       3
       3
       +
       , lpkgs

     

       3
       4
        
       , isDarwin

     

       4
       5
        
       , ...

     

       5
       6
        
       }:

     
···

       117
       118
        
       

     

       118
       119
        
               # Quickly get outta here to test something

     

       119
       120
        
               cdtmp = ''

     

       120
       120
       -
                 set -l name $argv[1] (${getExe pkgs.names})

     

       121
       121
       +
                 set -l name $argv[1] (${getExe lpkgs.names})

     

       121
       122
        
                 set -l dir /tmp/$name[1]

     

       122
       123
        
       

     

       123
       124
        
                 mkdir $dir

+6 -3

home-manager/modules/tools.nix

···

       1
       1
       -
       { pkgs, ... }:

     

       1
       1
       +
       { pkgs

     

       2
       2
       +
       , lpkgs

     

       3
       3
       +
       , ...

     

       4
       4
       +
       }:

     

       2
       5
        
       

     

       3
       6
        
       {

     

       4
       7
        
         config = {

     
···

       7
       10
        
             btop

     

       8
       11
        
             glow

     

       9
       12
        
             gping

     

       10
       10
       -
             otree

     

       13
       13
       +
             lpkgs.otree

     

       11
       14
        
             thokr

     

       12
       15
        
       

     

       13
       16
        
             # CLIs

     
···

       31
       34
        
             speedtest-go

     

       32
       35
        
             upkgs.srgn

     

       33
       36
        
             sshfs

     

       34
       34
       -
             sweep

     

       37
       37
       +
             lpkgs.sweep

     

       35
       38
        
             tealdeer

     

       36
       39
        
             termimage

     

       37
       40
        
             tokei

+1 -2

home-manager/profiles/desktop.nix

···

       3
       3
        
       , llib

     

       4
       4
        
       , config

     

       5
       5
        
       , pkgs

     

       6
       6
       -
       , upkgs

     

       7
       6
        
       , isDarwin

     

       8
       7
        
         # Provides the NixOS configuration if HM was loaded through the NixOS module

     

       9
       8
        
       , osConfig ? null

     
···

       124
       123
        
               hunspellDicts.en_GB-large

     

       125
       124
        
       

     

       126
       125
        
               # TUIs

     

       127
       127
       -
               asak

     

       126
       126
       +
               lpkgs.asak

     

       128
       127
        
       

     

       129
       128
        
               # CLIs

     

       130
       129
        
               wf-recorder

+2 -1

lib/flake/default.nix

···

       7
       7
        
       

     

       8
       8
        
       let

     

       9
       9
        
         inherit (self.inputs) nixpkgs-unstable nix-darwin;

     

       10
       10
       -
         inherit (self.flake-lib) specialModuleArgs;

     

       11
       10
        
       

     

       12
       11
        
         inherit (nix-darwin.lib) darwinSystem;

     

       13
       12
        
       in

     
···

       16
       15
        
       

     

       17
       16
        
         # - `self`: flake

     

       18
       17
        
         # - `llib`: local flake library

     

       18
       18
       +
         # - `lpkgs`: local packages set

     

       19
       19
        
         # - `upkgs`: unstable nixpkgs set

     

       20
       20
        
         # - `isDarwin`: indicates if system is darwin

     

       21
       21
        
         specialModuleArgs = pkgs: {

     

       22
       22
        
           inherit self;

     

       23
       23
        
           llib = import ../. pkgs;

     

       24
       24
       +
           lpkgs = import ../../pkgs pkgs;

     

       24
       25
        
           upkgs = import nixpkgs-unstable { inherit (pkgs) system config; };

     

       25
       26
        
           isDarwin = pkgs.stdenv.isDarwin;

     

       26
       27
        
         };

+5 -1

modules/nixos/geoclue2.nix

···

       11
       11
        
       #

     

       12
       12
        
       # I spent way too much time getting this to work with a submodule.

     

       13
       13
        
       

     

       14
       14
       -
       { config, lib, pkgs, ... }:

     

       14
       14
       +
       { config

     

       15
       15
       +
       , lib

     

       16
       16
       +
       , pkgs

     

       17
       17
       +
       , ...

     

       18
       18
       +
       }:

     

       15
       19
        
       

     

       16
       20
        
       with lib;

     

       17
       21

+1 -2

nixos/profiles/laptop.nix

···

       128
       128
        
         programs.fish.enable = true;

     

       129
       129
        
       

     

       130
       130
        
         services.udev.packages = with pkgs; [

     

       131
       131
       -
           arduino-udev-rules

     

       132
       131
        
           numworks-udev-rules

     

       133
       133
       -
           probe-rs-udev-rules

     

       132
       132
       +
           lpkgs.probe-rs-udev-rules

     

       134
       133
        
         ];

     

       135
       134
        
       

     

       136
       135
        
         users.groups.plugdev.name = "plugdev";

+1 -4

overlays/default.nix

···

       8
       8
        
       in

     

       9
       9
        
       rec {

     

       10
       10
        
         # Bundles all overlays, order matters here

     

       11
       11
       -
         all = composeManyExtensions [ bringSpecialArgs additions patches ];

     

       11
       11
       +
         all = composeManyExtensions [ bringSpecialArgs patches ];

     

       12
       12
        
       

     

       13
       13
        
         # Bring `self`, `llib` and `upkgs`

     

       14
       14
        
         bringSpecialArgs = final: prev: self.flake-lib.specialModuleArgs final;

     

       15
       15
       -
       

     

       16
       16
       -
         # Bring our custom packages from the `pkgs` directory

     

       17
       17
       -
         additions = final: prev: import ../pkgs prev;

     

       18
       15
        
       

     

       19
       16
        
         # Custom derivation patches that temporarily fix a package

     

       20
       17
        
         patches = import ./patches.nix;

-28

pkgs/arduino-udev-rules.nix

···

       1
       1
       -
       { lib

     

       2
       2
       -
       , stdenv

     

       3
       3
       -
       , writeText

     

       4
       4
       -
       }:

     

       5
       5
       -
       

     

       6
       6
       -
       stdenv.mkDerivation rec {

     

       7
       7
       -
         pname = "arduino-udev-rules";

     

       8
       8
       -
         version = "0.0.0";

     

       9
       9
       -
       

     

       10
       10
       -
         src = writeText pname ''

     

       11
       11
       -
           # Arduino Nano

     

       12
       12
       -
           ATTRS{idVendor}=="2341", ATTRS{idProduct}=="8037", MODE="0666", TAG+="uaccess"

     

       13
       13
       -
         '';

     

       14
       14
       -
       

     

       15
       15
       -
         dontUnpack = true;

     

       16
       16
       -
       

     

       17
       17
       -
         installPhase = ''

     

       18
       18
       -
           install -Dm 644 "${src}" "$out/lib/udev/rules.d/70-arduino.rules"

     

       19
       19
       -
         '';

     

       20
       20
       -
       

     

       21
       21
       -
         meta = with lib; {

     

       22
       22
       -
           description = "UDev rules for Arduino boards";

     

       23
       23
       -
           homepage = "https://www.arduino.cc/";

     

       24
       24
       -
           maintainers = [ "mrnossiom" ];

     

       25
       25
       -
           platforms = platforms.linux;

     

       26
       26
       -
         };

     

       27
       27
       -
       }

     

       28
       28
       -

-2

pkgs/default.nix

···

       4
       4
        
         inherit (self.inputs) agenix git-leave helix radicle wakatime-lsp;

     

       5
       5
        
       in

     

       6
       6
        
       {

     

       7
       7
       -
         arduino-udev-rules = pkgs.callPackage ./arduino-udev-rules.nix { };

     

       8
       7
        
         asak = pkgs.callPackage ./asak.nix { };

     

       9
       8
        
         find-unicode = pkgs.callPackage ./find-unicode.nix { };

     

       10
       10
       -
         git-along = pkgs.callPackage ./git-along.nix { };

     

       11
       9
        
         # lazyjj = pkgs.callPackage ./lazyjj.nix { };

     

       12
       10
        
         names = pkgs.callPackage ./names.nix { };

     

       13
       11
        
         otree = pkgs.callPackage ./otree.nix { };

-27

pkgs/git-along.nix

···

       1
       1
       -
       { lib

     

       2
       2
       -
       

     

       3
       3
       -
       , fetchFromGitHub

     

       4
       4
       -
       , buildGoModule

     

       5
       5
       -
       }:

     

       6
       6
       -
       

     

       7
       7
       -
       buildGoModule rec {

     

       8
       8
       -
         pname = "git-along";

     

       9
       9
       -
         version = "0.0.0";

     

       10
       10
       -
       

     

       11
       11
       -
         src = fetchFromGitHub {

     

       12
       12
       -
           # owner = "nyarly";

     

       13
       13
       -
           owner = "mrnossiom";

     

       14
       14
       -
           repo = pname;

     

       15
       15
       -
           rev = "v${version}";

     

       16
       16
       -
           sha256 = "sha256-2pjaA0llShG8dxILWCvP45VgLFWhFbinAiNiOLM7ovg=";

     

       17
       17
       -
         };

     

       18
       18
       -
       

     

       19
       19
       -
         vendorHash = null;

     

       20
       20
       -
       

     

       21
       21
       -
         meta = with lib; {

     

       22
       22
       -
           description = "Manage project configuration and environment in side branches";

     

       23
       23
       -
           homepage = "https://github.com/nyarly/git-along";

     

       24
       24
       -
           maintainers = [ "mrnossiom" ];

     

       25
       25
       -
           mainProgram = "git-along";

     

       26
       26
       -
         };

     

       27
       27
       -
       }