Compare commits

...

8 Commits

Author SHA1 Message Date
coolneng 5d217cf5cc flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/7c656856e9eb863c4d21c83e2601dd77f95f6941' (2023-04-02)
  → 'github:NixOS/nixpkgs/9c8ff8b426a8b07b9e0a131ac3218740dc85ba1e' (2023-04-05)
2023-04-05 22:31:46 +02:00
coolneng 7e5a6c013d flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/e3652e0735fbec227f342712f180f4f21f0594f2' (2023-03-30)
  → 'github:NixOS/nixpkgs/7c656856e9eb863c4d21c83e2601dd77f95f6941' (2023-04-02)
2023-04-03 22:31:58 +02:00
coolneng bd46f5708c
Add pdfgrep to packages 2023-04-03 10:57:03 +02:00
coolneng 1f6b5b7c4e
Add required dependencies to auto-upgrade service 2023-04-02 22:43:36 +02:00
coolneng 3652e18804
flake.lock: Update
Flake lock file updates:

• Updated input 'local-bitwig':
    'path:/home/coolneng/Projects/panacea/assets/bitwig?lastModified=0&narHash=sha256-n8gLgN6QEVuHe30kQZ/gCWInDHwDpPWOB5RgVh1tSt8%3D' (1970-01-01)
  → 'path:/home/coolneng/Projects/panacea/assets/bitwig?lastModified=1680095020&narHash=sha256-n8gLgN6QEVuHe30kQZ/gCWInDHwDpPWOB5RgVh1tSt8%3D' (2023-03-29)
• Updated input 'openconnect-sso':
    'github:vlaci/openconnect-sso/c0bbc9ff7d9477cb721c4b6e44482903fe81791a' (2022-10-26)
  → 'github:vlaci/openconnect-sso/c3f67e2b037e71c193b3c7b1f90ec9a5a440856f' (2023-03-31)
2023-04-02 02:20:01 +02:00
coolneng c6c168ea12 flake.lock: Update
Flake lock file updates:

• Updated input 'agenix':
    'github:ryantm/agenix/03b51fe8e459a946c4b88dcfb6446e45efb2c24e' (2023-03-04)
  → 'github:ryantm/agenix/e64961977f60388dd0b49572bb0fc453b871f896' (2023-03-31)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/9a6aabc4740790ef3bbb246b86d029ccf6759658' (2023-03-29)
  → 'github:NixOS/nixpkgs/e3652e0735fbec227f342712f180f4f21f0594f2' (2023-03-30)
2023-03-31 22:32:48 +02:00
coolneng ca39df021b flake.lock: Update
Flake lock file updates:

• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/4bb072f0a8b267613c127684e099a70e1f6ff106' (2023-03-27)
  → 'github:NixOS/nixpkgs/9a6aabc4740790ef3bbb246b86d029ccf6759658' (2023-03-29)
2023-03-30 22:31:35 +02:00
coolneng 628766e55d
Add patched bitwig-studio to packages 2023-03-29 15:03:40 +02:00
9 changed files with 52 additions and 10 deletions

3
.gitattributes vendored
View File

@ -1 +1,4 @@
secrets/soundcloud_token filter=git-crypt diff=git-crypt secrets/soundcloud_token filter=git-crypt diff=git-crypt
assets/bitwig/activation.bwreg filter=lfs diff=lfs merge=lfs -text
assets/bitwig/bitwig-studio.deb filter=lfs diff=lfs merge=lfs -text
assets/bitwig/bitwig.jar filter=lfs diff=lfs merge=lfs -text

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
!*.jar

BIN
assets/bitwig/activation.bwreg (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/bitwig/bitwig-studio.deb (Stored with Git LFS) Normal file

Binary file not shown.

BIN
assets/bitwig/bitwig.jar (Stored with Git LFS) Normal file

Binary file not shown.

View File

@ -129,7 +129,8 @@ with pkgs;
"--commit-lock-file" "--commit-lock-file"
]; ];
}; };
# Add git-crypt to the auto-upgrade service
# Add required dependencies to the auto-upgrade service
systemd.services.nixos-upgrade.path = [ systemd.services.nixos-upgrade.path = [
coreutils coreutils
gnutar gnutar
@ -139,6 +140,7 @@ with pkgs;
config.nix.package.out config.nix.package.out
config.programs.ssh.package config.programs.ssh.package
git-crypt git-crypt
inputs.agenix.packages.x86_64-linux.default
]; ];
# Configure git for auto-upgrade # Configure git for auto-upgrade

