commit 0cee9e47b5dcb0b8a2998338381246a3d24fdad9 · pyrox.dev/nix

+2 -2

homes/x86_64-linux/pyrox/programs/gh.nix

···

       1
       1
       -
       {pkgs, data, lib, ...}: {

     

       1
       1
       +
       {pkgs, lib, ...}: {

     

       2
       2
        
         programs.gh = {

     

       3
       3
        
           enable = true;

     

       4
       4
        
           gitCredentialHelper.enable = true;

     

       5
       5
        
           settings = {

     

       6
       6
       -
             editor = lib.getExe data.packages.nvim;

     

       6
       6
       +
             editor = lib.getExe pkgs.py.nvim;

     

       7
       7
        
             git_protocol = "https";

     

       8
       8
        
             browser = "${pkgs.firefox-wayland}/bin/firefox";

     

       9
       9
        
             prompt = "enabled";

+3 -3

homes/x86_64-linux/pyrox/programs/git.nix

···

       1
       1
       -
       {pkgs, lib, data, ...}:

     

       1
       1
       +
       {pkgs, lib, ...}:

     

       2
       2
        
       {

     

       3
       3
        
         programs.git = {

     

       4
       4
        
           enable = true;

     

       5
       5
       -
           package = pkgs.my-pkgs.customGit;

     

       5
       5
       +
           package = pkgs.py.customGit;

     

       6
       6
        
           aliases = {

     

       7
       7
        
             a = "add -p";

     

       8
       8
        
             co = "checkout";

     
···

       38
       38
        
             options.line-numbers = true;

     

       39
       39
        
           };

     

       40
       40
        
           extraConfig = {

     

       41
       41
       -
             core.editor = lib.getExe data.packages.nvim;

     

       41
       41
       +
             core.editor = lib.getExe pkgs.py.nvim;

     

       42
       42
        
             init.defaultBranch = "main";

     

       43
       43
        
             pull.rebase = false;

     

       44
       44
        
             # gpg.format = "ssh";

+2 -2

homes/x86_64-linux/pyrox/programs/kitty.nix

···

       1
       1
       -
       {pkgs, lib, data, ...}: {

     

       1
       1
       +
       {pkgs, lib, ...}: {

     

       2
       2
        
         programs.kitty = {

     

       3
       3
        
           enable = true;

     

       4
       4
        
           catppuccin.enable = true;

     
···

       35
       35
        
             tab_bar_min_tabs = 2;

     

       36
       36
        
       

     

       37
       37
        
             shell = "fish";

     

       38
       38
       -
             editor = "${lib.getExe data.packages.nvim}";

     

       38
       38
       +
             editor = "${lib.getExe pkgs.py.nvim}";

     

       39
       39
        
             allow_remote_control = "socket-only";

     

       40
       40
        
             listen_on = "unix:/tmp/mykitty";

     

       41
       41
        
             update_check_interval = 0;

+1 -3

homes/x86_64-linux/pyrox/programs/neovim.nix

···

       1
       1
        
       {

     

       2
       2
        
         pkgs,

     

       3
       3
       -
         lib,

     

       4
       4
       -
         data,

     

       5
       3
        
         ...

     

       6
       4
        
       }: {

     

       7
       5
        
         programs.neovim = {

     

       8
       6
        
           enable = true;

     

       9
       9
       -
           package = data.packages.nvim;

     

       7
       7
       +
           package = pkgs.py.nvim;

     

       10
       8
        
           viAlias = true;

     

       11
       9
        
           vimAlias = true;

     

       12
       10
        
           vimdiffAlias = true;

+1 -2

homes/x86_64-linux/pyrox/programs/vscodium.nix

···

       1
       1
        
       {

     

       2
       2
        
         pkgs,

     

       3
       3
       -
         data,

     

       4
       3
        
         lib,

     

       5
       4
        
         ...

     

       6
       5
        
       }: {

     
···

       30
       29
        
             "update.showReleaseNotes" = false;

     

       31
       30
        
             "workbench.colorTheme" = "Catppuccin Mocha";

     

       32
       31
        
             "workbench.iconTheme" = "catppuccin-mocha";

     

       33
       33
       -
             "vscode-neovim.neovimExecutablePaths.linux" = lib.getExe data.packages.neovim;

     

       32
       32
       +
             "vscode-neovim.neovimExecutablePaths.linux" = lib.getExe pkgs.py.neovim;

     

       34
       33
        
             "python.formatting.provider" = "black";

     

       35
       34
        
           };

     

       36
       35
        
         };

+1 -3

modules/home/profiles/development/default.nix

···

       1
       1
        
       {

     

       2
       2
       -
         inputs,

     

       3
       2
        
         pkgs,

     

       4
       3
        
         ...

     

       5
       4
        
       }: let

     
···

       12
       11
        
           colmena

     

       13
       12
        
           customPython

     

       14
       13
        
           editorconfig-core-c

     

       15
       15
       -
           my-pkgs.customGit

     

       14
       14
       +
           py.customGit

     

       16
       15
        
           nil

     

       17
       16
        
           nixd

     

       18
       18
       -
           # python311

     

       19
       17
        
         ];

     

       20
       18
        
       }

+1 -1

modules/home/profiles/gui/default.nix

···

       44
       44
        
           # ] ++ lib.optionals games [

     

       45
       45
        
           # factorio-experimental

     

       46
       46
        
           lutris

     

       47
       47
       -
           # my-pkgs.olympus

     

       47
       47
       +
           # py.olympus

     

       48
       48
        
           prismlauncher

     

       49
       49
        
           protontricks

     

       50
       50
        
           proton-caller

+1 -1

modules/nixos/defaultConfig/packages.nix

···

       3
       3
        
           direnv

     

       4
       4
        
           doggo

     

       5
       5
        
           fzf

     

       6
       6
       -
           my-pkgs.customGit

     

       6
       6
       +
           py.customGit

     

       7
       7
        
           kitty.terminfo

     

       8
       8
        
           lazygit

     

       9
       9
        
           nix-output-monitor

+1 -2

modules/nixos/defaultConfig/users.nix

···

       1
       1
        
       {

     

       2
       2
        
         lib,

     

       3
       3
        
         pkgs,

     

       4
       4
       -
         data,

     

       5
       4
        
         ...

     

       6
       5
        
       }: {

     

       7
       6
        
         users.users = {

     
···

       20
       19
        
           withNodeJs = true;

     

       21
       20
        
           withPython3 = true;

     

       22
       21
        
           withRuby = false;

     

       23
       23
       -
           package = data.packages.nvim;

     

       22
       22
       +
           package = pkgs.py.nvim;

     

       24
       23
        
         };

     

       25
       24
        
       }

+2 -2

systems/x86_64-linux/marvin/services/authentik.nix

···

       1
       1
       -
       {config, data, lib, ...}: let

     

       2
       2
       -
         d = data.services.authentik;

     

       1
       1
       +
       {config, lib, ...}: let

     

       2
       2
       +
         d = lib.py.data.services.authentik;

     

       3
       3
        
       in {

     

       4
       4
        
         virtualisation.oci-containers.containers = let

     

       5
       5
        
           authentikVersion = "2024.2";

+3 -3

systems/x86_64-linux/marvin/services/buildbot.nix

···

       1
       1
       -
       {config, data, ...}: let

     

       1
       1
       +
       {config, lib, ...}: let

     

       2
       2
        
         as = config.age.secrets;

     

       3
       3
       -
         d = data.services.buildbot;

     

       4
       4
       -
         g = data.services.git;

     

       3
       3
       +
         d = lib.py.data.services.buildbot;

     

       4
       4
       +
         g = lib.py.data.services.git;

     

       5
       5
        
         bbSecret = {

     

       6
       6
        
           owner = "buildbot";

     

       7
       7
        
           group = "buildbot";

+1 -1

systems/x86_64-linux/marvin/services/deemix.nix

···

       1
       1
        
       {data, lib, ...}: let

     

       2
       2
       -
         d = data.services.deemix;

     

       2
       2
       +
         d = lib.py.data.services.deemix;

     

       3
       3
        
       in {

     

       4
       4
        
         virtualisation.oci-containers.containers.deemix = {

     

       5
       5
        
           image = "registry.gitlab.com/bockiii/deemix-docker";

+2 -2

systems/x86_64-linux/marvin/services/git.nix

···

       1
       1
        
       {

     

       2
       2
        
         config,

     

       3
       3
       -
         data,

     

       3
       3
       +
         lib,

     

       4
       4
        
         ...

     

       5
       5
        
       }: let

     

       6
       6
        
         cfg = config.services.forgejo.settings;

     
···

       14
       14
        
           group = "forgejo";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
       -
         d = data.services.git;

     

       17
       17
       +
         d = lib.data.services.git;

     

       18
       18
        
       in {

     

       19
       19
        
         pyrox.services.forgejo-runner = {

     

       20
       20
        
           enable = true;

+3 -3

systems/x86_64-linux/marvin/services/grafana.nix

···

       1
       1
       -
       {config, data, ...}: let

     

       2
       2
       -
         d = data.services.grafana;

     

       3
       3
       -
         a = data.services.authentik;

     

       1
       1
       +
       {config, lib, ...}: let

     

       2
       2
       +
         d = lib.py.data.services.grafana;

     

       3
       3
       +
         a = lib.py.data.services.authentik;

     

       4
       4
        
       in {

     

       5
       5
        
         services.grafana = {

     

       6
       6
        
           enable = true;

+2 -2

systems/x86_64-linux/marvin/services/iceshrimp.nix

···

       2
       2
        
         config,

     

       3
       3
        
         inputs,

     

       4
       4
        
         pkgs,

     

       5
       5
       -
         data,

     

       5
       5
       +
         lib,

     

       6
       6
        
         ...

     

       7
       7
        
       }: let

     

       8
       8
        
       

     

       9
       9
       -
         d = data.services.iceshrimp;

     

       9
       9
       +
         d = lib.data.services.iceshrimp;

     

       10
       10
        
       

     

       11
       11
        
         package = inputs.iceshrimp.packages.x86_64-linux.iceshrimp-pre.overrideAttrs

     

       12
       12
        
           (old: rec {

+2 -2

systems/x86_64-linux/marvin/services/matrix.nix

···

       2
       2
        
         config,

     

       3
       3
        
         pkgs,

     

       4
       4
        
         inputs,

     

       5
       5
       -
         data,

     

       5
       5
       +
         lib,

     

       6
       6
        
         ...

     

       7
       7
        
       }: let

     

       8
       8
       -
         d = data.services.matrix-server;

     

       8
       8
       +
         d = lib.py.data.services.matrix-server;

     

       9
       9
        
       in {

     

       10
       10
        
         services.matrix-conduit = {

     

       11
       11
        
           enable = true;

+3 -3

systems/x86_64-linux/marvin/services/nextcloud/default.nix

···

       1
       1
       -
       {config, pkgs, lib, data, ...}: let

     

       2
       2
       -
         d = data.services.nextcloud;

     

       3
       3
       -
         i = data.services.nextcloud-imaginary;

     

       1
       1
       +
       {config, pkgs, lib, ...}: let

     

       2
       2
       +
         d = lib.py.data.services.nextcloud;

     

       3
       3
       +
         i = lib.py.data.services.nextcloud-imaginary;

     

       4
       4
        
       in {

     

       5
       5
        
         imports = [

     

       6
       6
        
           ./office.nix

+2 -2

systems/x86_64-linux/marvin/services/nextcloud/imaginary.nix

···

       1
       1
       -
       { data, ...}: let

     

       2
       2
       -
         d = data.services.nextcloud-imaginary;

     

       1
       1
       +
       { lib, ...}: let

     

       2
       2
       +
         d = lib.py.data.services.nextcloud-imaginary;

     

       3
       3
        
       in{

     

       4
       4
        
         services.imaginary = {

     

       5
       5
        
           enable = true;

+2 -2

systems/x86_64-linux/marvin/services/nextcloud/office.nix

···

       1
       1
       -
       { data, ...}: let

     

       2
       2
       -
         d = data.services.nextcloud-office;

     

       1
       1
       +
       { lib, ...}: let

     

       2
       2
       +
         d = lib.py.data.services.nextcloud-office;

     

       3
       3
        
       in {

     

       4
       4
        
         virtualisation.oci-containers.containers.collabora-office = {

     

       5
       5
        
           image = "collabora/code";

+2 -2

systems/x86_64-linux/marvin/services/nginx.nix

···

       1
       1
       -
       {pkgs, data, ...}: let

     

       2
       2
       -
         n = data.services.nextcloud;

     

       1
       1
       +
       {lib, ...}: let

     

       2
       2
       +
         n = lib.py.data.services.nextcloud;

     

       3
       3
        
       in {

     

       4
       4
        
         services.nginx = {

     

       5
       5
        
           virtualHosts = {

+2 -2

systems/x86_64-linux/marvin/services/planka.nix

···

       1
       1
       -
       { config, data, ... }: let

     

       1
       1
       +
       { config, lib, ... }: let

     

       2
       2
        
         dataDir = "/var/lib/planka";

     

       3
       3
       -
         d = data.services.planka;

     

       3
       3
       +
         d = lib.py.data.services.planka;

     

       4
       4
        
       in {

     

       5
       5
        
         virtualisation.oci-containers.containers = {

     

       6
       6
        
           planka-server = {

+2 -2

systems/x86_64-linux/marvin/services/radicale.nix

···

       1
       1
       -
       {pkgs, data, config, ...}: let

     

       2
       2
       -
         d = data.services.radicale;

     

       1
       1
       +
       {pkgs, lib, config, ...}: let

     

       2
       2
       +
         d = lib.py.data.services.radicale;

     

       3
       3
        
         p = toString d.port;

     

       4
       4
        
       in {

     

       5
       5
        
         services.radicale = {

+2 -2

systems/x86_64-linux/marvin/services/redlib.nix

···

       1
       1
       -
       { pkgs, data, ...}: let

     

       2
       2
       -
         d = data.services.redlib;

     

       1
       1
       +
       { pkgs, lib, ...}: let

     

       2
       2
       +
         d = lib.py.data.services.redlib;

     

       3
       3
        
       in {

     

       4
       4
        
         services.libreddit = {

     

       5
       5
        
           enable = true;

+2 -2

systems/x86_64-linux/marvin/services/vaultwarden.nix

···

       1
       1
       -
       {pkgs, config, data, ...}: let

     

       1
       1
       +
       {pkgs, config, lib, ...}: let

     

       2
       2
        
       

     

       3
       3
       -
       d = data.services.vaultwarden;

     

       3
       3
       +
       d = lib.py.data.services.vaultwarden;

     

       4
       4
        
       

     

       5
       5
        
       vaultwardenSecret = {

     

       6
       6
        
         owner = "vaultwarden";

+2 -3

systems/x86_64-linux/marvin/services/webmentiond.nix

···

       1
       1
        
       {

     

       2
       2
        
         config,

     

       3
       3
       -
         pkgs,

     

       4
       4
       -
         data,

     

       3
       3
       +
         lib,

     

       5
       4
        
         ...

     

       6
       5
        
       }: let

     

       7
       7
       -
         d = data.services.webmentiond;

     

       6
       6
       +
         d = lib.py.data.services.webmentiond;

     

       8
       7
        
         p = toString d.port;

     

       9
       8
        
       in {

     

       10
       9
        
         virtualisation.oci-containers.containers.webmentiond = {

+1 -1

systems/x86_64-linux/zaphod/programs/misc.nix

···

       5
       5
        
         programs.fish.enable = true;

     

       6
       6
        
         # Git

     

       7
       7
        
         programs.git.enable = true;

     

       8
       8
       -
         programs.git.package = pkgs.my-pkgs.customGit;

     

       8
       8
       +
         programs.git.package = pkgs.py.customGit;

     

       9
       9
        
         programs.git.lfs.enable = true;

     

       10
       10
        
         # KDEConnect

     

       11
       11
        
         programs.kdeconnect.enable = true;