diff --git a/flake.lock b/flake.lock index d808d2f1..bf1a25d5 100644 --- a/flake.lock +++ b/flake.lock @@ -228,20 +228,6 @@ "type": "github" } }, - "flake-compat_3": { - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "revCount": 57, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/edolstra/flake-compat/1.0.1/018afb31-abd1-7bff-a5e4-cff7e18efb7a/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -317,24 +303,6 @@ "type": "github" } }, - "flake-utils_3": { - "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -1015,7 +983,6 @@ "ufo": "ufo", "v-sim": "v-sim", "vaspberry": "vaspberry", - "winapps": "winapps", "zpp-bits": "zpp-bits" } }, @@ -1169,21 +1136,6 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tgbot-cpp": { "flake": false, "locked": { @@ -1293,29 +1245,6 @@ "type": "github" } }, - "winapps": { - "inputs": { - "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_3", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1730460191, - "narHash": "sha256-CWaNjs2kOpmsR8ieVwqcd7EAz5Kd3y8I5huZyYgGqlA=", - "owner": "winapps-org", - "repo": "winapps", - "rev": "b18efc4497c0994182bbe482808583c11cc51a2e", - "type": "github" - }, - "original": { - "owner": "winapps-org", - "ref": "feat-nix-packaging", - "repo": "winapps", - "type": "github" - } - }, "zpp-bits": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index a5add871..ed27caf5 100644 --- a/flake.nix +++ b/flake.nix @@ -30,7 +30,6 @@ gricad = { url = "github:Gricad/nur-packages"; flake = false; }; catppuccin = { url = "github:catppuccin/nix"; inputs.nixpkgs.follows = "nixpkgs"; }; bscpkgs = { url = "github:CHN-beta/bscpkgs"; inputs.nixpkgs.follows = "nixpkgs"; }; - winapps = { url = "github:winapps-org/winapps/feat-nix-packaging"; inputs.nixpkgs.follows = "nixpkgs"; }; cachyos-lts.url = "github:drakon64/nixos-cachyos-kernel"; nixvirt = { url = "github:CHN-beta/NixVirt"; inputs.nixpkgs.follows = "nixpkgs"; }; shadowrz = { url = "github:ShadowRZ/nur-packages"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/modules/packages/winapps/default.nix b/modules/packages/winapps/default.nix deleted file mode 100644 index ca07e94e..00000000 --- a/modules/packages/winapps/default.nix +++ /dev/null @@ -1,47 +0,0 @@ -inputs: -{ - options.nixos.packages.winapps = let inherit (inputs.lib) mkOption types; in mkOption - { - type = types.nullOr (types.submodule {}); - default = if builtins.elem inputs.config.nixos.model.type [ "desktop" "server" ] then {} else null; - }; - config = let inherit (inputs.config.nixos.packages) winapps; in inputs.lib.mkIf (winapps != null) - { - nixos.packages.packages._packages = - [ - (inputs.pkgs.callPackage "${inputs.topInputs.winapps}/packages/winapps" {}) - (inputs.pkgs.runCommand "winapps-windows" {} - '' - mkdir -p $out/share/applications - cp ${inputs.pkgs.replaceVars ./windows.desktop { path = inputs.topInputs.winapps; }} \ - $out/share/applications/windows.desktop - '') - ] - ++ builtins.map - (p: inputs.pkgs.runCommand "winapps-${p}" {} - '' - mkdir -p $out/share/applications - source ${inputs.topInputs.winapps}/apps/${p}/info - # replace \ with \\ - WIN_EXECUTABLE=$(echo $WIN_EXECUTABLE | sed 's/\\/\\\\/g') - # replace space with \s - WIN_EXECUTABLE=$(echo $WIN_EXECUTABLE | sed 's/ /\\s/g') - cat > $out/share/applications/${p}.desktop << EOF - [Desktop Entry] - Name=$NAME - Exec=winapps manual "$WIN_EXECUTABLE" %F - Terminal=false - Type=Application - Icon=${inputs.topInputs.winapps}/apps/${p}/icon.svg - StartupWMClass=$FULL_NAME - Comment=$FULL_NAME - Categories=$CATEGORIES - MimeType=$MIME_TYPES - EOF - '') - [ - "access-o365" "acrobat-x-pro" "cmd" "excel-o365" "explorer" "illustrator-cc" "powerpoint-o365" - "visual-studio-comm" "word-o365" - ]; - }; -} diff --git a/modules/packages/winapps/windows.desktop b/modules/packages/winapps/windows.desktop deleted file mode 100644 index 206a3285..00000000 --- a/modules/packages/winapps/windows.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=Windows -Exec=winapps windows %F -Terminal=false -Type=Application -Icon=@path@/icons/windows.svg -StartupWMClass=Micorosoft Windows -Comment=Micorosoft Windows -Categories=Windows \ No newline at end of file