commit b93231df7b885f93418a6f41e8e30eaaaf398d81 · dunkirk.sh/dots

+1 -1

flake.nix

···

       125
       125
        
               nixpkgs.overlays = [

     

       126
       126
        
                 (final: prev: {

     

       127
       127
        
                   unstable = import nixpkgs-unstable {

     

       128
       128
       -
                     system = final.system;

     

       128
       128
       +
                     system = final.stdenv.hostPlatform.system;

     

       129
       129
        
                     config.allowUnfree = true;

     

       130
       130
        
                   };

     

       131
       131

+2 -2

machines/atalanta/default.nix

···

       56
       56
        
           pkgs.gcc

     

       57
       57
        
           pkgs.rustc

     

       58
       58
        
           pkgs.cargo

     

       59
       59
       -
           pkgs.jdk23

     

       59
       59
       +
           pkgs.jdk

     

       60
       60
        
           pkgs.ruby

     

       61
       61
        
           pkgs.cmake

     

       62
       62
        
           pkgs.unstable.biome

     
···

       72
       72
        
           pkgs.nh

     

       73
       73
        
           pkgs.rustscan

     

       74
       74
        
           pkgs.vhs

     

       75
       75
       -
           inputs.soapdump.packages.${pkgs.system}.default

     

       75
       75
       +
           inputs.soapdump.packages.${pkgs.stdenv.hostPlatform.system}.default

     

       76
       76
        
         ];

     

       77
       77
        
       

     

       78
       78
        
         programs.direnv.enable = true;

+1 -1

machines/atalanta/home/default.nix

···

       14
       14
        
           username = "kierank";

     

       15
       15
        
           homeDirectory = "/Users/kierank";

     

       16
       16
        
           packages = with pkgs; [

     

       17
       17
       -
             inputs.nixvim.packages.${system}.default

     

       17
       17
       +
             inputs.nixvim.packages.${pkgs.stdenv.hostPlatform.system}.default

     

       18
       18
        
             vesktop

     

       19
       19
        
           ];

     

       20
       20
        
         };

+9 -9

machines/moonlark/default.nix

···

       120
       120
        
           pkgs.mako

     

       121
       121
        
           pkgs.unstable.hyprpicker

     

       122
       122
        
           pkgs.wl-screenrec

     

       123
       123
       -
           inputs.hyprland-contrib.packages.${pkgs.system}.grimblast

     

       123
       123
       +
           inputs.hyprland-contrib.packages.${pkgs.stdenv.hostPlatform.system}.grimblast

     

       124
       124
        
           pkgs.playerctl

     

       125
       125
        
           pkgs.libnotify

     

       126
       126
        
           pkgs.notify-desktop

     
···

       148
       148
        
           pkgs.gcc

     

       149
       149
        
           pkgs.rustc

     

       150
       150
        
           pkgs.cargo

     

       151
       151
       -
           pkgs.jdk23

     

       151
       151
       +
           pkgs.jdk

     

       152
       152
        
           pkgs.ruby

     

       153
       153
        
           pkgs.cmake

     

       154
       154
        
           pkgs.unstable.biome

     
···

       187
       187
        
           pkgs.gobang

     

       188
       188
        
           pkgs.love

     

       189
       189
        
           #frc

     

       190
       190
       -
           inputs.frc-nix.packages.${pkgs.system}.elastic-dashboard

     

       191
       191
       -
           inputs.frc-nix.packages.${pkgs.system}.pathplanner

     

       192
       192
       -
           inputs.frc-nix.packages.${pkgs.system}.roborioteamnumbersetter

     

       193
       193
       -
           inputs.frc-nix.packages.${pkgs.system}.sysid

     

       194
       194
       -
           inputs.frc-nix.packages.${pkgs.system}.wpilib-utility

     

       195
       195
       -
           inputs.frc-nix.packages.${pkgs.system}.advantagescope

     

       190
       190
       +
           inputs.frc-nix.packages.${pkgs.stdenv.hostPlatform.system}.elastic-dashboard

     

       191
       191
       +
           inputs.frc-nix.packages.${pkgs.stdenv.hostPlatform.system}.pathplanner

     

       192
       192
       +
           inputs.frc-nix.packages.${pkgs.stdenv.hostPlatform.system}.roborioteamnumbersetter

     

       193
       193
       +
           inputs.frc-nix.packages.${pkgs.stdenv.hostPlatform.system}.sysid

     

       194
       194
       +
           inputs.frc-nix.packages.${pkgs.stdenv.hostPlatform.system}.wpilib-utility

     

       195
       195
       +
           inputs.frc-nix.packages.${pkgs.stdenv.hostPlatform.system}.advantagescope

     

       196
       196
        
           # misc

     

       197
       197
        
           pkgs.invoice

     

       198
       198
        
           pkgs.pop

     
···

       206
       206
        
           pkgs.unstable.kicad-testing

     

       207
       207
        
           pkgs.zenity

     

       208
       208
        
           pkgs.atproto-goat

     

       209
       209
       -
           inputs.cedarlogic.packages.${pkgs.system}.cedarlogic

     

       209
       209
       +
           inputs.cedarlogic.packages.${pkgs.stdenv.hostPlatform.system}.cedarlogic

     

       210
       210
        
           pkgs.unstable.betaflight-configurator

     

       211
       211
        
         ];

     

       212
       212

