diff --git a/.sops.yaml b/.sops.yaml index 3b446ac..65fc548 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -6,6 +6,10 @@ keys: - &hopper age15mgf89h220puhz48rjpwxwu4n2h4edur60w6cd8gku2hh4e5kqpsghvnyw creation_rules: + - path_regex: home/secrets + key_groups: + - age: + - *xun - path_regex: secrets/global key_groups: - age: diff --git a/flake.lock b/flake.lock index 217550c..bedad47 100644 --- a/flake.lock +++ b/flake.lock @@ -10,11 +10,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1714136352, - "narHash": "sha256-BtWQ2Th/jamO1SlD+2ASSW5Jaf7JhA/JLpQHk0Goqpg=", + "lastModified": 1715290355, + "narHash": "sha256-2T7CHTqBXJJ3ZC6R/4TXTcKoXWHcvubKNj9SfomURnw=", "owner": "ryantm", "repo": "agenix", - "rev": "24a7ea390564ccd5b39b7884f597cfc8d7f6f44e", + "rev": "8d37c5bdeade12b6479c85acd133063ab53187a0", "type": "github" }, "original": { @@ -77,11 +77,11 @@ }, "locked": { "dir": "pkgs/firefox-addons", - "lastModified": 1714881816, - "narHash": "sha256-RRl1dRNYQf44sMhoDYZgCxIUOsnsToouIfLc00LKUu0=", + "lastModified": 1716264197, + "narHash": "sha256-ryPizz6evZsfAjFjUWgxCVzBZ9m1BDVKlMomOHze8VE=", "owner": "rycee", "repo": "nur-expressions", - "rev": "0f9e3fa02a77158755a76689a4e7e849c7a3e6e8", + "rev": "cccd903ebbe5837579d6746ac430beec60d96c19", "type": "gitlab" }, "original": { @@ -186,11 +186,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1714641030, - "narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=", + "lastModified": 1715865404, + "narHash": "sha256-/GJvTdTpuDjNn84j82cU6bXztE0MSkdnTWClUCRub78=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e", + "rev": "8dc45382d5206bd292f9c2768b8058a8fd8311d9", "type": "github" }, "original": { @@ -252,11 +252,11 @@ ] }, "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", + "lastModified": 1714641030, + "narHash": "sha256-yzcRNDoyVP7+SCNX0wmuDju1NUCt8Dz9+lyUXEI0dbI=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", + "rev": "e5d10a24b66c3ea8f150e47dfdb0416ab7c3390e", "type": "github" }, "original": { @@ -358,11 +358,11 @@ }, "hardware": { "locked": { - "lastModified": 1714885415, - "narHash": "sha256-LG+2IVqVi1fy724rSDAkgqae+f47fGGko4cJhtkN8PE=", + "lastModified": 1716173274, + "narHash": "sha256-FC21Bn4m6ctajMjiUof30awPBH/7WjD0M5yqrWepZbY=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "753176b57b3fcddb140c1c012868e62c025120bd", + "rev": "d9e0b26202fd500cf3e79f73653cce7f7d541191", "type": "github" }, "original": { @@ -483,11 +483,11 @@ ] }, "locked": { - "lastModified": 1714900398, - "narHash": "sha256-H7XYHpjk1G6dkA3AnbYrKtaTFjcCE7ul6nUVlVQxtsA=", + "lastModified": 1715930644, + "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=", "owner": "nix-community", "repo": "home-manager", - "rev": "fdaaf543bad047639ef0b356ea2e6caec2f1215c", + "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d", "type": "github" }, "original": { @@ -554,11 +554,11 @@ }, "locked": { "dir": "contrib", - "lastModified": 1714495065, - "narHash": "sha256-Cu9S+pCbATo1z4g3fI3lZ0nYNYe2IB7D5DD48NKESNA=", + "lastModified": 1715815279, + "narHash": "sha256-Pf7ZlqPnr195NZb5ADzMVsXurPMjRZ+JMXf6JxvXArE=", "owner": "neovim", "repo": "neovim", - "rev": "cb24a3907c8d24a898d99042f0f16c8919a2e7ab", + "rev": "9ca81b025990911c2a0dbda92af39ba84983bac3", "type": "github" }, "original": { @@ -599,11 +599,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1714521880, - "narHash": "sha256-qTlLUrvsSZIFD/dRNV+ogFfuQL5eU97AP4dXgVCzMek=", + "lastModified": 1715817852, + "narHash": "sha256-UH5o7hT72oAavJTG2NxlpMyQe3BQMniQAsgTugWtlc4=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "bb3bf108cacfd4a21dc0f10f2bcb8937d4ce4d15", + "rev": "7b5ca2486bba58cac80b9229209239740b67cf90", "type": "github" }, "original": { @@ -619,11 +619,11 @@ ] }, "locked": { - "lastModified": 1714878592, - "narHash": "sha256-E68C03sYRsYFsK7wiGHUIJm8IsyPRALOrFoTL0glXnI=", + "lastModified": 1716170277, + "narHash": "sha256-fCAiox/TuzWGVaAz16PxrR4Jtf9lN5dwWL2W74DS0yI=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "a362555e9dbd4ecff3bb98969bbdb8f79fe87f10", + "rev": "e0638db3db43b582512a7de8c0f8363a162842b9", "type": "github" }, "original": { @@ -639,11 +639,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1714872267, - "narHash": "sha256-G04hUZnX7rrJ5a9A2OqrKZ1x25svs2xpGDrP2ExExUg=", + "lastModified": 1716254495, + "narHash": "sha256-2cOTkGglFvwxnVpK1BiIU1ZTT7P0qGxW99UCPoDPBxI=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "7d48b70548c01495e9d434db3a89f61600ca4aca", + "rev": "deab460d7d0ec00eb7bd7b87044882c7ddfbf293", "type": "github" }, "original": { @@ -682,11 +682,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1714858427, - "narHash": "sha256-tCxeDP4C1pWe2rYY3IIhdA40Ujz32Ufd4tcrHPSKx2M=", + "lastModified": 1716061101, + "narHash": "sha256-H0eCta7ahEgloGIwE/ihkyGstOGu+kQwAiHvwVoXaA0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b980b91038fc4b09067ef97bbe5ad07eecca1e76", + "rev": "e7cc61784ddf51c81487637b3031a6dd2d6673a2", "type": "github" }, "original": { @@ -714,11 +714,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1714763106, - "narHash": "sha256-DrDHo74uTycfpAF+/qxZAMlP/Cpe04BVioJb6fdI0YY=", + "lastModified": 1716137900, + "narHash": "sha256-sowPU+tLQv8GlqtVtsXioTKeaQvlMz/pefcdwg8MvfM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e9be42459999a253a9f92559b1f5b72e1b44c13d", + "rev": "6c0b7a92c30122196a761b440ac0d46d3d9954f1", "type": "github" }, "original": { @@ -730,11 +730,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1714314149, - "narHash": "sha256-yNAevSKF4krRWacmLUsLK7D7PlfuY3zF0lYnGYNi9vQ=", + "lastModified": 1715774670, + "narHash": "sha256-iJYnKMtLi5u6hZhJm94cRNSDG5Rz6ZzIkGbhPFtDRm0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cf8cc1201be8bc71b7cbbbdaf349b22f4f99c7ae", + "rev": "b3fcfcfabd01b947a1e4f36622bbffa3985bdac6", "type": "github" }, "original": { @@ -746,11 +746,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1714809261, - "narHash": "sha256-hfBmnYFyz9I1mdrC3tX1A+dF9cOUcds5PIMPxrT+cRk=", + "lastModified": 1716062047, + "narHash": "sha256-OhysviwHQz4p2HZL4g7XGMLoUbWMjkMr/ogaR3VUYNA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d32560238207b8e26d88b265207b216ee46b8450", + "rev": "02923630b89aa1ab36ef8e422501a6f4fd4b2016", "type": "github" }, "original": { @@ -762,11 +762,11 @@ }, "nur": { "locked": { - "lastModified": 1714905988, - "narHash": "sha256-mzrMNxQ/DXuwJEOeG+hn+o+SXBMTbJgGKSxcoHV11P4=", + "lastModified": 1716316781, + "narHash": "sha256-ybuEOdUtk7/X9GjZp72npoSk5GHT+9jpL7aPoXaTu7A=", "owner": "nix-community", "repo": "NUR", - "rev": "57486a778b5614bbdfc96aad2b3585ef60f18c96", + "rev": "83bfd9ae2490c05fac7381100a13211cd27c3109", "type": "github" }, "original": { @@ -801,11 +801,11 @@ "utils": "utils_2" }, "locked": { - "lastModified": 1714800865, - "narHash": "sha256-jtHBKMXVECZKjVLSKeDhbdDiKp6jwjSexZZ6zQrFQqs=", + "lastModified": 1716315549, + "narHash": "sha256-WvNl8Mr9OJxTrk8uZ1v/Qqj9PRHL/xrRSuJqMSlfkG4=", "owner": "xunuwu", "repo": "small-nvim", - "rev": "44af854f5d740323f634bce3ee73841aa0492cff", + "rev": "7a3db695c926e9eb70d01efe8c29539200b2f306", "type": "github" }, "original": { @@ -820,11 +820,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1714878026, - "narHash": "sha256-YJ1k/jyd6vKqmVgGkkAb4n+ZfPPAt8+L5a73eAThqFU=", + "lastModified": 1716244104, + "narHash": "sha256-XXbqfkyWe0d0O+zqRQWi2oXi6wYDmTzXedFkBRwx1VI=", "owner": "Mic92", "repo": "sops-nix", - "rev": "10dc39496d5b027912038bde8d68c836576ad0bc", + "rev": "fddd52460e3332eedd8a0043af5675338a5b3e0b", "type": "github" }, "original": { diff --git a/home/profiles/default.nix b/home/profiles/default.nix index ad6ffc4..92e7e1d 100644 --- a/home/profiles/default.nix +++ b/home/profiles/default.nix @@ -11,6 +11,7 @@ ../. ./nixdesk inputs.nix-index-database.hmModules.nix-index + inputs.sops-nix.homeManagerModules.sops { programs.nix-index.enableZshIntegration = false; programs.nix-index.enableBashIntegration = false; @@ -20,6 +21,7 @@ "xun@hopper" = [ ../. ./hopper + inputs.sops-nix.homeManagerModules.sops ]; }; diff --git a/home/profiles/nixdesk/default.nix b/home/profiles/nixdesk/default.nix index 1f45a38..67be1dd 100644 --- a/home/profiles/nixdesk/default.nix +++ b/home/profiles/nixdesk/default.nix @@ -2,10 +2,13 @@ imports = [ ./kanshi.nix ./defaults.nix + + ../../secrets + ../../terminal ../../terminal/programs/zellij.nix ../../editors/nvim.nix - ../../editors/emacs.nix + #../../editors/emacs.nix ../../editors/vscode.nix ../../programs/browsers/firefox.nix ../../programs/browsers/chromium.nix @@ -24,6 +27,7 @@ # programs ../../programs/misc/keepassxc.nix ../../programs/misc/discord.nix + ../../programs/misc/ardour.nix ../../programs/misc/foliate.nix ../../programs/misc/obsidian.nix ../../programs/misc/thunderbird.nix diff --git a/home/profiles/nixdesk/kanshi.nix b/home/profiles/nixdesk/kanshi.nix index 1a857e8..cc1f64f 100644 --- a/home/profiles/nixdesk/kanshi.nix +++ b/home/profiles/nixdesk/kanshi.nix @@ -2,17 +2,21 @@ services.kanshi = { enable = true; systemdTarget = "hyprland-session.target"; - profiles."default" = { - outputs = [ - { - criteria = "DP-3"; - mode = "1920x1080@165Hz"; - } - { - criteria = "HDMI-A-1"; - position = "1920,0"; - } - ]; - }; + settings = [ + { + profile.name = "default"; + profile.outputs = [ + { + criteria = "DP-3"; + mode = "1920x1080@165Hz"; + position = "0,0"; + } + { + criteria = "HDMI-A-1"; + position = "1920,0"; + } + ]; + } + ]; }; } diff --git a/home/programs/desktop/hyprland/default.nix b/home/programs/desktop/hyprland/default.nix index ee240dd..99b6d6d 100644 --- a/home/programs/desktop/hyprland/default.nix +++ b/home/programs/desktop/hyprland/default.nix @@ -272,6 +272,7 @@ "$mainMod SHIFT, F, fakefullscreen" "$mainMod, P, exec, ${lib.getExe pkgs.fuzzel}" "$mainMod SHIFT, V, exec, ${lib.getExe pkgs.cliphist} list | ${lib.getExe pkgs.wofi} --dmenu | ${lib.getExe pkgs.cliphist} decode | ${pkgs.wl-clipboard}/bin/wl-copy" + "$mainMod SHIFT, S, exec, ${lib.getExe pkgs.grimblast} --freeze copy area" "$mainMod, N, togglesplit" "$mainMod SHIFT, N, swapsplit" diff --git a/home/programs/desktop/theme.nix b/home/programs/desktop/theme.nix index c928027..aa1ae4c 100644 --- a/home/programs/desktop/theme.nix +++ b/home/programs/desktop/theme.nix @@ -25,7 +25,7 @@ qt = { enable = true; - platformTheme = "gtk3"; + platformTheme.name = "gtk3"; style = { name = "Adwaita-dark"; package = pkgs.adwaita-qt; diff --git a/home/programs/games/default.nix b/home/programs/games/default.nix index 958691c..4941c97 100644 --- a/home/programs/games/default.nix +++ b/home/programs/games/default.nix @@ -1,9 +1,13 @@ -{pkgs, ...}: { +{ + pkgs, + self, + ... +}: { home.packages = with pkgs; [ heroic lutris prismlauncher - gamescope + self.packages.${pkgs.system}.gamesand ]; programs.mangohud.enable = true; } diff --git a/home/programs/misc/ardour.nix b/home/programs/misc/ardour.nix new file mode 100644 index 0000000..b69d8d2 --- /dev/null +++ b/home/programs/misc/ardour.nix @@ -0,0 +1,7 @@ +{pkgs, ...}: { + home.packages = with pkgs; [ + ardour + lsp-plugins + sunvox + ]; +} diff --git a/home/secrets/default.nix b/home/secrets/default.nix new file mode 100644 index 0000000..1712e3f --- /dev/null +++ b/home/secrets/default.nix @@ -0,0 +1,9 @@ +{config, ...}: { + sops = { + age.keyFile = "${config.home.homeDirectory}/.config/sops/age/keys.txt"; + }; + + imports = [ + ./wakatime.nix + ]; +} diff --git a/home/secrets/wakatime b/home/secrets/wakatime new file mode 100644 index 0000000..fcc7701 --- /dev/null +++ b/home/secrets/wakatime @@ -0,0 +1,20 @@ +{ + "data": "ENC[AES256_GCM,data:C2L6jTyiwlFwW8Ss0oHcs+Uq/Lt+y7eo9+7OqU5+GRgqzsMNUzTZXk6J20A0Ent6uEp/R2RdfUThBPWEgrIEHuTxGPhE/xMkWxSPWp72U2vPDw2PX6xaj4NZ2uTJVIzzGUKARA==,iv:V0NKo09OMLIhVFaK43JLTTy+etvJn/Ez4UHTb8prQDY=,tag:Ti/Vnu2UC7MbTwIWqP2U7A==,type:str]", + "sops": { + "kms": null, + "gcp_kms": null, + "azure_kv": null, + "hc_vault": null, + "age": [ + { + "recipient": "age17pdqkpfh6kc6wm7gxzdnwf6vphlwddv9yfpdu3j76e24y3amd9tq3avfc8", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBnOEEwKzRKc1FPSGlHbXk0\ncnQvN2oyRERxY0d5eEdmczBpYlZrb2M0eVcwCjNrTUc2dEcyYkFwMERTSEVnTldy\nWHhjeXVkOGFGRUdoM3dIdlJiZmRFTUUKLS0tIGM0S2MxZUYvUCtIZ3pKbDl1Vi9S\nNVQ4Yk5BWFlRK1RZNWtCNDltemxtaTQKFggxv58s2w9VTvQUZPv9ryzxRinGBz8s\n62TOAVxlWL3EdUqWd7o8kK83Ryw+Vor7Rjoe6ee9RSRNJSDmEPjJCA==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2024-05-21T18:41:29Z", + "mac": "ENC[AES256_GCM,data:SMelsZxZPQHkbNckfodg7tm99SGCoFflI6I1T+z3jafcMVUNbKj5H5BqSIqerDivsgXS4q7p83si6cvVcx3ePqvmSkeCjCxq2f+txmuDVYfqBJq3SvQ6C9zTnSYcefDYMaWFSGR8Yvw3zCH45s94DeGl3F5eo2HEV1S8M+7eos4=,iv:og+kLgKE4U3F84psUiobkd1cJSqLIu+Pu4W54x3twyM=,tag:uJDTfWtMhiQDAsLB9zpYFQ==,type:str]", + "pgp": null, + "unencrypted_suffix": "_unencrypted", + "version": "3.8.1" + } +} \ No newline at end of file diff --git a/home/secrets/wakatime.nix b/home/secrets/wakatime.nix new file mode 100644 index 0000000..954a4da --- /dev/null +++ b/home/secrets/wakatime.nix @@ -0,0 +1,7 @@ +{config, ...}: { + sops.secrets.wakatime = { + format = "binary"; + sopsFile = ./wakatime; + path = "${config.home.homeDirectory}/.wakatime.cfg"; + }; +} diff --git a/hosts/default.nix b/hosts/default.nix index 5102be8..53643aa 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -44,6 +44,8 @@ in { "${self}/secrets" "${self}/secrets/nixdesk" + "${mod}/network/wifi.nix" + "${mod}/services/syncthing.nix" "${mod}/services/virt/podman.nix" "${mod}/services/virt/waydroid.nix" @@ -52,6 +54,7 @@ in { "${mod}/desktop/x11/nosleep.nix" "${mod}/programs/gamemode.nix" + "${mod}/programs/gamescope.nix" "${mod}/programs/steam.nix" { @@ -65,6 +68,7 @@ in { hopper = { deployment = { targetUser = "xun"; + targetHost = "hopper.local"; }; imports = [ ./hopper diff --git a/hosts/hopper/brawlstats.nix b/hosts/hopper/brawlstats.nix index e8f19a4..0615a4e 100644 --- a/hosts/hopper/brawlstats.nix +++ b/hosts/hopper/brawlstats.nix @@ -4,7 +4,17 @@ config, ... }: { - networking.firewall.allowedTCPPorts = [4444]; + networking.firewall.allowedTCPPorts = [ + 4444 + ]; + + systemd.services."static-web-server".after = ["brawlstats.timer"]; + + services.static-web-server = { + enable = true; + root = "/var/lib/brawlstats"; + listen = "[::]:3434"; + }; systemd.sockets."brawlstats-web" = { wantedBy = ["sockets.target"]; @@ -31,7 +41,7 @@ set xlabel 'Time' set ylabel 'Trophies' set term svg - plot "/dev/stdin" using 1:2 with linespoints title 'Data' + plot "/dev/stdin" using 1:2 with linespoints notitle ''} # 2>/dev/null } diff --git a/hosts/nixdesk/hardware.nix b/hosts/nixdesk/hardware.nix index 321ada9..d51a6c6 100644 --- a/hosts/nixdesk/hardware.nix +++ b/hosts/nixdesk/hardware.nix @@ -1,10 +1,16 @@ -{inputs, ...}: { +{ + inputs, + config, + pkgs, + ... +}: { imports = [ inputs.hardware.nixosModules.common-cpu-amd inputs.hardware.nixosModules.common-gpu-amd inputs.hardware.nixosModules.common-pc-ssd ./gigabyte-b550-fix.nix ]; + boot = { initrd = { availableKernelModules = [ @@ -18,6 +24,9 @@ kernelModules = ["amdgpu"]; }; kernelModules = ["kvm-amd"]; + extraModulePackages = with config.boot.kernelPackages; [ + rtl88xxau-aircrack # usb wifi card + ]; loader = { timeout = 10; systemd-boot = { diff --git a/pkgs/default.nix b/pkgs/default.nix index f559d30..3ce828c 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,3 +1,4 @@ {pkgs, ...}: { jdnbtexplorer = pkgs.qt6Packages.callPackage ./jdnbtexplorer {}; + gamesand = pkgs.callPackage ./gamesand {}; } diff --git a/pkgs/gamesand/default.nix b/pkgs/gamesand/default.nix new file mode 100644 index 0000000..896b543 --- /dev/null +++ b/pkgs/gamesand/default.nix @@ -0,0 +1,24 @@ +{ + steamPackages, + symlinkJoin, +}: +symlinkJoin { + name = "gamesand"; + paths = [ + ((steamPackages.steam-fhsenv-without-steam.override + { + extraBwrapArgs = [ + "--ro-bind ./files /game/files" + "--bind ./appdata /home/$USER" + "--chdir /game" + "--ro-bind ./start.sh /game/start.sh" + "--cap-add ALL" + ]; + }) + .run) + ]; + postBuild = '' + mv $out/bin/steam-run $out/bin/gamesand + sed -i 's/ignored=(\/nix \/dev \/proc \/etc )/ignored=(\/nix \/dev \/proc \/etc \/home )/' $out/bin/gamesand + ''; +} diff --git a/secrets/hopper/betanin b/secrets/hopper/betanin index f32234e..71509ca 100644 --- a/secrets/hopper/betanin +++ b/secrets/hopper/betanin @@ -1,5 +1,5 @@ { - "data": "ENC[AES256_GCM,data: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,iv:U46fOpIzufGktwUAl8ISu+2yxFx9RDNQols5hroL/7c=,tag:fm6C4jjb6HTQP2bnr8Ikuw==,type:str]", + "data": "ENC[AES256_GCM,data:TmpYiFqXu3yz4IluJ9DVH0TU05YL1NBsEcRb73vx4j45Q/aWQPA7V18+xz79t9HbFWekaLe9tPMgeiVF5uuK8qSufg==,iv:KBf+q3YSO+38HdkRt0/Hmp5Jhaw/2Cl4PzYkhtsRoM4=,tag:ZSySMXU11lvA+Tv3NKc64Q==,type:str]", "sops": { "kms": null, "gcp_kms": null, @@ -15,8 +15,8 @@ "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB4cFRKMEQxMnlsZlpWUVMr\nMUtOTjF6RWRZdHdMbzh4ZGpkelc3cEZyRWxrClVOSy9kNXB6OGpVNHhSRnQrdU5y\nV3JiVDNVTThpSTVzSnliY1ZBOFFQY28KLS0tIHd1NEo2VTd0WXJ4eU9KdjlKSHpJ\nOC9XRDhaNmNOOEJoOS8remF6d2szTncKG/uzlIbBX7gFBcUTXzstarnBeiUB0Cdn\nQjT1nFNFGR09WDtJROuTPYS6GFmEmlGwX84dGsIQpIjyN3XPSzsrxQ==\n-----END AGE ENCRYPTED FILE-----\n" } ], - "lastmodified": "2024-04-25T17:26:01Z", - "mac": "ENC[AES256_GCM,data:0cd3iDduaZ5MPt+tIVvNixjd3WaqBVbh/aRKHGOY/BdkWdZ8jcXIdUIOSy+4AtFhLKBq/+UQNbXwwCdn6gJcVX7ATVB3w2b7YX4KqruKIPOt3UPu3s6GGlnf4xhQhfXYmy/NnAYpNFpAv/eli80S8AK4Nuo7FA2dGgXBqo0OX38=,iv:E5sI0X/0dnuCJ5ZCkpLXpX7dAS5NkxKgAt8JcGCcooI=,tag:Es/SwUeGiB/ewgPfZHuaaA==,type:str]", + "lastmodified": "2024-05-18T18:34:30Z", + "mac": "ENC[AES256_GCM,data:ay8ylTBNXr37TCDqDAkbQ4NcCklv8tUJUUpQZTQCgMHHWtCr0wLCyTUPNUOoHOkjJPAZtDuAXVuG5UPGv93gdZOVXlWpFfZt2Je6YBhcP3HLYXgLNLoPPhqqwnyz30ec7Ux4sx7SyLFWPe+0vV0wv8VFzoI731nhgY88McofvC8=,iv:tCZ/uYsu5rWRf3CburxHOx+3+scZZ0JwLEn/BqCoGsY=,tag:rlkeDvJcUASA4kaizCtj7w==,type:str]", "pgp": null, "unencrypted_suffix": "_unencrypted", "version": "3.8.1" diff --git a/secrets/hopper/default.nix b/secrets/hopper/default.nix index 857dda6..645505f 100644 --- a/secrets/hopper/default.nix +++ b/secrets/hopper/default.nix @@ -70,5 +70,10 @@ format = "binary"; sopsFile = ./brawlstars; }; + wakapi = { + format = "binary"; + sopsFile = ./wakapi; + mode = "004"; + }; }; } diff --git a/secrets/hopper/wakapi b/secrets/hopper/wakapi new file mode 100644 index 0000000..c977e93 --- /dev/null +++ b/secrets/hopper/wakapi @@ -0,0 +1,24 @@ +{ + "data": "ENC[AES256_GCM,data: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,iv:IDFSJC77vrlknBHY8pLVrgvP/MfoDfVHBUXEhEsnvJ8=,tag:UaSjAjxBu2sAuFysgk7FlA==,type:str]", + "sops": { + "kms": null, + "gcp_kms": null, + "azure_kv": null, + "hc_vault": null, + "age": [ + { + "recipient": "age17pdqkpfh6kc6wm7gxzdnwf6vphlwddv9yfpdu3j76e24y3amd9tq3avfc8", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBXenVVOGZQREJQdHRFOXRu\nbEV6a0VBTkhvWnVGY01HbjlHQmpoc0pkbkI4CkJFNGpSaWdnK1pHdC8rNk5qZmFv\na2c2VnZCL2Vqc04wSnl3SHVpZDI0U1kKLS0tIGJQWWRxUlk5cnJ6ZGk3aXlFc0cz\nRHRma3ZidlljdVVpQm1BU1NBZmFNMlEKYEEzo3TkebN2s3Aaqycl3sUSI2S4f7nK\neqRHJ0cyA/fZP9y275CW/mHWY9Yblv6DmzIvmlnMwGhrT45j1VMbRg==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age15mgf89h220puhz48rjpwxwu4n2h4edur60w6cd8gku2hh4e5kqpsghvnyw", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAwVk05dVZOZzREM0dpR0gy\nOWp6TCtwODNMVldUVENkMUtnTWZiOUJSYkhBCmNSUWxNclB5ZE91cFVPSTFPUzIz\nSWRoUUVJdDRwTVM1dDBwclowSlNCc2MKLS0tIEhqU1NxaFltcEo4akx5bVFQdkhX\nV3NvTGV3OUlDdUtoVEZoRTVPYlY2QW8K77rvyrNR45P+UweOpKUMFac2PPfPMZ3f\nQxebgvBUQJtSFdjs1+unvuvejdu0le5Yp1LliZfe+/L7ErXJjRsVBw==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2024-05-21T18:11:49Z", + "mac": "ENC[AES256_GCM,data:hIc1MfYDcZWh3RQcSJ1aHaNFX/CtfUtUJ/TW38AYDr9r0xdW7qiPIz5d/VCAKEbl4TGBxRDHZwjtFE4l5ZtQhHlZmgFefOAzHaKya/lPwjseR6wj43IxCuUQcHGEPK0qtojlq/0xgRGqhcOxqrBuQZflGNrHUO/fUPjCWErPv88=,iv:ymIX0XSRk2+zBoS9WL463beYwFMZJzjz3o42JUwdLtc=,tag:zXlnM33ZlLNo47uVhXXtKA==,type:str]", + "pgp": null, + "unencrypted_suffix": "_unencrypted", + "version": "3.8.1" + } +} \ No newline at end of file diff --git a/secrets/nixdesk/brawlstars b/secrets/nixdesk/brawlstars new file mode 100644 index 0000000..9891561 --- /dev/null +++ b/secrets/nixdesk/brawlstars @@ -0,0 +1,24 @@ +{ + "data": "ENC[AES256_GCM,data:1XGfHkj/Q0PLetEQQpw2FqQaHKwl3YI52iU8Gr+rGI0dAESdRqbs9vmE44heaSXxDzVqQ2ILMKb0lQvJ9ClzOLnms5DU0nAGxX3JxLJPtvJSpMwSV18pPjkQHj9h4sjNZXkxZ9dT9bxM0mhgYFMQLK+KOJhZHDQztKza7An9y1wtnrVJ5/6I4VgIVHn7C4gFXhNE4AM51WUA4Mp7NsMevjr7EFXPiHw5JjwHeWDWNAmi4h1YTqulLd+zw85OYymx+PJYaX7yjoZmT7N28SvOQ1z9HtFXhvYR15IHt1iTEBMhhwGd72JAVLm2ANBA+Udu7M9EureaKsXoeHhZRKTk/0p0OSWzpNlzsM4nW5gvOSjF135qel2mK4m/FIZ/3KKnQKkeTaSfY3gGNlYXBEL+/TK7Wj7bJiaC4j6R6ejt6Vtc0V9NqOB0d5e7FQlXWaFYnQ/iiaC8sdcVRjqNDDSnHHsFUVhZ8dcrDpKhkPRwjLxEyuWuex5m3dk0xFZDd8GIEZDjsk8BkoqaU9uKnolhtLzwU0H7qhoJgJDhqsi+ig0a/DrghmvVYifzaxqo5yaLQ8oJ1ATsu4J8cvDCnbOlpvRMy/Jmb6/ecAeBQ760+Uk2tXzh7zkRHjreSap8RSorEXa2/7B8gLGQIAW5GiZrVbCEc7gRJvxbVgTsce71qn+mMFlZO/m4sHsCKSF63RqR8QHMkOlInGFx3zib6+kYn7yjR6FkvYPgTGhhg5Yx0iyWaVjmwqEBxp5FVw==,iv:vkhJHqZmnEvRydNc1Am36V2mur+Ov8WlXSPLENAMmSU=,tag:FKeqOLirz3kPMVqUDc1QEQ==,type:str]", + "sops": { + "kms": null, + "gcp_kms": null, + "azure_kv": null, + "hc_vault": null, + "age": [ + { + "recipient": "age17pdqkpfh6kc6wm7gxzdnwf6vphlwddv9yfpdu3j76e24y3amd9tq3avfc8", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBkYmVpQjBzQkhxeS9mcmt3\nYThET0FnaWZDLzliT2d0Mng3OUZmTXlhNmtBCkNoUW13enphanlhMVJ4TEJLQSt1\nY0pNVHRLYnRpeFlzTUQrQ0FGU1ViUWsKLS0tIFpzYnAzd2pxYzJVM3lWd1ZBTTh2\nTEdFS1hYMjR3UkR1SE52M2tSZStYNXcKhFZmD/xAdvVUEoc0ysR0BuzIDtXvkWyF\nPcMcjIf/1QYcuhyFXYD7KwwdsEOW+cRiLw0LHuAgLqrC05QzbO6maw==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age155sscpw0x36t6s9usdrz7relpxqrtqnk98mrc7s0qcv2n0v3zd7sfl2xn8", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA1elpxbGd5N0x5aXVKZHZ6\nVDRaUmRTaUlXdXV6TUR0ai9LR0RqdkczMlZ3Cmk2VUVibWZGT3kvZDVIS0loS1ha\nNjlnL1pOS1h6Y0FwR2IvYmcxaGRmWVEKLS0tIFN5cDl2Z0d1RmVVWktHbDBMNFpT\ncWszTUZlRFdUK2UyQ3BseW9YMEJvR1EKGQn97YqzQK2hdXhUJFmrcK41nDDOsFvY\nY8eXYvDaAFkNCFBoazPXkINVycn+9qpvu21hi8XSM1UePf5eXlBqbQ==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2024-05-12T00:49:47Z", + "mac": "ENC[AES256_GCM,data:wIDgEom4PTmHx670db0pBiQl7PyHZ9Yy9nzVg5ITXyu6WJZLaMuuoW3pUxtkB+52ZR8r66M4/fuahk6NiGlhVLCxAY+3KZk2RbwWnD43xZQ/DMQ4WOZ9e8x/rozsPsrD3QxGsZodOLxaWg3QLT4VpGDtb+zzrQn1SIMqlOMxAMk=,iv:Ira7zU+hj/cUruhhUu33PPMxVQdfm4GoPEKaq6fdtI8=,tag:h6ihTBuQl5dZCU7ZWU2vYA==,type:str]", + "pgp": null, + "unencrypted_suffix": "_unencrypted", + "version": "3.8.1" + } +} \ No newline at end of file diff --git a/secrets/nixdesk/default.nix b/secrets/nixdesk/default.nix index adc06fc..c2d46f4 100644 --- a/secrets/nixdesk/default.nix +++ b/secrets/nixdesk/default.nix @@ -4,18 +4,21 @@ format = "binary"; sopsFile = ./wireguard; }; - #wireguard-preshared = { - # format = "yaml"; - # sopsFile = ./wireguard.yaml; - #}; - wireguard-private = { - format = "yaml"; + wireguard-preshared = { + key = "PresharedKey"; sopsFile = ./wireguard.yaml; + }; + wireguard-private = { key = "PrivateKey"; + sopsFile = ./wireguard.yaml; }; cloudflare = { format = "binary"; sopsFile = ./cloudflare; }; + brawlstars-api-key = { + format = "binary"; + sopsFile = ./brawlstars; + }; }; } diff --git a/system/desktop/default.nix b/system/desktop/default.nix index 0967ef4..0845f69 100644 --- a/system/desktop/default.nix +++ b/system/desktop/default.nix @@ -1 +1,8 @@ -{} +{ + services.displayManager = { + sddm = { + enable = true; + wayland.enable = true; + }; + }; +} diff --git a/system/network/wifi.nix b/system/network/wifi.nix new file mode 100644 index 0000000..819a93c --- /dev/null +++ b/system/network/wifi.nix @@ -0,0 +1,5 @@ +{ + networking.wireless = { + iwd.enable = true; + }; +} diff --git a/system/programs/gamescope.nix b/system/programs/gamescope.nix new file mode 100644 index 0000000..0fed043 --- /dev/null +++ b/system/programs/gamescope.nix @@ -0,0 +1,6 @@ +{ + programs.gamescope = { + enable = true; + capSysNice = true; + }; +} diff --git a/system/services/containers/experimental/default.nix b/system/services/containers/experimental/default.nix index 4800350..180001b 100644 --- a/system/services/containers/experimental/default.nix +++ b/system/services/containers/experimental/default.nix @@ -1,10 +1,12 @@ { config, pkgs, + lib, + inputs, ... }: { imports = [ - ./smbshare.nix + #./smbshare.nix ]; virtualisation.podman = { enable = true; @@ -26,6 +28,7 @@ }; extraDomainNames = [ "jellyfin.xun.cam" + "wakapi.xun.cam" ]; }; }; @@ -150,6 +153,10 @@ tls /etc/ssl/certs/xun.cam/cert.pem /etc/ssl/certs/xun.cam/key.pem reverse_proxy localhost:8096 } + https://wakapi.xun.cam:8336 { + tls /etc/ssl/certs/xun.cam/cert.pem /etc/ssl/certs/xun.cam/key.pem + reverse_proxy localhost:3000 + } ''}:/etc/caddy/Caddyfile" #tls /etc/ssl/certs/cloudflare/cert.pem /etc/ssl/certs/cloudflare/key.pem #"${config.sops.secrets.xun-cam-cert.path}:/etc/ssl/certs/cloudflare/cert.pem" @@ -271,10 +278,113 @@ "/media/config/betanin/data:/b/.local/share/betanin" "/media/config/betanin/config:/b/.config/betanin" "/media/config/betanin/beets:/b/.config/beets" - "${config.sops.secrets.betanin.path}:/b/.config/beets/config.yaml" + "${config.sops.secrets.betanin.path}:/b/.config/beets/secrets.yaml" + "${builtins.toFile "config.yaml" '' + include: + - secrets.yaml + + library: library.db + directory: /music + statefile: state.pickle + + threaded: yes + + import: + write: yes + copy: yes + link: no + move: no + incremental: no + + paths: + default: /$albumartist/$album %aunique{}/$track $title %aunique{} + singleton: /$albumartist/$artist %aunique{}/$track $title %aunique{} + comp: /Compilation/$album %aunique{}/$track $title %aunique{} + albumtype:soundtrack: Soundtracks/$album %aunique{}/$track $title %aunique{} + + clutter: ["Thumbs.DB", ".DS_Store"] + + + plugins: [ + embedart, + fetchart, + discogs, + advancedrewrite, + lyrics, + spotify, + scrub, + ] + + genres: yes + + spotify: + source_weight: 0.7 + + advancesrewrite: + artist GHOST: Ghost and Pals + + embedart: + auto: yes + ifempty: no + remove_art_file: no + + fetchart: + auto: yes + cautious: yes + minwidth: 500 + maxwidth: 1200 + cover_format: jpeg + sources: + - coverart: release + - coverart: releasegroup + - albumart + - amazon + - google + - itunes + - fanarttv + - lastfm + - wikipedia + + lyrics: + fallback: ''' + sources: musixmatch google + + replace: + '[\\]': ''' + '[_]': '-' + '[/]': '-' + '^\.': ''' + '[\x00-\x1f]': ''' + '[<>:"\?\*\|]': ''' + '\.$': ''' + '\s+$': ''' + '^\s+': ''' + '^-': ''' + '’': "'" + '′': "'" + '″': ''' + '‐': '-' + + aunique: + keys: albumartist albumtype year album + disambuguators: format mastering media label albumdisambig releasegroupdisambig + bracket: '[]' + ''}:/b/.config/beets/config.yaml" "/media/library/music:/music" "/media/slskd/downloads:/downloads/slskd" - "/media/downloads/music:/downloads/misc" + "/media/downloads/music:/downloads/torrent" + "/media/config/betanin/import:/downloads/import" + ]; + }; + wakapi = { + image = "ghcr.io/muety/wakapi:latest"; + volumes = [ + "${config.sops.secrets.wakapi.path}:/app/config.yml" + "/media/config/wakapi:/data" # needs to be chown 1000:1000 + ]; + dependsOn = ["gluetun"]; + extraOptions = [ + "--network=container:gluetun" ]; }; };