diff --git a/.ssh/guz-battleship.pub b/.ssh/guz-battleship.pub new file mode 100644 index 0000000..d2118a9 --- /dev/null +++ b/.ssh/guz-battleship.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJuNk1zFUrKNb0Xg3iSSnFYHPbWGvRyk2HFK4Rq0sxm4 battleship login diff --git a/.ssh/guz-figther.pub b/.ssh/guz-figther.pub new file mode 100644 index 0000000..eafa591 --- /dev/null +++ b/.ssh/guz-figther.pub @@ -0,0 +1 @@ +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKJGVsSvBidDqmKj7nTQ64EP7eClHPbdAtgcLja/PgR2 figther login diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix index 2f173da..eb979c2 100644 --- a/modules/home-manager/default.nix +++ b/modules/home-manager/default.nix @@ -2,6 +2,7 @@ imports = [ ./programs ./profiles + ./packages ]; options = {}; config = {}; diff --git a/modules/home-manager/packages/default.nix b/modules/home-manager/packages/default.nix new file mode 100644 index 0000000..0560e1b --- /dev/null +++ b/modules/home-manager/packages/default.nix @@ -0,0 +1,7 @@ +{...}: { + imports = [ + ./lmms.nix + ]; + options = {}; + config = {}; +} diff --git a/modules/home-manager/packages/lmms.nix b/modules/home-manager/packages/lmms.nix new file mode 100644 index 0000000..282c6de --- /dev/null +++ b/modules/home-manager/packages/lmms.nix @@ -0,0 +1,63 @@ +{ + config, + lib, + pkgs, + ... +}: let + package = pkgs.stdenv.mkDerivation rec { + pname = "lmms"; + version = "1.2.2"; + + src = builtins.fetchGit { + url = "https://github.com/LMMS/lmms.git"; + ref = "main"; + rev = "729593c0228c2553248099a09f4fcb6dbe8312e1"; + submodules = true; + shallow = true; + }; + + nativeBuildInputs = with pkgs; [cmake libsForQt5.qt5.qttools pkg-config]; + + buildInputs = with pkgs; [ + carla + alsa-lib + fftwFloat + fltk13 + fluidsynth + lame + libgig + libjack2 + libpulseaudio + libsamplerate + libsndfile + libsoundio + libvorbis + portaudio + libsForQt5.qt5.qtbase + libsForQt5.qt5.qtx11extras + SDL # TODO: switch to SDL2 in the next version + ]; + + patches = [ + (pkgs.fetchpatch { + url = "https://raw.githubusercontent.com/archlinux/svntogit-community/cf64acc45e3264c6923885867e2dbf8b7586a36b/trunk/lmms-carla-export.patch"; + sha256 = "sha256-wlSewo93DYBN2PvrcV58dC9kpoo9Y587eCeya5OX+j4="; + }) + ]; + + cmakeFlags = ["-DWANT_QT5=ON"]; + + meta = with lib; { + description = "DAW similar to FL Studio (music production software)"; + mainProgram = "lmms"; + homepage = "https://lmms.io"; + license = licenses.gpl2Plus; + platforms = ["x86_64-linux" "i686-linux"]; + maintainers = []; + }; + }; +in { + home.packages = [ + # package + ]; +} diff --git a/modules/nixos/home-manager-helper.nix b/modules/nixos/home-manager-helper.nix index 773afb9..00cca43 100644 --- a/modules/nixos/home-manager-helper.nix +++ b/modules/nixos/home-manager-helper.nix @@ -129,6 +129,10 @@ in { name = mkOption { type = passwdEntry str; }; + openssh = mkOption { + type = anything; + default = {}; + }; packages = mkOption { type = listOf package; default = []; @@ -186,6 +190,7 @@ in { isSystemUser linger name + openssh pamMount shell subGidRanges @@ -217,7 +222,7 @@ in { }) cfg.users; - home-manager.backupFileExtension = "backup~"; + home-manager.backupFileExtension = "backup"; home-manager.extraSpecialArgs = {inherit inputs;}; home-manager.users = mapAttrs diff --git a/secrets/battleship-secrets.lesser.json b/secrets/battleship-secrets.lesser.json index ba316e6..6f4a894 100644 --- a/secrets/battleship-secrets.lesser.json +++ b/secrets/battleship-secrets.lesser.json @@ -1,6 +1,11 @@ { "tailnet-name": "ENC[AES256_GCM,data:wmIscIppnPfdSbAw,iv:e0DFMCVXEUB61aDlGSAjYfU8pCGn/NswyJAOnX5WGxA=,tag:9n0WqxsBy3fFqLuIsm9UPw==,type:str]", "device-ip": "ENC[AES256_GCM,data:xz7hjI9eyFFBt6OuoA==,iv:qLVQpFQqZ2NHW+UH+uaYOih66V0OJGBTKOE+1ZXnyHU=,tag:/3xmP/D4xafIOG0+NGH9Zw==,type:str]", + "devices": { + "defaultGateway": "ENC[AES256_GCM,data:uPLzDcpt0zy6vf8=,iv:7A4mL1s13R1GHZdBP/4CW/RhX8nEhZTgjmcwyezoC8k=,tag:+nvbXSrzhswv5gASfj1GGA==,type:str]", + "battleship": "ENC[AES256_GCM,data:MSQ9qOzl9NCbXwNO,iv:wM2uwlu050tsU++wR5aY1jN0v+4WlJV2vbeIMQEHTMI=,tag:qYp3cMUOOLaY58b5DywUhA==,type:str]", + "figther": "ENC[AES256_GCM,data:a5/+IjOxPoAjjug=,iv:Pcfi844DKCSKMJrHshgUXt6YTH+8qiEvjgWUujUhdh0=,tag:4RzfWuuxRtz9E2tBXrxqgg==,type:str]" + }, "sops": { "kms": null, "gcp_kms": null, @@ -12,8 +17,8 @@ "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBvNDBWYVBTR2s3dW1ITTEw\nazZnSWtRTFJ6Ui9kU1RBNlp1YlEvTjJMb1drCjVqbndTQmRIMUhUN2h4bHROU1h2\nRmUwdzhQdEFSSmtvaGxRZGlFUDc4NHMKLS0tIEI4TWk5eVIxV21tUXRaV2ZXZ1h5\ndzZIeEFEbDFsNWdJQkg2UTQvYmhBWEkKNYuVCvc0/tUi8IvoK8p6lTgbwAxa+0mU\n1uFymroQstSxzpA9Ol9hTR6X6dfBf+1zUnPpst0447fn2KyCNW0LGw==\n-----END AGE ENCRYPTED FILE-----\n" } ], - "lastmodified": "2024-04-10T16:32:56Z", - "mac": "ENC[AES256_GCM,data:YjBYZar1UTbOnn/22d/4lgfBWeiKHyoHOg8mhBrDn3kt+JM4TmDf34cTIZ4m95yySH9kecoQc+cCv2pKLrERBFs0oB8y6WDZ04WfRHyDroOZW4k9XVKwrfZ+M3vDPVd/S3ViFOwzMK1vIlhx5hFd8lOKD25UzLqWK1N15Rq5kP0=,iv:CB6wTsKXUkbHElC7Awx8ozc4S4QDppO+BB8swWrUDcU=,tag:hqzyPpoXA3FaR1oAsJSUBA==,type:str]", + "lastmodified": "2024-10-01T22:05:04Z", + "mac": "ENC[AES256_GCM,data:YGwFboGTPouKcNag0hUzTh2qRN5OkoRABSKQR4veOT+e6Xsth3GpizKONZ6lVMM5Jp4Ek5+U0CXMxWA7gF3xb7RqokMPBoV81Dz4ELueu8ZKCnYkLv1XjiowbQbQ7KuRwJ25XME2fnUhWHJPL6svQhHx4NKWr6TAfoDkq9bWwBU=,iv:M6jSI+AzRhsvqVfrw3//bxgAe/SHlUDYs9wMZXA2gxo=,tag:gml+lUBNewPkCe5VzG3iMw==,type:str]", "pgp": null, "unencrypted_suffix": "_unencrypted", "version": "3.8.1"