+1 -1

machines/prattle/default.nix

···

       173
       173
        
           enable = true;

     

       174
       174
        
           package = pkgs.caddy.withPlugins {

     

       175
       175
        
             plugins = [ "github.com/caddy-dns/cloudflare@v0.2.2" ];

     

       176
       176
       -
             hash = "sha256-Z8nPh4OI3/R1nn667ZC5VgE+Q9vDenaQ3QPKxmqPNkc=";

     

       176
       176
       +
             hash = "sha256-ea8PC/+SlPRdEVVF/I3c1CBprlVp1nrumKM5cMwJJ3U=";

     

       177
       177
        
           };

     

       178
       178
        
           email = "me@dunkirk.sh";

     

       179
       179
        
           globalConfig = ''

+2 -3

machines/tacyon/default.nix

···

       1
       1
        
       {

     

       2
       2
        
         pkgs,

     

       3
       3
        
         inputs,

     

       4
       4
       -
         system,

     

       5
       4
        
         ...

     

       6
       5
        
       }:

     

       7
       6
        
       {

     
···

       16
       15
        
           homeDirectory = "/home/pi";

     

       17
       16
        
       

     

       18
       17
        
           packages = with pkgs; [

     

       19
       19
       -
             inputs.nixvim.packages.${system}.default

     

       18
       18
       +
             inputs.nixvim.packages.${pkgs.stdenv.hostPlatform.system}.default

     

       20
       19
        
       

     

       21
       20
        
             # languages

     

       22
       21
        
             go

     
···

       25
       24
        
             go-tools

     

       26
       25
        
       

     

       27
       26
        
             # my apps

     

       28
       28
       -
             inputs.ctfd-alerts.packages.${system}.default

     

       27
       27
       +
             inputs.ctfd-alerts.packages.${pkgs.stdenv.hostPlatform.system}.default

     

       29
       28
        
       

     

       30
       29
        
             # Fonts

     

       31
       30
        
             fira

+1 -1

machines/terebithia/default.nix

···

       198
       198
        
           enable = true;

     

       199
       199
        
           package = pkgs.caddy.withPlugins {

     

       200
       200
        
             plugins = [ "github.com/caddy-dns/cloudflare@v0.2.2" ];

     

       201
       201
       -
             hash = "sha256-Z8nPh4OI3/R1nn667ZC5VgE+Q9vDenaQ3QPKxmqPNkc=";

     

       201
       201
       +
             hash = "sha256-ea8PC/+SlPRdEVVF/I3c1CBprlVp1nrumKM5cMwJJ3U=";

     

       202
       202
        
           };

     

       203
       203
        
           email = "me@dunkirk.sh";

     

       204
       204
        
           globalConfig = ''

+16 -11

modules/home/apps/git.nix

···

       11
       11
        
         config = lib.mkIf config.atelier.shell.git.enable {

     

       12
       12
        
           programs.git = {

     

       13
       13
        
             enable = true;

     

       14
       14
       -
             userName = "Kieran Klukas";

     

       15
       15
       -
             userEmail = "me@dunkirk.sh";

     

       16
       16
       -
             aliases = {

     

       17
       17
       -
               c = "commit";

     

       18
       18
       -
               p = "push";

     

       19
       19
       -
               ch = "checkout";

     

       20
       20
       -
               pushfwl = "push --force-with-lease --force-if-includes";

     

       21
       21
       -
             };

     

       22
       14
        
             includes = [

     

       23
       15
        
               {

     

       24
       16
        
                 path = pkgs.writeText "git-user-config" ''

     
···

       32
       24
        
                 condition = "gitdir:~/code/school/";

     

       33
       25
        
               }

     

       34
       26
        
             ];

     

       35
       35
       -
             extraConfig = {

     

       27
       27
       +
             settings = {

     

       28
       28
       +
               user = {

     

       29
       29
       +
                 name = "Kieran Klukas";

     

       30
       30
       +
                 email = "me@dunkirk.sh";

     

       31
       31
       +
                 signingKey = "~/.ssh/id_rsa.pub";

     

       32
       32
       +
               };

     

       33
       33
       +
               alias = {

     

       34
       34
       +
                 c = "commit";

     

       35
       35
       +
                 p = "push";

     

       36
       36
       +
                 ch = "checkout";

     

       37
       37
       +
                 pushfwl = "push --force-with-lease --force-if-includes";

     

       38
       38
       +
               };

     

       36
       39
        
               branch.sort = "-committerdate";

     

       37
       40
        
               pager.branch = false;

     

       38
       41
        
               column.ui = "auto";

     

       39
       42
        
               commit.gpgsign = true;

     

       40
       43
        
               gpg.format = "ssh";

     

       41
       44
        
               gpg.ssh.allowedSignersFile = "~/.ssh/allowedSigners";

     

       42
       42
       -
               user.signingKey = "~/.ssh/id_rsa.pub";

     

       43
       45
        
               pull.rebase = true;

     

       44
       46
        
               push.autoSetupRemote = true;

     

       45
       47
        
               init.defaultBranch = "main";

     

       46
       48
        
             };

     

       47
       47
       -
             delta.enable = true;

     

       49
       49
       +
           };

     

       50
       50
       +
           programs.delta = {

     

       51
       51
       +
             enable = true;

     

       52
       52
       +
             enableGitIntegration = true;

     

       48
       53
        
           };

     

       49
       54
        
           programs.gh.enable = true;

     

       50
       55
        
           programs.lazygit = {

+1 -1

modules/home/apps/helix.nix

···

       36
       36
        
                 vscode-langservers-extracted

     

       37
       37
        
                 kotlin-language-server

     

       38
       38
        
                 harper

     

       39
       39
       -
                 inputs.wakatime-ls.packages.${pkgs.system}.default

     

       39
       39
       +
                 inputs.wakatime-ls.packages.${pkgs.stdenv.hostPlatform.system}.default

     

       40
       40
        
               ]

     

       41
       41
        
               ++ lib.optionals config.atelier.apps.helix.swift [

     

       42
       42
        
                 sourcekit-lsp

+1 -1

modules/home/apps/spotify.nix

···

       14
       14
        
         config = lib.mkIf config.atelier.apps.spotify.enable {

     

       15
       15
        
           programs.spicetify =

     

       16
       16
        
             let

     

       17
       17
       -
               spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system};

     

       17
       17
       +
               spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.stdenv.hostPlatform.system};

     

       18
       18
        
             in

     

       19
       19
        
             {

     

       20
       20
        
               enable = true;

+1 -1

modules/home/apps/vscode.nix

···

       48
       48
        
                 rust-lang.rust-analyzer

     

       49
       49
        
                 dustypomerleau.rust-syntax

     

       50
       50
        
                 catppuccin.catppuccin-vsc

     

       51
       51
       -
                 inputs.frc-nix.packages.${pkgs.system}.vscode-wpilib

     

       51
       51
       +
                 inputs.frc-nix.packages.${pkgs.stdenv.hostPlatform.system}.vscode-wpilib

     

       52
       52
        
               ];

     

       53
       53
        
               userSettings = {

     

       54
       54
        
                 "editor.semanticHighlighting.enabled" = true;

+1 -1

modules/home/system/shell.nix

···

       609
       609
        
             now

     

       610
       610
        
             ghostty-setup

     

       611
       611
        
             pkgs.unstable.wakatime-cli

     

       612
       612
       -
             inputs.terminal-wakatime.packages.${pkgs.system}.default

     

       612
       612
       +
             inputs.terminal-wakatime.packages.${pkgs.stdenv.hostPlatform.system}.default

     

       613
       613
        
             unzip

     

       614
       614
        
             dog

     

       615
       615
        
             dust