View File

@ -8,11 +8,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1677969766, "lastModified": 1680281360,
"narHash": "sha256-AIp/ZYZMNLDZR/H7iiAlaGpu4lcXsVt9JQpBlf43HRY=", "narHash": "sha256-XdLTgAzjJNDhAG2V+++0bHpSzfvArvr2pW6omiFfEJk=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "03b51fe8e459a946c4b88dcfb6446e45efb2c24e", "rev": "e64961977f60388dd0b49572bb0fc453b871f896",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -59,6 +59,19 @@
"type": "github" "type": "github"
} }
}, },
"local-bitwig": {
"flake": false,
"locked": {
"lastModified": 1680095020,
"narHash": "sha256-n8gLgN6QEVuHe30kQZ/gCWInDHwDpPWOB5RgVh1tSt8=",
"path": "/home/coolneng/Projects/panacea/assets/bitwig",
"type": "path"
},
"original": {
"path": "/home/coolneng/Projects/panacea/assets/bitwig",
"type": "path"
}
},
"nix-index-database": { "nix-index-database": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -81,11 +94,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1679944645, "lastModified": 1680669251,
"narHash": "sha256-e5Qyoe11UZjVfgRfwNoSU57ZeKuEmjYb77B9IVW7L/M=", "narHash": "sha256-AVNE+0u4HlI3v96KCXE9risH7NKqj0QDLLfSckYXIbA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4bb072f0a8b267613c127684e099a70e1f6ff106", "rev": "9c8ff8b426a8b07b9e0a131ac3218740dc85ba1e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -97,11 +110,11 @@
"openconnect-sso": { "openconnect-sso": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1666807723, "lastModified": 1680271746,
"narHash": "sha256-pU8m5zIEITBDmL3JCecRTRbMscpGTcpXSuP8zk5WfBI=", "narHash": "sha256-qerm3HzTP0xnfOim0eEmUZa/MMll6VuS0IEKfiUysgU=",
"owner": "vlaci", "owner": "vlaci",
"repo": "openconnect-sso", "repo": "openconnect-sso",
"rev": "c0bbc9ff7d9477cb721c4b6e44482903fe81791a", "rev": "c3f67e2b037e71c193b3c7b1f90ec9a5a440856f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -114,6 +127,7 @@
"inputs": { "inputs": {
"agenix": "agenix", "agenix": "agenix",
"cyrus-sasl-xoauth2": "cyrus-sasl-xoauth2", "cyrus-sasl-xoauth2": "cyrus-sasl-xoauth2",
"local-bitwig": "local-bitwig",
"nix-index-database": "nix-index-database", "nix-index-database": "nix-index-database",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"openconnect-sso": "openconnect-sso" "openconnect-sso": "openconnect-sso"

View File

@ -27,6 +27,10 @@
url = "github:Mic92/nix-index-database"; url = "github:Mic92/nix-index-database";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
local-bitwig = {
url = "path:/home/coolneng/Projects/panacea/assets/bitwig";
flake = false;
};
}; };
outputs = { self, nixpkgs, agenix, nix-index-database, ... }@inputs: outputs = { self, nixpkgs, agenix, nix-index-database, ... }@inputs:

View File

@ -7,6 +7,13 @@ let
scripts = [ mpvScripts.sponsorblock ]; scripts = [ mpvScripts.sponsorblock ];
}); });
patched-bitwig = bitwig-studio.overrideAttrs (old: rec {
src = ../assets/bitwig/bitwig-studio.deb;
postInstall = ''
cp -r ${inputs.local-bitwig}/bitwig.jar $out/libexec/bin/bitwig.jar
'';
});
in { in {
environment.systemPackages = [ environment.systemPackages = [
# Monitoring # Monitoring
@ -55,6 +62,7 @@ in {
mpc_cli mpc_cli
pulsemixer pulsemixer
easyeffects easyeffects
patched-bitwig
# Productivity # Productivity
zathura zathura
libreoffice-fresh libreoffice-fresh
@ -62,6 +70,7 @@ in {
bc bc
citrix_workspace citrix_workspace
teams teams
pdfgrep
# Mail stack # Mail stack
mu mu
isync-oauth2 isync-oauth2