diff --git a/devices/tuxedo/flake.lock b/devices/tuxedo/flake.lock index 8e87298..d6b2b0b 100644 --- a/devices/tuxedo/flake.lock +++ b/devices/tuxedo/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1758287904, - "narHash": "sha256-IGmaEf3Do8o5Cwp1kXBN1wQmZwQN3NLfq5t4nHtVtcU=", + "lastModified": 1760701190, + "narHash": "sha256-y7UhnWlER8r776JsySqsbTUh2Txf7K30smfHlqdaIQw=", "owner": "nix-community", "repo": "disko", - "rev": "67ff9807dd148e704baadbd4fd783b54282ca627", + "rev": "3a9450b26e69dcb6f8de6e2b07b3fc1c288d85f5", "type": "github" }, "original": { @@ -20,24 +20,6 @@ "type": "github" } }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -66,11 +48,11 @@ ] }, "locked": { - "lastModified": 1760241904, - "narHash": "sha256-OD7QnaGEVNdukYEbJbUNWPsvnDrpbZOZxVIk6Pt9Jhw=", + "lastModified": 1760846226, + "narHash": "sha256-xmU8kAsRprJiTGBTaGrwmjBP3AMA9ltlrxHKFuy5JWc=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "c9f5ea45f25652ec2f771f9426ccacb21cbbaeaa", + "rev": "5024e1901239a76b7bf94a4cd27f3507e639d49e", "type": "github" }, "original": { @@ -81,15 +63,14 @@ }, "nix-vscode-extensions": { "inputs": { - "flake-utils": "flake-utils", "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1760493393, - "narHash": "sha256-a8PFspkUKhbnXqoy1XD66PLvHeP0dMkaEFOiSo0OV1U=", + "lastModified": 1760925854, + "narHash": "sha256-mUEWKL7IMA0gzZlP5V/C6bFU12PcQWs1J/5Ucwzp9wY=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "c7cfda7d93fecc526a75cfbd2ca3133d048472e0", + "rev": "ffbbd7f46ff61967e8ad010dc08e31385abbc483", "type": "github" }, "original": { @@ -116,11 +97,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1760284886, - "narHash": "sha256-TK9Kr0BYBQ/1P5kAsnNQhmWWKgmZXwUQr4ZMjCzWf2c=", + "lastModified": 1760878510, + "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cf3f5c4def3c7b5f1fc012b3d839575dbe552d43", + "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67", "type": "github" }, "original": { @@ -132,11 +113,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1760423683, - "narHash": "sha256-Tb+NYuJhWZieDZUxN6PgglB16yuqBYQeMJyYBGCXlt8=", + "lastModified": 1760862643, + "narHash": "sha256-PXwG0TM7Ek87DNx4LbGWuD93PbFeKAJs4FfALtp7Wo0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a493e93b4a259cd9fea8073f89a7ed9b1c5a1da2", + "rev": "33c6dca0c0cb31d6addcd34e90a63ad61826b28c", "type": "github" }, "original": { @@ -155,21 +136,6 @@ "nixpkgs": "nixpkgs_2", "nixpkgs-unstable": "nixpkgs-unstable" } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } } }, "root": "root", diff --git a/devices/tuxedo/home.nix b/devices/tuxedo/home.nix index bfa57bd..96c26bd 100644 --- a/devices/tuxedo/home.nix +++ b/devices/tuxedo/home.nix @@ -43,6 +43,7 @@ dbeaver-bin ruffle popsicle + mkvtoolnix # for headset tune headsetcontrol @@ -69,18 +70,6 @@ screenshot-directory = "/mnt/HDD2/Pictures/"; }; }; - - mangohud = { - enable = true; - settings = { - preset = 1; - }; - }; - - kodi = { - enable = true; - package = pkgs.kodi.withPackages (exts: [ exts.pvr-iptvsimple ]); - }; }; systemd.user = { diff --git a/home-manager/default.nix b/home-manager/default.nix index 552e4e6..21727d6 100644 --- a/home-manager/default.nix +++ b/home-manager/default.nix @@ -9,7 +9,6 @@ home.packages = with pkgs;[ # general thunderbird - keepassxc qbittorrent libreoffice-qt inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".joplin-desktop @@ -49,5 +48,11 @@ enable = true; package = pkgs.brave; }; + + keepassxc = { + enable = true; + # add in 25.12? + # autostart = true; + }; }; } diff --git a/home-manager/development/vscode.nix b/home-manager/development/vscode.nix index bb31eef..21b287d 100644 --- a/home-manager/development/vscode.nix +++ b/home-manager/development/vscode.nix @@ -3,6 +3,19 @@ let openvsx = inputs.nix-vscode-extensions.extensions.x86_64-linux.open-vsx; vscode-marketplace = inputs.nix-vscode-extensions.extensions.x86_64-linux.vscode-marketplace; + + # resharper-code = pkgs.vscode-utils.buildVscodeMarketplaceExtension { + # mktplcRef = { + # name = "resharper-code"; + # version = "0.0.12"; + # publisher = "jetbrains"; + # }; + # vsix = builtins.fetchurl { + # name = "jetbrains.resharper-code.zip"; + # url = "https://download.jetbrains.com/product?code=VSCRS&latest&distribution=linuxX64&type=eap"; + # sha256 = "sha256:05zmr3r2yid8r5hdh1km7kfl3cwlsf9nnccigyzhs14j5k7q0kjc"; + # }; + # }; in { home.packages = with pkgs;[ @@ -17,7 +30,9 @@ in profiles.default = { enableUpdateCheck = false; enableExtensionUpdateCheck = false; - extensions = (with openvsx;[ + extensions = [ + # resharper-code # also doesn't work + ] ++ (with openvsx;[ biomejs.biome mkhl.direnv dracula-theme.theme-dracula @@ -34,7 +49,7 @@ in ms-python.python ms-python.debugpy charliermarsh.ruff - # jetbrains.resharper-code won't work with nix lmao + # jetbrains.resharper-code # won't work with nix lmao ]) ++ (with vscode-marketplace;[ bradlc.vscode-tailwindcss ]); diff --git a/home-manager/gaming.nix b/home-manager/gaming.nix index fd058f4..ca2e43e 100644 --- a/home-manager/gaming.nix +++ b/home-manager/gaming.nix @@ -26,32 +26,35 @@ let umu-run "$@" ''; }); + + # proton with ja_JP + umu-ja = (pkgs.writeShellApplication { + name = "umu-ja"; + runtimeInputs = [ umu-wrapped ]; + text = "LANG=ja_JP.utf8 umu-run \"$@\""; + }); + + # wine with ja_JP + wine-ja = (pkgs.writeShellApplication { + name = "wine-ja"; + runtimeInputs = [ wine-wrapped ]; + text = "LANG=ja_JP.utf8 wine \"$@\""; + }); in { home.packages = with pkgs;[ # Wine / Proton umu-wrapped + umu-ja wine-wrapped + wine-ja pkgs_unstable.winetricks - - # proton with ja_JP - (pkgs.writeShellApplication { - name = "umu-ja"; - runtimeInputs = [ umu-wrapped ]; - text = "LANG=ja_JP.utf8 umu-run \"$@\""; - }) - - # wine with ja_JP - (pkgs.writeShellApplication { - name = "wine-ja"; - runtimeInputs = [ wine-wrapped ]; - text = "LANG=ja_JP.utf8 wine \"$@\""; - }) - bottles (heroic.override { extraPkgs = pkgs: [ + pkgs.umu-launcher pkgs.gamescope + pkgs.mangohud ]; }) @@ -65,4 +68,13 @@ in # Cheat engine scanmem ]; + + programs = { + mangohud = { + enable = true; + settings = { + preset = 1; + }; + }; + }; }